From: Thierry Lorthiois <lorthiois@bbsoft.fr>
Date: Thu, 23 Sep 2010 20:28:30 +0000 (+0000)
Subject: panel_items : fixed _NET_WM_ICON_GEOMETRY. panel_items is done for me.
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=1aa4d290a90cfc14416f43b205523a6bf401d973;p=chaz%2Ftint2

panel_items : fixed _NET_WM_ICON_GEOMETRY. panel_items is done for me.
---

diff --git a/src/server.c b/src/server.c
index 862e559..053b41f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -38,6 +38,7 @@ void server_init_atoms ()
 	server.atom._XROOTPMAP_ID = XInternAtom (server.dsp, "_XROOTPMAP_ID", False);
 	server.atom._NET_CURRENT_DESKTOP = XInternAtom (server.dsp, "_NET_CURRENT_DESKTOP", False);
 	server.atom._NET_NUMBER_OF_DESKTOPS = XInternAtom (server.dsp, "_NET_NUMBER_OF_DESKTOPS", False);
+	server.atom._NET_DESKTOP_NAMES = XInternAtom (server.dsp, "_NET_DESKTOP_NAMES", False);
 	server.atom._NET_DESKTOP_GEOMETRY = XInternAtom (server.dsp, "_NET_DESKTOP_GEOMETRY", False);
 	server.atom._NET_DESKTOP_VIEWPORT = XInternAtom (server.dsp, "_NET_DESKTOP_VIEWPORT", False);
 	server.atom._NET_ACTIVE_WINDOW = XInternAtom (server.dsp, "_NET_ACTIVE_WINDOW", False);
diff --git a/src/server.h b/src/server.h
index 8237a39..0ee6ea5 100644
--- a/src/server.h
+++ b/src/server.h
@@ -19,6 +19,7 @@ typedef struct Global_atom
 	Atom _XROOTPMAP_ID;
 	Atom _NET_CURRENT_DESKTOP;
 	Atom _NET_NUMBER_OF_DESKTOPS;
+	Atom _NET_DESKTOP_NAMES;
 	Atom _NET_DESKTOP_GEOMETRY;
 	Atom _NET_DESKTOP_VIEWPORT;
 	Atom _NET_ACTIVE_WINDOW;
diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index 83e827f..b132ae6 100644
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -344,6 +344,9 @@ void draw_task (void *obj, cairo_t *c)
 	Panel *panel = (Panel*)tsk->area.panel;
 	//printf("draw_task %d %d\n", tsk->area.posx, tsk->area.posy);
 
+	long value[] = { panel->posx+tsk->area.posx, panel->posy+tsk->area.posy, tsk->area.width, tsk->area.height };
+	XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
+
 	if (panel->g_task.text) {
 		/* Layout */
 		layout = pango_cairo_create_layout (c);
diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 6901fcc..4538892 100644
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -266,6 +266,7 @@ int resize_taskbar(void *obj)
 	GSList *l;
 	int  task_count, border_width;
 
+	//printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
 //	taskbar->area.redraw = 1;
 	border_width = taskbar->area.bg->border.width;
 
@@ -297,9 +298,6 @@ int resize_taskbar(void *obj)
 			if (!tsk->area.on_screen) continue;
 			//set_task_redraw(tsk);  // always redraw task, because the background could have changed (taskbar_active_id)
 			tsk->area.width = pixel_width;
-// TODO : move later (when posx is known)
-//			long value[] = { panel->posx+x, panel->posy, pixel_width, panel->area.height };
-//			XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
 
 			if (modulo_width) {
 				tsk->area.width++;
@@ -335,9 +333,6 @@ int resize_taskbar(void *obj)
 			if (!tsk->area.on_screen) continue;
 			//set_task_redraw(tsk);  // always redraw task, because the background could have changed (taskbar_active_id)
 			tsk->area.height = pixel_height;
-// TODO : move later (when posy is known)
-//			long value[] = { panel->posx, panel->posy+y, panel->area.width, pixel_height };
-//			XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
 
 			if (modulo_height) {
 				tsk->area.height++;
diff --git a/src/tint.c b/src/tint.c
index 2f5edc6..22f67da 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -485,6 +485,11 @@ void event_property_notify (XEvent *e)
 			server.got_root_win = 1;
 		}
 
+		// Change name of desktops
+		else if (at == server.atom._NET_DESKTOP_NAMES) {
+			printf("_NET_DESKTOP_NAMES\n");
+			panel_refresh = 1;
+		}
 		// Change number of desktops
 		else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
 			if (!taskbar_enabled) return;