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);
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.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);
}
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);
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;
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));
}
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);
}
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;
}
}