zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

winex11: Avoid overriding previously received ConfigureNotify events.

Browse source 
The X event merging logic removes events from the queue in advance, and
putting a dummy ConfigureNotify back in the queue will override any
previously received event.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57370
This commit is contained in:
Rémi Bernon 2024-11-14 13:09:20 +01:00 committed by Alexandre Julliard
parent 48bb5f90a2
commit 50683f7b32
Notes: Alexandre Julliard 2024-11-14 23:13:45 +01:00 
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/wine/merge_requests/6815
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/winex11.drv/event.c
View file

@ -171,7 +171,7 @@ static inline void free_event_data( XEvent *event )
#endif
}
static void host_window_send_configure_events( struct host_window *win, Display *display, unsigned long serial )
static void host_window_send_configure_events( struct host_window *win, Display *display, unsigned long serial, XEvent *previous )
{
XConfigureEvent configure = {.type = ConfigureNotify, .serial = serial, .display = display};
unsigned int i;
@ -201,12 +201,13 @@ static void host_window_send_configure_events( struct host_window *win, Display
release_win_data( data );
if (has_serial) continue;
if (previous->type == ConfigureNotify && previous->xconfigure.window == configure.window) continue;
TRACE( "generating ConfigureNotify for window %p/%lx, rect %s\n", hwnd, configure.window, wine_dbgstr_rect(&rect) );
XPutBackEvent( configure.display, (XEvent *)&configure );
}
}
static BOOL host_window_filter_event( XEvent *event )
static BOOL host_window_filter_event( XEvent *event, XEvent *previous )
{
struct host_window *win;
RECT old_rect;
@ -246,7 +247,7 @@ static BOOL host_window_filter_event( XEvent *event )
}
if (old_rect.left != win->rect.left || old_rect.top != win->rect.top)
host_window_send_configure_events( win, event->xany.display, event->xany.serial );
host_window_send_configure_events( win, event->xany.display, event->xany.serial, previous );
return TRUE;
}
@ -525,7 +526,7 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X
continue; /* filtered, ignore it */
}
if (host_window_filter_event( &event )) continue;
if (host_window_filter_event( &event, &prev_event )) continue;
get_event_data( &event );
if (prev_event.type) action = merge_events( &prev_event, &event );