DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

desktop: fix building without the X11 GDK backend

Browse Source
This commit is contained in:
Pierre Pronchery 2022-12-07 01:08:21 +01:00
parent d6adab4c2e
commit 59587fc5a6
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/desktop/desktop.c
View File

@ -37,12 +37,16 @@
#include <errno.h> #include <errno.h>
#include <locale.h> #include <locale.h>
#include <libintl.h> #include <libintl.h>
#include <X11/Xlib.h> #if defined(GDK_WINDOWING_X11)
# include <X11/Xlib.h>
#endif
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h> #if defined(GDK_WINDOWING_X11)
#include <X11/Xatom.h> # include <gdk/gdkx.h>
#include <X11/extensions/Xrandr.h> # include <X11/Xatom.h>
# include <X11/extensions/Xrandr.h>
#endif
#include <System.h> #include <System.h>
#include "desktopicon.h" #include "desktopicon.h"
#include "desktopiconwindow.h" #include "desktopiconwindow.h"
@ -307,7 +311,11 @@ static void _new_events(Desktop * desktop, GdkWindow * window,
static void _new_filter(Desktop * desktop, GdkWindow * window) static void _new_filter(Desktop * desktop, GdkWindow * window)
{ {
#if defined(GDK_WINDOWING_X11)
gdk_window_add_filter(window, _on_root_event, desktop); gdk_window_add_filter(window, _on_root_event, desktop);
#else
/* FIXME implement */
#endif
} }
static void _new_icons(Desktop * desktop) static void _new_icons(Desktop * desktop)
@ -524,6 +532,7 @@ static void _on_realize(gpointer data)
desktop_reset(desktop); desktop_reset(desktop);
} }
#if defined(GDK_WINDOWING_X11)
static GdkFilterReturn _event_button_press(XButtonEvent * xbev, static GdkFilterReturn _event_button_press(XButtonEvent * xbev,
Desktop * desktop); Desktop * desktop);
static GdkFilterReturn _event_configure(XConfigureEvent * xevent, static GdkFilterReturn _event_configure(XConfigureEvent * xevent,
@ -585,6 +594,7 @@ static GdkFilterReturn _event_property(XPropertyEvent * xevent,
_desktop_get_workarea(desktop); _desktop_get_workarea(desktop);
return GDK_FILTER_CONTINUE; return GDK_FILTER_CONTINUE;
} }
#endif
/* desktop_delete */ /* desktop_delete */
@ -770,6 +780,7 @@ void desktop_set_icons(Desktop * desktop, DesktopIcons icons)
/* desktop_set_layout */ /* desktop_set_layout */
int desktop_set_layout(Desktop * desktop, DesktopLayout layout) int desktop_set_layout(Desktop * desktop, DesktopLayout layout)
{ {
#if defined(GDK_WINDOWING_X11)
XRRScreenConfiguration * sc; XRRScreenConfiguration * sc;
Rotation r; Rotation r;
SizeID size; SizeID size;
@ -798,6 +809,10 @@ int desktop_set_layout(Desktop * desktop, DesktopLayout layout)
XRRSetScreenConfig(GDK_DISPLAY_XDISPLAY(desktop->display), sc, XRRSetScreenConfig(GDK_DISPLAY_XDISPLAY(desktop->display), sc,
GDK_WINDOW_XID(desktop->root), size, r, CurrentTime); GDK_WINDOW_XID(desktop->root), size, r, CurrentTime);
return gdk_error_trap_pop(); return gdk_error_trap_pop();
#else
/* FIXME not implemented */
return -1;
#endif
} }
@ -1971,6 +1986,7 @@ static int _desktop_get_properties(Desktop * desktop, GdkRectangle * geometry,
static void _properties_workarea(Desktop * desktop, GdkRectangle * workarea) static void _properties_workarea(Desktop * desktop, GdkRectangle * workarea)
{ {
#if defined(GDK_WINDOWING_X11)
Atom atom; Atom atom;
Atom type; Atom type;
int format; int format;
@ -2000,10 +2016,13 @@ static void _properties_workarea(Desktop * desktop, GdkRectangle * workarea)
} }
if(p != NULL) if(p != NULL)
XFree(p); XFree(p);
#ifdef DEBUG # ifdef DEBUG
fprintf(stderr, "DEBUG: %s() (%d, %d) %dx%d\n", __func__, fprintf(stderr, "DEBUG: %s() (%d, %d) %dx%d\n", __func__,
workarea->x, workarea->y, workarea->x, workarea->y,
workarea->width, workarea->height); workarea->width, workarea->height);
# endif
#else
/* FIXME implement */
#endif #endif
} }