From: Po Lu Date: Sun, 27 Feb 2022 11:33:16 +0000 (+0800) Subject: Don't send help-echo on menu button arming not caused by motion events X-Git-Tag: emacs-29.0.90~2091 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=704a40ad75fd01d7efafbb9db7b8d5ff403e44eb;p=emacs.git Don't send help-echo on menu button arming not caused by motion events * lwlib/lwlib-Xm.c (xm_arm_callback): Ignore arming if the arm was not caused by an EnterNotify or MotionNotify event. --- diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index fa60fc89d08..25b1cc6b121 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -290,7 +290,12 @@ xm_arm_callback (Widget w, XtPointer client_data, XtPointer call_data) if (w != NULL) { instance = lw_get_widget_instance (w); - if (instance && instance->info->highlight_cb) + + if (instance && instance->info->highlight_cb + && (cbs->reason == XmCR_DISARM + || (cbs->event + && (cbs->event->type == EnterNotify + || cbs->event->type == MotionNotify)))) { call_data = cbs->reason == XmCR_DISARM ? NULL : wv; instance->info->highlight_cb (w, instance->info->id, call_data);