Skip to content

Prevent Wayland crash in working-area X11 code path #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slowriot wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prevent Wayland crash in working-area X11 code path #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eb3982
Prevent Wayland crash in working-area X11 code path
slowriot Apr 20, 2026
4ef6e5a
guard GDK_IS_X11 macros for GTK2 builds
slowriot Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/working-area.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,20 @@
*/

# include <gdk/gdk.h>

#ifdef GDK_WINDOWING_X11
# include <gdk/gdkx.h>
# include <X11/Xlib.h>
# include <X11/Xutil.h>
# include <X11/Xatom.h>
#endif

void get_working_area(GdkScreen* screen, GdkRectangle *rect);

static gboolean gf_display_get_workarea(GdkScreen* g_screen, GdkRectangle *rect) {
#ifndef GDK_WINDOWING_X11
return FALSE;
#else
Atom xa_desktops, xa_current, xa_workarea, xa_type;
Display *x_display;
Window x_root;
Expand All @@ -47,6 +53,11 @@ static gboolean gf_display_get_workarea(GdkScreen* g_screen, GdkRectangle *rect)
if(!g_display)
return FALSE;

#if defined(GDK_IS_X11_DISPLAY) && defined(GDK_IS_X11_SCREEN)
if(!GDK_IS_X11_DISPLAY(g_display) || !GDK_IS_X11_SCREEN(g_screen))
return FALSE;
Comment thread
slowriot marked this conversation as resolved.
#endif

/* get the x display from the gdk display */
x_display = gdk_x11_display_get_xdisplay(g_display);
if(!x_display)
Expand Down Expand Up @@ -134,6 +145,7 @@ static gboolean gf_display_get_workarea(GdkScreen* g_screen, GdkRectangle *rect)
XFree(data);

return TRUE;
#endif
}

void get_working_area(GdkScreen* screen, GdkRectangle *rect)
Expand Down