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: Introduce a new host_window_send_configure_events helper.

Browse source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57370
This commit is contained in:
Rémi Bernon 2024-11-13 15:50:12 +01:00 committed by Alexandre Julliard
parent 4eefc0b9a9
commit 7352196f6a
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 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -171,6 +171,41 @@ 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 )
{
XConfigureEvent configure = {.type = ConfigureNotify, .serial = serial, .display = display};
unsigned int i;
for (i = 0; i < win->children_count; i++)
{
RECT rect = win->children[i].rect;
struct x11drv_win_data *data;
BOOL has_serial;
HWND hwnd;
/* Only send a fake event if we're not expecting one from a state/config request.
* We may know what was requested, but not what the WM will decide to reply, and our
* fake event might trigger some undesired changes before the real ConfigureNotify.
*/
if (XFindContext( display, win->window, winContext, (char **)&hwnd )) continue;
if (!(data = get_win_data( hwnd ))) continue;
has_serial = data->wm_state_serial || data->configure_serial;
release_win_data( data );
if (has_serial) continue;
configure.event = win->children[i].window;
configure.window = configure.event;
configure.x = rect.left;
configure.y = rect.top;
configure.width = rect.right - rect.left;
configure.height = rect.bottom - rect.top;
configure.send_event = 0;
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 )
{
struct host_window *win;
@ -211,38 +246,7 @@ static BOOL host_window_filter_event( XEvent *event )
}
if (old_rect.left != win->rect.left || old_rect.top != win->rect.top)
{
XConfigureEvent configure = {.type = ConfigureNotify, .serial = event->xany.serial, .display = event->xany.display};
unsigned int i;
for (i = 0; i < win->children_count; i++)
{
RECT rect = win->children[i].rect;
struct x11drv_win_data *data;
BOOL has_serial;
HWND hwnd;
/* Only send a fake event if we're not expecting one from a state/config request.
* We may know what was requested, but not what the WM will decide to reply, and our
* fake event might trigger some undesired changes before the real ConfigureNotify.
*/
if (XFindContext( event->xany.display, event->xany.window, winContext, (char **)&hwnd )) continue;
if (!(data = get_win_data( hwnd ))) continue;
has_serial = data->wm_state_serial || data->configure_serial;
release_win_data( data );
if (has_serial) continue;
configure.event = win->children[i].window;
configure.window = configure.event;
configure.x = rect.left;
configure.y = rect.top;
configure.width = rect.right - rect.left;
configure.height = rect.bottom - rect.top;
configure.send_event = 0;
XPutBackEvent( configure.display, (XEvent *)&configure );
}
}
host_window_send_configure_events( win, event->xany.display, event->xany.serial );
return TRUE;
}