X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fserver.c;h=c1401aedcc603e56cb08f6448a5ac42c7d0b621a;hb=d3ffd17946b172b64b2abc646176510a0773bc5f;hp=9b09010506e2bc53323303ecb0df5eaae8d20a44;hpb=886c0888915a3daeb3eb3342ff63b3e6cbdb4d63;p=chaz%2Ftint2 diff --git a/src/server.c b/src/server.c index 9b09010..c1401ae 100644 --- a/src/server.c +++ b/src/server.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **************************************************************************/ +#include + #include #include #include @@ -28,8 +30,7 @@ void server_catch_error (Display *d, XErrorEvent *ev){} -static char *name_trayer = 0; - +int real_transparency = 0; void server_init_atoms () { @@ -58,6 +59,7 @@ void server_init_atoms () 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_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); @@ -75,7 +77,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); @@ -83,6 +85,7 @@ 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); @@ -93,7 +96,9 @@ void server_init_atoms () void cleanup_server() { - if (name_trayer) free(name_trayer); + if (server.colormap) XFreeColormap(server.dsp, server.colormap); + if (server.monitor) free(server.monitor); + if (server.gc) XFreeGC(server.dsp, server.gc); } @@ -193,7 +198,7 @@ void get_root_pixmap() } -int compareMonitor(const void *monitor1, const void *monitor2) +int compareMonitorPos(const void *monitor1, const void *monitor2) { Monitor *m1 = (Monitor*)monitor1; Monitor *m2 = (Monitor*)monitor2; @@ -201,21 +206,33 @@ int compareMonitor(const void *monitor1, const void *monitor2) if (m1->x < m2->x) { return -1; } - else - if (m1->x > m2->x) { - return 1; - } - else - if (m1->width < m2->width) { - return 1; - } - else - if (m1->width > m2->width) { - return -1; - } - else { - return 0; - } + else if (m1->x > m2->x) { + return 1; + } + else if (m1->y < m2->y) { + return -1; + } + else if (m1->y > m2->y) { + return 1; + } + else { + return 0; + } +} + + +int compareMonitorIncluded(const void *monitor1, const void *monitor2) +{ + Monitor *m1 = (Monitor*)monitor1; + Monitor *m2 = (Monitor*)monitor2; + + if (m1->x >= m2->x && m1->y >= m2->y && (m1->x+m1->width) <= (m2->x+m2->width) && (m1->y+m1->height) <= (m2->y+m2->height)) { + // m1 included inside m2 + return 1; + } + else { + return -1; + } } @@ -225,49 +242,43 @@ void get_monitors() server.nb_monitor = 0; server.monitor = 0; - int i, nb_monitor; + int i, j, nbmonitor; if (XineramaIsActive(server.dsp)) { - XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nb_monitor); + XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nbmonitor); + + 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; + } + XFree(info); - if (info) { - int nb=0, j; + // ordered monitor + qsort(server.monitor, nbmonitor, sizeof(Monitor), compareMonitorIncluded); + // remove monitor included into another one i = 0; - server.monitor = calloc(nb_monitor, sizeof(Monitor)); - while (i < nb_monitor) { - for (j = 0; j < i; j++) { - if (info[i].x_org >= info[j].x_org && info[i].y_org >= info[j].y_org && (info[i].x_org+info[i].width) <= (info[j].x_org+info[j].width) && (info[i].y_org+info[i].height) <= (info[j].y_org+info[j].height)) { - if (info[i].x_org == info[j].x_org && info[i].y_org == info[j].y_org && info[i].width == info[j].width && info[i].height == info[j].height && nb == 0) { - // add the first monitor - break; - } - else { - // doesn't count monitor 'i' because it's included into another one - //fprintf(stderr, "monitor %d included into another one\n", i); - goto next; - } + while (i < nbmonitor) { + for (j=0; j < i ; j++) { + if (compareMonitorIncluded(&server.monitor[i], &server.monitor[j]) > 0) { + goto next; } } - - server.monitor[nb].x = info[i].x_org; - server.monitor[nb].y = info[i].y_org; - server.monitor[nb].width = info[i].width; - server.monitor[nb].height = info[i].height; - nb++; -next: i++; } - XFree(info); - server.nb_monitor = nb; - - // ordered monitor according to coordinate - qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitor); +next: + server.nb_monitor = i; + server.monitor = realloc(server.monitor, server.nb_monitor * sizeof(Monitor)); + qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitorPos); } } if (!server.nb_monitor) { server.nb_monitor = 1; - server.monitor = calloc(server.nb_monitor, sizeof(Monitor)); + server.monitor = malloc(sizeof(Monitor)); 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); @@ -290,7 +301,41 @@ void get_desktops() server.nb_desktop = 1; fprintf(stderr, "warning : WM doesn't respect NETWM specs. tint2 default to 1 desktop.\n"); } - fprintf(stderr, "tint2 : nb monitor %d, nb desktop %d\n", server.nb_monitor, server.nb_desktop); } +void server_init_visual() +{ + // inspired by freedesktops fdclock ;) + XVisualInfo *xvi; + XVisualInfo templ = { .screen=server.screen, .depth=32, .class=TrueColor }; + int nvi; + xvi = XGetVisualInfo(server.dsp, VisualScreenMask|VisualDepthMask|VisualClassMask, &templ, &nvi); + + Visual *visual = 0; + if (xvi) { + int i; + XRenderPictFormat *format; + for (i = 0; i < nvi; i++) { + format = XRenderFindVisualFormat(server.dsp, xvi[i].visual); + if (format->type == PictTypeDirect && format->direct.alphaMask) { + visual = xvi[i].visual; + break; + } + } + } + XFree (xvi); + + if (visual && real_transparency) { + 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 { + server.depth = DefaultDepth(server.dsp, server.screen); + printf("real transparency off.... depth: %d\n", server.depth); + server.colormap = DefaultColormap(server.dsp, server.screen); + server.visual = DefaultVisual(server.dsp, server.screen); + } +}