diff -ru japa-0.6.0/gobjects.cc japa-0.6.0-patched/gobjects.cc --- japa-0.6.0/gobjects.cc 2010-03-10 16:31:09.000000000 +0200 +++ japa-0.6.0-patched/gobjects.cc 2010-11-01 23:04:28.000000000 +0200 @@ -142,11 +142,11 @@ _binp [i] = new X_tbutton (W, this, B, x + 18 * i, y, s, 0, INP1 + i); _binp [i]->x_map (); } - if (k) _input = -1; - else + //if (k) _input = -1; + //else { - _binp [0]->set_stat (1); - _input = 0; + _binp [k]->set_stat (1); + _input = k; } Bst0.size.x = 15; @@ -251,9 +251,9 @@ T->set_text ("Analyser"); T->x_map (); _resol.init (W, C, CB_RESOL, x + 5, y + 18, "Resol", _resol_texts); - _resol.set_state (1); + _resol.set_state (2); _wfact.init (W, C, CB_WFACT, x + 5, y + 36, "Warp", _wfact_texts); - _wfact.set_state (0); + _wfact.set_state (2); _speed.init (W, C, CB_SPEED, x + 5, y + 54, "Speed", _speed_texts); _speed.set_state (2); } @@ -312,7 +312,8 @@ _traceA.init (W, C, &BstA, CB_TRACEA, x, y + 18, "In A", _traceA_texts); _traceB.init (W, C, &BstB, CB_TRACEB, x, y + 36, "In B", _traceB_texts); _traceM.init (W, C, &BstM, CB_TRACEM, x, y + 54, "Mem", _traceM_texts); - _traceA.set_state (0); + //_traceA.set_state (1); + _traceB.set_state (0); } const char *GUI_traces::_traceA_texts [] = { "A" , "A/B", "A/X", 0 }; @@ -323,7 +324,7 @@ void GUI_display::init (X_window *W, X_callback *C, int x, int y) { _ascale.init (W, C, CB_ASCALE, x, y, "Range", _ascale_texts); - _ascale.set_state (1); + _ascale.set_state (3); _fscale.init (W, C, CB_FSCALE, x + 150, y, "Scale", _fscale_texts); _fscale.set_state (1); _arespf.init (W, C, CB_ARESPF, x + 300, y, "Resp", _arespf_texts); diff -ru japa-0.6.0/styles.cc japa-0.6.0-patched/styles.cc --- japa-0.6.0/styles.cc 2010-03-10 16:32:33.000000000 +0200 +++ japa-0.6.0-patched/styles.cc 2010-11-01 22:22:10.000000000 +0200 @@ -33,8 +33,8 @@ void init_styles (X_display *disp, X_resman *xrm) { - Colors.black = disp->blackpixel (); - Colors.white = disp->whitepixel (); + Colors.black = disp->alloc_color (xrm->get (".color.black", "black"), Colors.black); + Colors.white = disp->alloc_color (xrm->get (".color.white", "white"), Colors.white); Colors.main_bg = disp->alloc_color (xrm->get (".color.main.bg", "#ece8dc"), Colors.white); Colors.main_ds = disp->alloc_color (xrm->get (".color.main.ds", "gray20"), Colors.black); Colors.main_ls = disp->alloc_color (xrm->get (".color.main.ls", "white"), Colors.white); Only in japa-0.6.0-patched: styles.cc.orig