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

Determine the embedded behavior at run-time

Browse Source
This commit is contained in:
Pierre Pronchery 2015-10-23 19:17:45 +02:00
parent d7da80eda4
commit 1b5d356964
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/applets/tasks.c
View File

@ -60,6 +60,7 @@ struct _PanelApplet
size_t tasks_cnt; size_t tasks_cnt;
gboolean label; gboolean label;
gboolean reorder; gboolean reorder;
gboolean embedded;
GtkWidget * widget; GtkWidget * widget;
GtkWidget * hbox; GtkWidget * hbox;
@ -305,6 +306,11 @@ static Tasks * _tasks_init(PanelAppletHelper * helper, GtkWidget ** widget)
#else #else
tasks->reorder = FALSE; tasks->reorder = FALSE;
#endif #endif
#ifdef EMBEDDED
tasks->embedded = TRUE;
#else
tasks->embedded = FALSE;
#endif
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
tasks->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); tasks->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous(GTK_BOX(tasks->hbox), TRUE); gtk_box_set_homogeneous(GTK_BOX(tasks->hbox), TRUE);
@ -364,10 +370,12 @@ static void _tasks_destroy(Tasks * tasks)
/* tasks_get_current_desktop */ /* tasks_get_current_desktop */
static int _tasks_get_current_desktop(Tasks * tasks) static int _tasks_get_current_desktop(Tasks * tasks)
{ {
#ifndef EMBEDDED
unsigned long cnt; unsigned long cnt;
unsigned long *p; unsigned long *p;
if(tasks->embedded)
/* ignore the current desktop */
return -1;
if(_tasks_get_window_property(tasks, GDK_WINDOW_XID(tasks->root), if(_tasks_get_window_property(tasks, GDK_WINDOW_XID(tasks->root),
TASKS_ATOM__NET_CURRENT_DESKTOP, XA_CARDINAL, TASKS_ATOM__NET_CURRENT_DESKTOP, XA_CARDINAL,
&cnt, (void *)&p) != 0) &cnt, (void *)&p) != 0)
@ -375,9 +383,6 @@ static int _tasks_get_current_desktop(Tasks * tasks)
cnt = *p; cnt = *p;
XFree(p); XFree(p);
return cnt; return cnt;
#else
return -1;
#endif
} }