X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fserver.c;h=db069930a6bfdf3e9da783febad492fb823c5ca8;hb=63d0566a83024a422d1d4bedb1833d439d92b270;hp=4b5726d316e7043876ef091fa4c86cf14fe77961;hpb=fd52a8efaeb932e09342704a520a07ff01ef2ef1;p=chaz%2Ftint2

diff --git a/src/server.c b/src/server.c
index 4b5726d..db06993 100644
--- a/src/server.c
+++ b/src/server.c
@@ -20,14 +20,16 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "server.h"
-#include "panel.h"
 #include "task.h"
 #include "window.h"
 
 void server_catch_error (Display *d, XErrorEvent *ev){}
 
+static char *name_trayer = 0;
+
 
 void server_init_atoms ()
 {
@@ -41,6 +43,7 @@ void server_init_atoms ()
    server.atom._NET_WM_STATE_SKIP_PAGER = XInternAtom (server.dsp, "_NET_WM_STATE_SKIP_PAGER", False);
    server.atom._NET_WM_STATE_SKIP_TASKBAR = XInternAtom (server.dsp, "_NET_WM_STATE_SKIP_TASKBAR", False);
    server.atom._NET_WM_STATE_STICKY = XInternAtom (server.dsp, "_NET_WM_STATE_STICKY", False);
+   server.atom._NET_WM_STATE_DEMANDS_ATTENTION = XInternAtom (server.dsp, "_NET_WM_STATE_DEMANDS_ATTENTION", False);
    server.atom._NET_WM_WINDOW_TYPE_DOCK = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_DOCK", False);
    server.atom._NET_WM_WINDOW_TYPE_DESKTOP = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_DESKTOP", False);
    server.atom._NET_WM_WINDOW_TYPE_TOOLBAR = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_TOOLBAR", False);
@@ -68,6 +71,20 @@ void server_init_atoms ()
    server.atom.WM_NAME = XInternAtom(server.dsp, "WM_NAME", False);
    server.atom.__SWM_VROOT = XInternAtom(server.dsp, "__SWM_VROOT", False);
    server.atom._MOTIF_WM_HINTS = XInternAtom(server.dsp, "_MOTIF_WM_HINTS", False);
+
+	// systray protocol
+	name_trayer = g_strdup_printf("_NET_SYSTEM_TRAY_S%d", DefaultScreen(server.dsp));
+	server.atom._NET_SYSTEM_TRAY_SCREEN = XInternAtom(server.dsp, name_trayer, False);
+	server.atom._NET_SYSTEM_TRAY_OPCODE = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_OPCODE", False);
+	server.atom.MANAGER = XInternAtom(server.dsp, "MANAGER", False);
+	server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
+	server.atom._NET_SYSTEM_TRAY_ORIENTATION = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_ORIENTATION", False);
+}
+
+
+void cleanup_server()
+{
+	if (name_trayer) free(name_trayer);
 }
 
 
@@ -135,6 +152,38 @@ void *server_get_property (Window win, Atom at, Atom type, int *num_results)
 }
 
 
+void get_root_pixmap()
+{
+	Pixmap ret = None;
+
+   unsigned long *res;
+	int  c = 2;
+
+	do {
+		res = server_get_property (server.root_win, server.atom._XROOTPMAP_ID, XA_PIXMAP, 0);
+		if (res) {
+			ret = *((Pixmap*)res);
+			XFree(res);
+         break;
+		}
+	} while (--c > 0);
+	server.root_pmap = ret;
+
+	if (server.root_pmap == None)
+		fprintf(stderr, "tint2 : pixmap background detection failed\n");
+	else {
+		XGCValues  gcv;
+		gcv.ts_x_origin = 0;
+		gcv.ts_y_origin = 0;
+		gcv.fill_style = FillTiled;
+		uint mask = GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle | GCTile;
+
+		gcv.tile = server.root_pmap;
+		XChangeGC(server.dsp, server.gc, mask, &gcv);
+	}
+}
+
+
 int compareMonitor(const void *monitor1, const void *monitor2)
 {
    Monitor *m1 = (Monitor*)monitor1;
@@ -161,8 +210,10 @@ int compareMonitor(const void *monitor1, const void *monitor2)
 }
 
 
-void get_monitors()
+void get_monitors_and_desktops()
 {
+   int i;
+
    if (server.monitor) free(server.monitor);
    server.nb_monitor = 0;
    server.monitor = 0;
@@ -172,19 +223,36 @@ void get_monitors()
       XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nb_monitor);
 
       if (info) {
-         int i;
+			int nb=0, j;
 
-         //printf("nb_monitors %d\n", nb_monitor);
-         server.nb_monitor = nb_monitor;
+         i = 0;
          server.monitor = calloc(nb_monitor, sizeof(Monitor));
-         for (i = 0; i < server.nb_monitor; i++) {
-            server.monitor[i].x = info[i].x_org;
-            server.monitor[i].y = info[i].y_org;
-            server.monitor[i].width = info[i].width;
-            server.monitor[i].height = info[i].height;
+         while (i < nb_monitor) {
+	         for (j = 0; j < i; j++) {
+					if (info[i].x_org >= info[j].x_org && info[i].y_org >= info[j].y_org && (info[i].x_org+info[i].width) <= (info[j].x_org+info[j].width) && (info[i].y_org+info[i].height) <= (info[j].y_org+info[j].height)) {
+						if (info[i].x_org == info[j].x_org && info[i].y_org == info[j].y_org && info[i].width == info[j].width && info[i].height == info[j].height && nb == 0) {
+							// add the first monitor
+							break;
+						}
+						else {
+							// doesn't count monitor 'i' because it's included into another one
+				       	//fprintf(stderr, "monitor %d included into another one\n", i);
+			       		goto next;
+						}
+					}
+				}
+
+            server.monitor[nb].x = info[i].x_org;
+            server.monitor[nb].y = info[i].y_org;
+            server.monitor[nb].width = info[i].width;
+            server.monitor[nb].height = info[i].height;
+				nb++;
+next:
+				i++;
          }
          XFree(info);
-         
+         server.nb_monitor = nb;
+
          // ordered monitor according to coordinate
          qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitor);
       }
@@ -197,6 +265,18 @@ void get_monitors()
       server.monitor[0].width = DisplayWidth (server.dsp, server.screen);
       server.monitor[0].height = DisplayHeight (server.dsp, server.screen);
    }
+
+	// detect number of desktops
+   for (i=0 ; i < 15 ; i++) {
+      server.nb_desktop = server_get_number_of_desktop ();
+      if (server.nb_desktop > 0) break;
+      sleep(1);
+   }
+   if (server.nb_desktop == 0) {
+      server.nb_desktop = 1;
+      fprintf(stderr, "tint2 : cannot found number of desktop.\n");
+   }
+  	fprintf(stderr, "tint2 : nb monitor %d, nb desktop %d\n", server.nb_monitor, server.nb_desktop);
 }