mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 17:24:23 +00:00
Fix odd scrolling bugs on LessTif
* src/xterm.c (handle_one_xevent): Give emulated button events to Motif.
This commit is contained in:
parent
006a447455
commit
6b71b80fdc
1 changed files with 20 additions and 9 deletions
29
src/xterm.c
29
src/xterm.c
|
|
@ -12035,17 +12035,13 @@ handle_one_xevent (struct x_display_info *dpyinfo,
|
|||
struct xwidget_view *xvw;
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_XINPUT2_1
|
||||
/* Ignore emulated scroll events when XI2 native
|
||||
scroll events are present. */
|
||||
if (xev->flags & XIPointerEmulated)
|
||||
{
|
||||
*finish = X_EVENT_DROP;
|
||||
goto XI_OTHER;
|
||||
}
|
||||
#ifdef USE_MOTIF
|
||||
#ifdef USE_TOOLKIT_SCROLL_BARS
|
||||
struct scroll_bar *bar
|
||||
= x_window_to_scroll_bar (dpyinfo->display,
|
||||
xev->event, 2);
|
||||
#endif
|
||||
|
||||
#ifdef USE_MOTIF
|
||||
use_copy = true;
|
||||
copy.xbutton.type = (xev->evtype == XI_ButtonPress
|
||||
? ButtonPress : ButtonRelease);
|
||||
|
|
@ -12075,6 +12071,21 @@ handle_one_xevent (struct x_display_info *dpyinfo,
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_XINPUT2_1
|
||||
/* Ignore emulated scroll events when XI2 native
|
||||
scroll events are present. */
|
||||
if (xev->flags & XIPointerEmulated)
|
||||
{
|
||||
#if !defined USE_MOTIF || !defined USE_TOOLKIT_SCROLL_BARS
|
||||
*finish = X_EVENT_DROP;
|
||||
#else
|
||||
if (bar)
|
||||
*finish = X_EVENT_DROP;
|
||||
#endif
|
||||
goto XI_OTHER;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (xev->evtype == XI_ButtonPress)
|
||||
x_display_set_last_user_time (dpyinfo, xev->time);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue