X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver.c;h=9271fcd4512dd740b5a05bd7a4ccfcd6473388fe;hb=b68d4db999a5912c2fc7f29aef8ab75e2f742706;hp=8e90d24b8da179751adc2ec29aa701a1e4fcb242;hpb=cb9288bcb990b5ff5b550285f6d3ef752bd44d68;p=chaz%2Ftint2

diff --git a/src/server.c b/src/server.c
index 8e90d24..9271fcd 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,22 @@ 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);
+	server.atom._XEMBED = XInternAtom(server.dsp, "_XEMBED", False);
+	server.atom._XEMBED_INFO = XInternAtom(server.dsp, "_XEMBED_INFO", False);
+}
+
+
+void cleanup_server()
+{
+	if (name_trayer) free(name_trayer);
 }
 
 
@@ -135,6 +154,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 +212,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,8 +225,9 @@ void get_monitors()
       XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nb_monitor);
 
       if (info) {
-         int i = 0, nb=0, j;
+			int nb=0, j;
 
+         i = 0;
          server.monitor = calloc(nb_monitor, sizeof(Monitor));
          while (i < nb_monitor) {
 	         for (j = 0; j < i; j++) {
@@ -190,7 +244,6 @@ void get_monitors()
 					}
 				}
 
-	       	//fprintf(stderr, "monitor %d added\n", i);
             server.monitor[nb].x = info[i].x_org;
             server.monitor[nb].y = info[i].y_org;
             server.monitor[nb].width = info[i].width;
@@ -214,6 +267,19 @@ next:
       server.monitor[0].width = DisplayWidth (server.dsp, server.screen);
       server.monitor[0].height = DisplayHeight (server.dsp, server.screen);
    }
+
+	// detect number of desktops
+	// wait 15s to leave some time for window manager startup
+   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, "warning : WM doesn't respect NETWM specs. tint2 default to 1 desktop.\n");
+   }
+  	fprintf(stderr, "tint2 : nb monitor %d, nb desktop %d\n", server.nb_monitor, server.nb_desktop);
 }