brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stack-tracker: Avoid multiple casts to Window type

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3732>
This commit is contained in:
Marco Trevisan (Treviño) 2024-05-03 15:53:16 +02:00 committed by Marge Bot
parent e3d3b257ae
commit 0653b829c1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/stack-tracker.c
View File

@ -1060,9 +1060,10 @@ meta_stack_tracker_sync_stack (MetaStackTracker *tracker)
{ {
MetaX11Display *x11_display = tracker->display->x11_display; MetaX11Display *x11_display = tracker->display->x11_display;
MetaWindow *meta_window = NULL; MetaWindow *meta_window = NULL;
Window xwindow = (Window) window;
if (x11_display) if (x11_display)
meta_window = meta_x11_display_lookup_x_window (x11_display, (Window) window); meta_window = meta_x11_display_lookup_x_window (x11_display, xwindow);
/* When mapping back from xwindow to MetaWindow we have to be a bit careful; /* When mapping back from xwindow to MetaWindow we have to be a bit careful;
* children of the root could include unmapped windows created by toolkits * children of the root could include unmapped windows created by toolkits
@ -1072,8 +1073,8 @@ meta_stack_tracker_sync_stack (MetaStackTracker *tracker)
*/ */
frame = meta_window ? meta_window_x11_get_frame (meta_window) : NULL; frame = meta_window ? meta_window_x11_get_frame (meta_window) : NULL;
if (meta_window && if (meta_window &&
((Window)window == meta_window_x11_get_xwindow (meta_window) || (xwindow == meta_window_x11_get_xwindow (meta_window) ||
(frame && (Window)window == frame->xwindow))) (frame && xwindow == frame->xwindow)))
meta_windows = g_list_prepend (meta_windows, meta_window); meta_windows = g_list_prepend (meta_windows, meta_window);
} }
else else