launcher : limit launcher_icon_theme to 1 theme. Add XSETTINGS client and read launch...

[chaz/tint2] / src / server.c

diff --git a/src/server.c b/src/server.c
index d30b10906ffbb119dc28054ab02e233af8dfd7e5..6ec363b0d5d95f11bae10bd75df9f41c7eb5a663 100644 (file)
--- 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);
@@ -68,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);
@@ -78,22 +80,27 @@ void server_init_atoms ()
        server.atom.__SWM_VROOT = XInternAtom(server.dsp, "__SWM_VROOT", False);
        server.atom._MOTIF_WM_HINTS = XInternAtom(server.dsp, "_MOTIF_WM_HINTS", False);
        server.atom.WM_HINTS = XInternAtom(server.dsp, "WM_HINTS", False);
+       char *name = g_strdup_printf("_XSETTINGS_S%d", DefaultScreen(server.dsp));
+       server.atom._XSETTINGS_SCREEN = XInternAtom(server.dsp, name, False);
+       g_free(name);
+       server.atom._XSETTINGS_SETTINGS = XInternAtom(server.dsp, "_XSETTINGS_SETTINGS", False);
 
        // systray protocol
-       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);
+       name = g_strdup_printf("_NET_SYSTEM_TRAY_S%d", DefaultScreen(server.dsp));
+       server.atom._NET_SYSTEM_TRAY_SCREEN = XInternAtom(server.dsp, name, False);
+       g_free(name);
        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);
-       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);
 }
 
 
@@ -168,8 +175,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;
@@ -253,7 +260,7 @@ void get_monitors()
                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));
@@ -300,14 +307,15 @@ void get_monitors()
                        i++;
                }
 next:
-               for (j=i; j<server.nb_monitor; ++j)
+               for (j=i; j<nbmonitor; ++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);
 
-               XRRFreeScreenResources(res);
+               if (res)
+                       XRRFreeScreenResources(res);
                XFree(info);
        }