add missing battery config CPP guard

[chaz/tint2] / src / server.c

diff --git a/src/server.c b/src/server.c
index 053b41f29d43fe287526c7631cb022451decf90b..f65739af92e67fa231a10cb3d38e29740b7cd068 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -36,6 +36,7 @@ void server_catch_error (Display *d, XErrorEvent *ev){}
 void server_init_atoms ()
 {
        server.atom._XROOTPMAP_ID = XInternAtom (server.dsp, "_XROOTPMAP_ID", False);
+       server.atom._XROOTMAP_ID = XInternAtom (server.dsp, "_XROOTMAP_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);
@@ -80,23 +81,34 @@ 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.XdndEnter = XInternAtom(server.dsp, "XdndEnter", False);
        server.atom.XdndPosition = XInternAtom(server.dsp, "XdndPosition", False);
        server.atom.XdndStatus = XInternAtom(server.dsp, "XdndStatus", False);
+       server.atom.XdndDrop = XInternAtom(server.dsp, "XdndDrop", False);
        server.atom.XdndLeave = XInternAtom(server.dsp, "XdndLeave", False);
+       server.atom.XdndSelection = XInternAtom(server.dsp, "XdndSelection", False);
+       server.atom.XdndTypeList = XInternAtom(server.dsp, "XdndTypeList", False);
+       server.atom.XdndActionCopy = XInternAtom(server.dsp, "XdndActionCopy", False);
+       server.atom.XdndFinished = XInternAtom(server.dsp, "XdndFinished", False);
+       server.atom.TARGETS = XInternAtom(server.dsp, "TARGETS", False);
 }
 
 
@@ -184,16 +196,17 @@ void get_root_pixmap()
        Pixmap ret = None;
 
        unsigned long *res;
-       int  c = 2;
+       Atom pixmap_atoms[] = { server.atom._XROOTPMAP_ID, server.atom._XROOTMAP_ID };
+       int i;
 
-       do {
-               res = server_get_property (server.root_win, server.atom._XROOTPMAP_ID, XA_PIXMAP, 0);
+       for (i=0; i<sizeof(pixmap_atoms)/sizeof(Atom); ++i) {
+               res = server_get_property (server.root_win, pixmap_atoms[i], XA_PIXMAP, 0);
                if (res) {
                        ret = *((Pixmap*)res);
                        XFree(res);
                        break;
                }
-       } while (--c > 0);
+       }
        server.root_pmap = ret;
 
        if (server.root_pmap == None)
@@ -303,7 +316,7 @@ 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;