X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Fserver.c;h=053b41f29d43fe287526c7631cb022451decf90b;hp=f84396319efbcaf0dfbcbe9285c02b386c225fd3;hb=1aa4d290a90cfc14416f43b205523a6bf401d973;hpb=be465e9a323ee71d7a6ab71040a117d3d64db813

diff --git a/src/server.c b/src/server.c
index f843963..053b41f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -19,26 +19,26 @@
 **************************************************************************/
 
 #include <X11/extensions/Xrender.h>
+#include <X11/extensions/Xrandr.h>
+
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "server.h"
+#include "config.h"
 #include "task.h"
 #include "window.h"
 
 void server_catch_error (Display *d, XErrorEvent *ev){}
 
-static char *name_trayer = 0;
-
-int real_transparency = 0;
-
 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);
@@ -60,16 +60,20 @@ void server_init_atoms ()
 	server.atom._NET_WM_STATE_MAXIMIZED_VERT = XInternAtom (server.dsp, "_NET_WM_STATE_MAXIMIZED_VERT", False);
 	server.atom._NET_WM_STATE_MAXIMIZED_HORZ = XInternAtom (server.dsp, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
 	server.atom._NET_WM_STATE_SHADED = XInternAtom (server.dsp, "_NET_WM_STATE_SHADED", False);
+	server.atom._NET_WM_STATE_HIDDEN = XInternAtom (server.dsp, "_NET_WM_STATE_HIDDEN", False);
 	server.atom._NET_WM_STATE_BELOW = XInternAtom (server.dsp, "_NET_WM_STATE_BELOW", False);
+	server.atom._NET_WM_STATE_ABOVE = XInternAtom (server.dsp, "_NET_WM_STATE_ABOVE", False);
 	server.atom._NET_WM_STATE_MODAL = XInternAtom (server.dsp, "_NET_WM_STATE_MODAL", False);
 	server.atom._NET_CLIENT_LIST = XInternAtom (server.dsp, "_NET_CLIENT_LIST", False);
 	server.atom._NET_WM_VISIBLE_NAME = XInternAtom (server.dsp, "_NET_WM_VISIBLE_NAME", False);
 	server.atom._NET_WM_NAME = XInternAtom (server.dsp, "_NET_WM_NAME", False);
 	server.atom._NET_WM_STRUT = XInternAtom (server.dsp, "_NET_WM_STRUT", False);
 	server.atom._NET_WM_ICON = XInternAtom (server.dsp, "_NET_WM_ICON", False);
+	server.atom._NET_WM_ICON_GEOMETRY = XInternAtom(server.dsp, "_NET_WM_ICON_GEOMETRY", False );
 	server.atom._NET_CLOSE_WINDOW = XInternAtom (server.dsp, "_NET_CLOSE_WINDOW", False);
 	server.atom.UTF8_STRING = XInternAtom (server.dsp, "UTF8_STRING", False);
 	server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom (server.dsp, "_NET_SUPPORTING_WM_CHECK", False);
+	server.atom._NET_WM_CM_S0 = XInternAtom (server.dsp, "_NET_WM_CM_S0", False);
 	server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom (server.dsp, "_NET_WM_NAME", False);
 	server.atom._NET_WM_STRUT_PARTIAL = XInternAtom (server.dsp, "_NET_WM_STRUT_PARTIAL", False);
 	server.atom.WM_NAME = XInternAtom(server.dsp, "WM_NAME", False);
@@ -78,7 +82,7 @@ void server_init_atoms ()
 	server.atom.WM_HINTS = XInternAtom(server.dsp, "WM_HINTS", False);
 
 	// systray protocol
-	name_trayer = g_strdup_printf("_NET_SYSTEM_TRAY_S%d", DefaultScreen(server.dsp));
+	char *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);
@@ -86,20 +90,28 @@ void server_init_atoms ()
 	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);
+	g_free(name_trayer);
 
 	// drag 'n' drop
 	server.atom.XdndAware = XInternAtom(server.dsp, "XdndAware", False);
 	server.atom.XdndPosition = XInternAtom(server.dsp, "XdndPosition", False);
 	server.atom.XdndStatus = XInternAtom(server.dsp, "XdndStatus", False);
+	server.atom.XdndLeave = XInternAtom(server.dsp, "XdndLeave", False);
 }
 
 
 void cleanup_server()
 {
-	if (name_trayer) free(name_trayer);
-	XFreeColormap(server.dsp, server.colormap);
-	free(server.monitor);
-	XFreeGC(server.dsp, server.gc);
+	if (server.colormap) XFreeColormap(server.dsp, server.colormap);
+	if (server.colormap32) XFreeColormap(server.dsp, server.colormap32);
+	if (server.monitor) {
+		int i;
+		for (i=0; i<server.nb_monitor; ++i)
+			if (server.monitor[i].names)
+				g_strfreev(server.monitor[i].names);
+		free(server.monitor);
+	}
+	if (server.gc) XFreeGC(server.dsp, server.gc);
 }
 
 
@@ -159,8 +171,8 @@ void *server_get_property (Window win, Atom at, Atom type, int *num_results)
 
 	result = XGetWindowProperty(server.dsp, win, at, 0, 0x7fffffff, False, type, &type_ret, &format_ret, &nitems_ret, &bafter_ret, &prop_value);
 
-	/* Send back resultcount */
-	if (num_results) *num_results = nitems_ret;
+	// Send back resultcount
+	if (num_results) *num_results = (int)nitems_ret;
 
 	if (result == Success && prop_value) return prop_value;
 	else return 0;
