From d6ad977ba7443517e62aab36229b4b77154c1339 Mon Sep 17 00:00:00 2001 From: Liang Chang Date: Tue, 16 Feb 2021 17:40:05 +0800 Subject: [PATCH] dtappbuilder: ensure mouse operations are not interfering by key masks (e.g., Caps Lock, Num Lock, etc.) when editing (resize, double-click, etc.) widgets. --- cde/programs/dtappbuilder/src/ab/abobj_events.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cde/programs/dtappbuilder/src/ab/abobj_events.c b/cde/programs/dtappbuilder/src/ab/abobj_events.c index 5c595e091..5a04121d5 100644 --- a/cde/programs/dtappbuilder/src/ab/abobj_events.c +++ b/cde/programs/dtappbuilder/src/ab/abobj_events.c @@ -1001,7 +1001,7 @@ object_button_press( { bevent = (XButtonEvent*)event; - if (bevent->state == 0 && + if ((bevent->state & ShiftMask) == 0 && (bevent->button == 1 || (AB_btn1_transfer != True && bevent->button == 2))) /* MOVE, RESIZE or RUBBERBAND-SELECT */ @@ -1138,8 +1138,9 @@ interpose_button_event( d_click->waiting = False; object_invoke_props(widget, event, NULL, 0); } - else if (bevent->state == 0) /* Start timing for double-click */ + else if ((bevent->state & ControlMask) == 0) { + /* Start timing for double-click */ event_cpy = *event; d_click->waiting = True; d_click->widget = widget;