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

panel-message: let it work standalone without X11

Browse Source
This commit is contained in:
Pierre Pronchery 2025-03-04 00:51:53 +01:00
parent 2b5ae3cc7a
commit cdb2512b8f
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/message.c
View File

@ -54,10 +54,8 @@
static int _message(unsigned int timeout, char const * stock, static int _message(unsigned int timeout, char const * stock,
char const * title, char const * message); char const * title, char const * message);
#if defined(GDK_WINDOWING_X11)
/* callbacks */ /* callbacks */
static gboolean _message_on_timeout(gpointer data); static gboolean _message_on_timeout(gpointer data);
#endif
static int _error(char const * message, int ret); static int _error(char const * message, int ret);
static int _usage(void); static int _usage(void);
@ -68,18 +66,28 @@ static int _usage(void);
static int _message(unsigned int timeout, char const * stock, static int _message(unsigned int timeout, char const * stock,
char const * title, char const * message) char const * title, char const * message)
{ {
#if defined(GDK_WINDOWING_X11)
PangoFontDescription * bold; PangoFontDescription * bold;
GtkWidget * plug; GtkWidget * plug;
GtkWidget * hbox; GtkWidget * hbox;
GtkWidget * vbox; GtkWidget * vbox;
GtkWidget * image; GtkWidget * image;
GtkWidget * widget; GtkWidget * widget;
#if defined(GDK_WINDOWING_X11)
uint32_t xid; uint32_t xid;
#endif
#if !defined(GDK_WINDOWING_X11)
error_set_print(PROGNAME_PANEL_MESSAGE, 2, "%s",
"X11 support not detected");
#endif
bold = pango_font_description_new(); bold = pango_font_description_new();
pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD); pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD);
#if defined(GDK_WINDOWING_X11)
plug = gtk_plug_new(0); plug = gtk_plug_new(0);
#else
plug = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(plug), "Message");
#endif
gtk_container_set_border_width(GTK_CONTAINER(plug), 4); gtk_container_set_border_width(GTK_CONTAINER(plug), 4);
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
@ -136,26 +144,18 @@ static int _message(unsigned int timeout, char const * stock,
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
gtk_container_add(GTK_CONTAINER(plug), hbox); gtk_container_add(GTK_CONTAINER(plug), hbox);
gtk_widget_show_all(plug); gtk_widget_show_all(plug);
#if defined(GDK_WINDOWING_X11)
xid = gtk_plug_get_id(GTK_PLUG(plug)); xid = gtk_plug_get_id(GTK_PLUG(plug));
desktop_message_send(PANEL_CLIENT_MESSAGE, PANEL_MESSAGE_EMBED, xid, 0); desktop_message_send(PANEL_CLIENT_MESSAGE, PANEL_MESSAGE_EMBED, xid, 0);
#endif
if(timeout > 0) if(timeout > 0)
g_timeout_add(timeout * 1000, _message_on_timeout, NULL); g_timeout_add(timeout * 1000, _message_on_timeout, NULL);
pango_font_description_free(bold); pango_font_description_free(bold);
gtk_main(); gtk_main();
return 0; return 0;
#else
(void) timeout;
(void) stock;
(void) title;
(void) message;
return error_set_print(PROGNAME_PANEL_MESSAGE, 2, "%s",
"X11 support not detected");
#endif
} }
#if defined(GDK_WINDOWING_X11)
/* callbacks */ /* callbacks */
/* message_on_timeout */ /* message_on_timeout */
static gboolean _message_on_timeout(gpointer data) static gboolean _message_on_timeout(gpointer data)
@ -165,7 +165,6 @@ static gboolean _message_on_timeout(gpointer data)
gtk_main_quit(); gtk_main_quit();
return FALSE; return FALSE;
} }
#endif
/* error */ /* error */