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

Fix building without the X11 GDK backend

Browse Source
This commit is contained in:
Pierre Pronchery 2022-12-07 01:02:25 +01:00
parent 592aa42055
commit 14b8ac2fb2
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/compat.c
View File

@ -28,7 +28,10 @@
#include <gdk/gdkx.h> #include <gdk/gdk.h>
#if defined(GDK_WINDOWING_X11)
# include <gdk/gdkx.h>
#endif
#include "Desktop.h" #include "Desktop.h"
@ -38,6 +41,7 @@
/* gdk_window_clear */ /* gdk_window_clear */
void gdk_window_clear(GdkWindow * window) void gdk_window_clear(GdkWindow * window)
{ {
# if defined(GDK_WINDOWING_X11)
Display * display; Display * display;
Window wid; Window wid;
@ -46,6 +50,7 @@ void gdk_window_clear(GdkWindow * window)
gdk_error_trap_push(); gdk_error_trap_push();
XClearWindow(display, wid); XClearWindow(display, wid);
gdk_error_trap_pop(); gdk_error_trap_pop();
# endif
} }
#endif #endif

45
src/message.c
View File

@ -37,10 +37,12 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#if GTK_CHECK_VERSION(3, 0, 0) #if defined(GDK_WINDOWING_X11)
# include <gtk/gtkx.h> # if GTK_CHECK_VERSION(3, 0, 0)
#else # include <gtk/gtkx.h>
# include <gdk/gdkx.h> # else
# include <gdk/gdkx.h>
# endif
#endif #endif
#include <System.h> #include <System.h>
#include "Desktop.h" #include "Desktop.h"
@ -52,11 +54,13 @@
typedef struct _MessageCallback typedef struct _MessageCallback
{ {
GtkWidget * window; GtkWidget * window;
#if GTK_CHECK_VERSION(3, 0, 0) #if defined(GDK_WINDOWING_X11)
# if GTK_CHECK_VERSION(3, 0, 0)
Atom atom; Atom atom;
#else # else
GtkWidget * widget; GtkWidget * widget;
Window xwindow; Window xwindow;
# endif
#endif #endif
DesktopMessageCallback callback; DesktopMessageCallback callback;
void * data; void * data;
@ -70,8 +74,10 @@ static size_t _callbacks_cnt = 0;
/* prototypes */ /* prototypes */
/* callbacks */ /* callbacks */
#if defined(GDK_WINDOWING_X11)
static GdkFilterReturn _desktop_message_on_callback(GdkXEvent * xevent, static GdkFilterReturn _desktop_message_on_callback(GdkXEvent * xevent,
GdkEvent * event, gpointer data); GdkEvent * event, gpointer data);
#endif
/* public */ /* public */
@ -83,8 +89,10 @@ int desktop_message_register(GtkWidget * window, char const * destination,
MessageCallback ** p; MessageCallback ** p;
MessageCallback * mc; MessageCallback * mc;
GdkWindow * gwindow; GdkWindow * gwindow;
#if !GTK_CHECK_VERSION(3, 0, 0) #if defined(GDK_WINDOWING_X11)
# if !GTK_CHECK_VERSION(3, 0, 0)
GdkAtom atom; GdkAtom atom;
# endif
#endif #endif
#ifdef DEBUG #ifdef DEBUG
@ -99,12 +107,13 @@ int desktop_message_register(GtkWidget * window, char const * destination,
_callbacks[_callbacks_cnt++] = mc; _callbacks[_callbacks_cnt++] = mc;
mc->callback = callback; mc->callback = callback;
mc->data = data; mc->data = data;
#if GTK_CHECK_VERSION(3, 0, 0) #if defined(GDK_WINDOWING_X11)
# if GTK_CHECK_VERSION(3, 0, 0)
mc->atom = XInternAtom(gdk_x11_get_default_xdisplay(), destination, mc->atom = XInternAtom(gdk_x11_get_default_xdisplay(), destination,
FALSE); FALSE);
gwindow = (window != NULL) ? gtk_widget_get_window(window) : NULL; gwindow = (window != NULL) ? gtk_widget_get_window(window) : NULL;
gdk_window_add_filter(gwindow, _desktop_message_on_callback, mc); gdk_window_add_filter(gwindow, _desktop_message_on_callback, mc);
#else # else
if((mc->window = window) == NULL) if((mc->window = window) == NULL)
{ {
mc->widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); mc->widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@ -116,6 +125,7 @@ int desktop_message_register(GtkWidget * window, char const * destination,
mc->xwindow = GDK_WINDOW_XWINDOW(gwindow); mc->xwindow = GDK_WINDOW_XWINDOW(gwindow);
atom = gdk_atom_intern(destination, FALSE); atom = gdk_atom_intern(destination, FALSE);
gdk_add_client_message_filter(atom, _desktop_message_on_callback, mc); gdk_add_client_message_filter(atom, _desktop_message_on_callback, mc);
# endif
#endif #endif
return 0; return 0;
} }
@ -125,7 +135,8 @@ int desktop_message_register(GtkWidget * window, char const * destination,
int desktop_message_send(char const * destination, uint32_t value1, int desktop_message_send(char const * destination, uint32_t value1,
uint32_t value2, uint32_t value3) uint32_t value2, uint32_t value3)
{ {
#if GTK_CHECK_VERSION(3, 0, 0) #if defined(GDK_WINDOWING_X11)
# if GTK_CHECK_VERSION(3, 0, 0)
GdkDisplay * display; GdkDisplay * display;
Display * xdisplay; Display * xdisplay;
XEvent xev; XEvent xev;
@ -148,7 +159,7 @@ int desktop_message_send(char const * destination, uint32_t value1,
SubstructureNotifyMask | SubstructureRedirectMask, SubstructureNotifyMask | SubstructureRedirectMask,
&xev); &xev);
return (gdk_x11_display_error_trap_pop(display) == 0) ? 0 : -1; return (gdk_x11_display_error_trap_pop(display) == 0) ? 0 : -1;
#else # else
GdkAtom atom; GdkAtom atom;
GdkEvent event; GdkEvent event;
GdkEventClient * client = &event.client; GdkEventClient * client = &event.client;
@ -165,6 +176,10 @@ int desktop_message_send(char const * destination, uint32_t value1,
client->data.l[2] = value3; client->data.l[2] = value3;
gdk_event_send_clientmessage_toall(&event); gdk_event_send_clientmessage_toall(&event);
return 0; return 0;
# endif
#else
/* FIXME not implemented */
return -1;
#endif #endif
} }
@ -196,22 +211,25 @@ void desktop_message_unregister(GtkWidget * window,
#else #else
w = gtk_widget_get_window(mc->widget); w = gtk_widget_get_window(mc->widget);
#endif #endif
#if defined(GDK_WINDOWING_X11)
gdk_window_remove_filter(w, _desktop_message_on_callback, mc); gdk_window_remove_filter(w, _desktop_message_on_callback, mc);
#if !GTK_CHECK_VERSION(3, 0, 0) # if !GTK_CHECK_VERSION(3, 0, 0)
if(mc->window == NULL) if(mc->window == NULL)
gtk_widget_destroy(mc->widget); gtk_widget_destroy(mc->widget);
#endif # endif
object_delete(mc); object_delete(mc);
p = &_callbacks[i]; p = &_callbacks[i];
memmove(p, p + 1, sizeof(*p) * (_callbacks_cnt - i - 1)); memmove(p, p + 1, sizeof(*p) * (_callbacks_cnt - i - 1));
if((p = realloc(_callbacks, sizeof(*p) * (--_callbacks_cnt))) != NULL if((p = realloc(_callbacks, sizeof(*p) * (--_callbacks_cnt))) != NULL
|| _callbacks_cnt == 0) || _callbacks_cnt == 0)
_callbacks = p; _callbacks = p;
#endif
} }
/* private */ /* private */
/* callbacks */ /* callbacks */
#if defined(GDK_WINDOWING_X11)
/* desktop_message_on_callback */ /* desktop_message_on_callback */
static GdkFilterReturn _desktop_message_on_callback(GdkXEvent * xevent, static GdkFilterReturn _desktop_message_on_callback(GdkXEvent * xevent,
GdkEvent * event, gpointer data) GdkEvent * event, gpointer data)
@ -254,3 +272,4 @@ static GdkFilterReturn _desktop_message_on_callback(GdkXEvent * xevent,
desktop_message_unregister(mc->window, mc->callback, mc->data); desktop_message_unregister(mc->window, mc->callback, mc->data);
return GDK_FILTER_REMOVE; return GDK_FILTER_REMOVE;
} }
#endif