Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11: Don't pass a GdkEvent to xsettings filters

Browse Source 
The filter functions never look at that event, and
we want to get out of the business of passing half-
constructed events around.
This commit is contained in:
Matthias Clasen
2020-02-15 10:30:55 -05:00
parent 9a1497f582
commit 9c4f19e8ed
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/x11/gdkeventsource.c
View File

@@ -240,11 +240,11 @@ gdk_event_source_translate_event (GdkX11Display *x11_display,
/* apply XSettings filters */
if (xevent->xany.window == XRootWindow (dpy, 0))
result = gdk_xsettings_root_window_filter (xevent, event, x11_screen);
result = gdk_xsettings_root_window_filter (xevent,x11_screen);
if (result == GDK_FILTER_CONTINUE &&
xevent->xany.window == x11_screen->xsettings_manager_window)
result = gdk_xsettings_manager_window_filter (xevent, event, x11_screen);
result = gdk_xsettings_manager_window_filter (xevent, x11_screen);
cache = gdk_surface_cache_get (display);
if (cache)

2
gdk/x11/xsettings-client.c
View File

@@ -506,7 +506,6 @@ check_manager_window (GdkX11Screen *x11_screen,
GdkFilterReturn
gdk_xsettings_root_window_filter (const XEvent *xev,
GdkEvent *event,
gpointer data)
{
GdkX11Screen *x11_screen = data;
@@ -530,7 +529,6 @@ gdk_xsettings_root_window_filter (const XEvent *xev,
GdkFilterReturn
gdk_xsettings_manager_window_filter (const XEvent *xev,
GdkEvent *event,
gpointer data)
{
GdkX11Screen *x11_screen = data;

2
gdk/x11/xsettings-client.h
View File

@@ -31,10 +31,8 @@ void _gdk_x11_xsettings_finish (GdkX11Screen *x11_screen);
void _gdk_x11_settings_force_reread (GdkX11Screen *x11_screen);
GdkFilterReturn gdk_xsettings_root_window_filter (const XEvent *xevent,
GdkEvent *event,
gpointer data);
GdkFilterReturn gdk_xsettings_manager_window_filter (const XEvent *xevent,
GdkEvent *event,
gpointer data);