Index: trunk/doc/conf/tree/temp.html =================================================================== --- trunk/doc/conf/tree/temp.html (revision 25334) +++ trunk/doc/conf/tree/temp.html (revision 25335) @@ -5,4 +5,5 @@ node name type flags description rat_warn boolean 0 rats nest has set warnings clip_inhibit_chg boolean 0 dummy node to inform the menu about clip inhibit change + click_cmd_entry_active boolean 0 [hidlib] true if the command line is active when the user click - this gives the command interpreter a chance to capture the click and use the coords Index: trunk/src/crosshair.h =================================================================== --- trunk/src/crosshair.h (revision 25334) +++ trunk/src/crosshair.h (revision 25335) @@ -78,8 +78,6 @@ long int *drags; int drags_len, drags_current; pcb_coord_t dragx, dragy; /* the point where drag started */ - - unsigned click_cmd_entry_active:1; /* true if the command entry was active during a mosue click while actions are executed */ } pcb_crosshair_t; Index: trunk/src/hid_cfg_input.c =================================================================== --- trunk/src/hid_cfg_input.c (revision 25334) +++ trunk/src/hid_cfg_input.c (revision 25335) @@ -36,6 +36,7 @@ #include "config.h" #include "hid_cfg_input.h" #include "hid_cfg_action.h" +#include "hidlib_conf.h" #include "error.h" #include "compat_misc.h" #include "event.h" @@ -183,10 +184,10 @@ void hid_cfg_mouse_action(pcb_hid_cfg_mouse_t *mouse, pcb_hid_cfg_mod_t button_and_mask, pcb_bool cmd_entry_active) { - pcb_crosshair.click_cmd_entry_active = cmd_entry_active; + pcbhl_conf.temp.click_cmd_entry_active = cmd_entry_active; pcb_hid_cfg_action(find_best_action(mouse, button_and_mask)); pcb_event(NULL, PCB_EVENT_USER_INPUT_POST, NULL); - pcb_crosshair.click_cmd_entry_active = 0; + pcbhl_conf.temp.click_cmd_entry_active = 0; } Index: trunk/src/hidlib_conf.h =================================================================== --- trunk/src/hidlib_conf.h (revision 25334) +++ trunk/src/hidlib_conf.h (revision 25335) @@ -41,6 +41,10 @@ typedef struct { + struct { + CFT_BOOLEAN click_cmd_entry_active;/* true if the command line is active when the user click - this gives the command interpreter a chance to capture the click and use the coords */ + } temp; + const struct { /* rc */ CFT_INTEGER verbose; CFT_INTEGER quiet; /* print only errors on stderr */ Index: trunk/src/tool.c =================================================================== --- trunk/src/tool.c (revision 25334) +++ trunk/src/tool.c (revision 25335) @@ -416,7 +416,7 @@ /*** old helpers ***/ void pcb_release_mode(pcb_hidlib_t *hidlib) { - if (pcb_crosshair.click_cmd_entry_active && (pcb_cli_mouse(0) == 0)) + if (pcbhl_conf.temp.click_cmd_entry_active && (pcb_cli_mouse(0) == 0)) return; pcb_tool_release_mode(hidlib); @@ -429,7 +429,7 @@ void pcb_notify_mode(pcb_hidlib_t *hidlib) { - if (pcb_crosshair.click_cmd_entry_active && (pcb_cli_mouse(1) == 0)) + if (pcbhl_conf.temp.click_cmd_entry_active && (pcb_cli_mouse(1) == 0)) return; if (conf_core.temp.rat_warn)