luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

start launcher commands on mouse button release (if no mouse movement has occurred) to allow ctrl-button1 drags

This commit is contained in:
stefan schippers 2024-03-18 02:39:54 +01:00
parent 04409cc315
commit f68cb6c18a
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/callback.c
View File

@ -3529,19 +3529,12 @@ int rstate; /* (reduced state, without ShiftMask) */
move_objects(START,0,0,0); move_objects(START,0,0,0);
} }
else if(state == ShiftMask) copy_objects(START); else if(state == ShiftMask) copy_objects(START);
else if( !(state & ControlMask) ) move_objects(START,0,0,0); else move_objects(START,0,0,0);
} }
#ifndef __unix__ #ifndef __unix__
draw_selection(xctx->gc[SELLAYER], 0); draw_selection(xctx->gc[SELLAYER], 0);
#endif #endif
/* control-click on an instance: execute command */
if(sel.type && state == ControlMask && !xctx->shape_point_selected) {
int savesem = xctx->semaphore;
xctx->semaphore = 0;
launcher(); /* works only if lastsel == 1 */
xctx->semaphore = savesem;
}
if(tclgetboolvar("auto_hilight") && !xctx->shape_point_selected) { if(tclgetboolvar("auto_hilight") && !xctx->shape_point_selected) {
if(!(state & ShiftMask) && xctx->hilight_nets && sel.type == 0 ) { if(!(state & ShiftMask) && xctx->hilight_nets && sel.type == 0 ) {
if(!prev_last_sel) { if(!prev_last_sel) {
@ -3563,6 +3556,21 @@ int rstate; /* (reduced state, without ShiftMask) */
waves_callback(event, mx, my, key, button, aux, state); waves_callback(event, mx, my, key, button, aux, state);
break; break;
} }
/* launcher, only if no movement has been done */
dbg(0, "state=%d\n", state);
dbg(0, "ui_state=%d\n", xctx->ui_state);
dbg(0, "shape_point_selected=%d\n", xctx->shape_point_selected);
dbg(0, "delta=%g %g\n", xctx->deltax, xctx->deltay);
if(state == (Button1Mask | ControlMask) && !xctx->shape_point_selected && (xctx->ui_state & STARTMOVE) &&
xctx->deltax == 0 && xctx->deltay == 0) {
int savesem = xctx->semaphore;
dbg(0, "no move\n");
move_objects(ABORT,0,0,0);
xctx->semaphore = 0;
launcher(); /* works only if lastsel == 1 */
xctx->semaphore = savesem;
}
/* end intuitive_interface copy or move */ /* end intuitive_interface copy or move */
if(xctx->ui_state & STARTCOPY && xctx->drag_elements) { if(xctx->ui_state & STARTCOPY && xctx->drag_elements) {
copy_objects(END); copy_objects(END);