@@ -239,42 +251,68 @@ int compareMonitorIncluded(const void *monitor1, const void *monitor2)
 
 void get_monitors()
 {
-	if (server.monitor) free(server.monitor);
-	server.nb_monitor = 0;
-	server.monitor = 0;
-
 	int i, j, nbmonitor;
 	if (XineramaIsActive(server.dsp)) {
 		XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nbmonitor);
-
-		if (info && nbmonitor > 0) {
+		XRRScreenResources *res = XRRGetScreenResourcesCurrent(server.dsp, server.root_win);
+
+		if (res && res->ncrtc >= nbmonitor) {
+			// use xrandr to identify monitors (does not work with proprietery nvidia drivers)
+			printf("xRandr: Found crtc's: %d\n", res->ncrtc );
+			server.monitor = malloc(res->ncrtc * sizeof(Monitor));
+			for (i=0; i<res->ncrtc; ++i) {
+				XRRCrtcInfo* crtc_info = XRRGetCrtcInfo(server.dsp, res, res->crtcs[i]);
+				server.monitor[i].x = crtc_info->x;
+				server.monitor[i].y = crtc_info->y;
+				server.monitor[i].width = crtc_info->width;
+				server.monitor[i].height = crtc_info->height;
+				server.monitor[i].names = malloc((crtc_info->noutput+1) * sizeof(char*));
+				for (j=0; j<crtc_info->noutput; ++j) {
+					XRROutputInfo* output_info = XRRGetOutputInfo(server.dsp, res, crtc_info->outputs[j]);
+					printf("xRandr: Linking output %s with crtc %d\n", output_info->name, i);
+					server.monitor[i].names[j] = g_strdup(output_info->name);
+					XRRFreeOutputInfo(output_info);
+				}
+				server.monitor[i].names[j] = 0;
+				XRRFreeCrtcInfo(crtc_info);
+			}
+			nbmonitor = res->ncrtc;
+		}
+		else if (info && nbmonitor > 0) {
 			server.monitor = malloc(nbmonitor * sizeof(Monitor));
 			for (i=0 ; i < nbmonitor ; 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;
+				server.monitor[i].names = 0;
 			}
-			XFree(info);
-
-			// ordered monitor
-			qsort(server.monitor, nbmonitor, sizeof(Monitor), compareMonitorIncluded);
-
-			// remove monitor included into another one
-			i = 0;
-			while (i < nbmonitor) {
-				for (j=0; j < i ; j++) {
-					if (compareMonitorIncluded(&server.monitor[i], &server.monitor[j]) > 0) {
-						goto next;
-					}
+		}
+
+		// ordered monitor
+		qsort(server.monitor, nbmonitor, sizeof(Monitor), compareMonitorIncluded);
+
+		// remove monitor included into another one
+		i = 0;
+		while (i < nbmonitor) {
+			for (j=0; j < i ; j++) {
+				if (compareMonitorIncluded(&server.monitor[i], &server.monitor[j]) > 0) {
+					goto next;
 				}
-				i++;
 			}
-next:
-			server.nb_monitor = i;
-			server.monitor = realloc(server.monitor, server.nb_monitor * sizeof(Monitor));
-			qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitorPos);
+			i++;
 		}
+next:
+		for (j=i; j<server.nb_monitor; ++j)
+			if (server.monitor[j].names)
+				g_strfreev(server.monitor[j].names);
+		server.nb_monitor = i;
+		server.monitor = realloc(server.monitor, server.nb_monitor * sizeof(Monitor));
+		qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitorPos);
+
+		if (res)
+			XRRFreeScreenResources(res);
+		XFree(info);
 	}
 
 	if (!server.nb_monitor) {
@@ -283,6 +321,7 @@ next:
 		server.monitor[0].x = server.monitor[0].y = 0;
 		server.monitor[0].width = DisplayWidth (server.dsp, server.screen);
 		server.monitor[0].height = DisplayHeight (server.dsp, server.screen);
+		server.monitor[0].names = 0;
 	}
 }
 
@@ -307,6 +346,7 @@ void get_desktops()
 
 void server_init_visual()
 {
+	// inspired by freedesktops fdclock ;)
 	XVisualInfo *xvi;
 	XVisualInfo templ = { .screen=server.screen, .depth=32, .class=TrueColor };
 	int nvi;
@@ -326,13 +366,32 @@ void server_init_visual()
 	}
 	XFree (xvi);
 
-	if (visual && real_transparency) {
+	// check composite manager
+	server.composite_manager = XGetSelectionOwner(server.dsp, server.atom._NET_WM_CM_S0);
+	if (server.colormap)
+		XFreeColormap(server.dsp, server.colormap);
+	if (server.colormap32)
+		XFreeColormap(server.dsp, server.colormap32);
+
+	if (visual) {
+		server.visual32 = visual;
+		server.colormap32 = XCreateColormap(server.dsp, server.root_win, visual, AllocNone);
+	}
+
+	if (visual && server.composite_manager != None && snapshot_path == 0) {
+		XSetWindowAttributes attrs;
+		attrs.event_mask = StructureNotifyMask;
+		XChangeWindowAttributes (server.dsp, server.composite_manager, CWEventMask, &attrs);
+
+		server.real_transparency = 1;
 		server.depth = 32;
 		printf("real transparency on... depth: %d\n", server.depth);
 		server.colormap = XCreateColormap(server.dsp, server.root_win, visual, AllocNone);
 		server.visual = visual;
 	}
 	else {
+		// no composite manager or snapshot mode => fake transparency
+		server.real_transparency = 0;
 		server.depth = DefaultDepth(server.dsp, server.screen);
 		printf("real transparency off.... depth: %d\n", server.depth);
 		server.colormap = DefaultColormap(server.dsp, server.screen);