Index: doc-rnd/TODO =================================================================== --- doc-rnd/TODO (revision 1493) +++ doc-rnd/TODO (revision 1494) @@ -6,13 +6,9 @@ - check if ctrl+1..ctrl+4 works - resource conv cleanup: - - rewrite hid_gtk to use the keyboard input layer from hid_cfg - - check if multikey works in gtk - - gtk: use hid_cfg_get_submenu() instead of lht_tree_path_ - remove npath thing - enable gpmi and test dynamic menu insertion - search for "resource" in src/ and in src_plugin/, rename - - remove M_Multi Cleanup #4: - reduce @@ -41,8 +37,10 @@ - cleanup on unload: remove menus - check whether local copy of gts is needed, bisect when toporouter broke +- multi-key: display state on the gui - Message() should have a first param that tells if it is an error, info, etc.; pop up window on error, red + CLEANUP #5: - self contained - files Index: src/hid_cfg_input.h =================================================================== --- src/hid_cfg_input.h (revision 1493) +++ src/hid_cfg_input.h (revision 1494) @@ -5,6 +5,7 @@ #include #include "hid_cfg.h" +#warning TODO: /* For compatibility; TODO: REMOVE */ #define M_Mod(n) (1u<<(n+1)) @@ -13,7 +14,6 @@ M_Shift = M_Mod0(0), M_Ctrl = M_Mod0(1), M_Alt = M_Mod0(2), - M_Multi = M_Mod0(3), /* not a key; indicates that the keystroke is part of a multi-stroke sequence */ /* M_Mod(3) is M_Mod0(4) */ /* M_Mod(4) is M_Mod0(5) */ M_Release = M_Mod0(6), /* there might be a random number of modkeys, but hopefully not this many */ Index: util/gsch2pcb.c =================================================================== --- util/gsch2pcb.c (revision 1493) +++ util/gsch2pcb.c (revision 1494) @@ -25,6 +25,7 @@ - use popen() instead of glib's spawn (stderr is always printed to stderr) */ +#define PCB_NO_GLUE #include "config.h" #include