panel_items : fixed _NET_WM_ICON_GEOMETRY. panel_items is done for me.

[chaz/tint2] / src / server.c

diff --git a/src/server.c b/src/server.c
index 99c4e5118b65e3c4f9002d97d9af460823f54d9b..053b41f29d43fe287526c7631cb022451decf90b 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -27,18 +27,18 @@
 #include <unistd.h>
 
 #include "server.h"
+#include "config.h"
 #include "task.h"
 #include "window.h"
 
 void server_catch_error (Display *d, XErrorEvent *ev){}
 
-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);
@@ -69,6 +69,7 @@ void server_init_atoms ()
        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);
@@ -95,10 +96,7 @@ void server_init_atoms ()
        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.colormap = 0;
-       server.monitor = 0;
-       server.gc = 0;
+       server.atom.XdndLeave = XInternAtom(server.dsp, "XdndLeave", False);
 }
 
 
@@ -109,7 +107,8 @@ void cleanup_server()
        if (server.monitor) {
                int i;
                for (i=0; i<server.nb_monitor; ++i)
-                       g_strfreev(server.monitor[i].names);
+                       if (server.monitor[i].names)
+                               g_strfreev(server.monitor[i].names);
                free(server.monitor);
        }
        if (server.gc) XFreeGC(server.dsp, server.gc);
@@ -172,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;
@@ -252,21 +251,12 @@ int compareMonitorIncluded(const void *monitor1, const void *monitor2)
 
 void get_monitors()
 {
-       if (server.monitor) {
-               int i;
-               for (i=0; i<server.nb_monitor; ++i)
-                       g_strfreev(server.monitor[i].names);
-               free(server.monitor);
-       }
-       server.nb_monitor = 0;
-       server.monitor = 0;
-
        int i, j, nbmonitor;
        if (XineramaIsActive(server.dsp)) {
                XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nbmonitor);
                XRRScreenResources *res = XRRGetScreenResourcesCurrent(server.dsp, server.root_win);
 
-               if (res->ncrtc >= nbmonitor) {
+               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));
@@ -314,12 +304,14 @@ void get_monitors()
                }
 next:
                for (j=i; j<server.nb_monitor; ++j)
-                       g_strfreev(server.monitor[j].names);
+                       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);
 
-               XRRFreeScreenResources(res);
+               if (res)
+                       XRRFreeScreenResources(res);
                XFree(info);
        }
 
@@ -329,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;
        }
 }
 
@@ -385,19 +378,20 @@ void server_init_visual()
                server.colormap32 = XCreateColormap(server.dsp, server.root_win, visual, AllocNone);
        }
 
-       if (visual && server.composite_manager != None) {
+       if (visual && server.composite_manager != None && snapshot_path == 0) {
                XSetWindowAttributes attrs;
                attrs.event_mask = StructureNotifyMask;
                XChangeWindowAttributes (server.dsp, server.composite_manager, CWEventMask, &attrs);
 
-               real_transparency = 1;
+               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 {
-               real_transparency = 0;
+               // 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);