X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=f2e97464647a0d2a1fc511a3f8e2ff61bab9f698;hb=12a528312b41b057ca90efbec7fb95eb8ddda82b;hp=f3bd2beaf5176330452c0f34b67315362a8fb25a;hpb=8269d3d140bce7dafde5c8448a96d4a90bc557e7;p=chaz%2Ftint2 diff --git a/src/panel.c b/src/panel.c index f3bd2be..f2e9746 100644 --- a/src/panel.c +++ b/src/panel.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **************************************************************************/ +#include #include #include #include @@ -31,25 +32,22 @@ void visual_refresh () { - if (!server.root_pmap) { - Pixmap wall = get_root_pixmap(); + if (!panel.area.pix.pmap) + set_panel_background(); - server.root_pmap = server_create_pixmap (panel.area.width, panel.area.height); - - XCopyArea (server.dsp, wall, server.root_pmap, server.gc, server.posx, server.posy, panel.area.width, panel.area.height, 0, 0); - - redraw (&panel.area); - } - if (server.pmap) XFreePixmap (server.dsp, server.pmap); - server.pmap = server_create_pixmap (panel.area.width, panel.area.height); + server.pmap = XCreatePixmap (server.dsp, server.root_win, panel.area.width, panel.area.height, server.depth); - XCopyArea (server.dsp, server.root_pmap, server.pmap, server.gc, 0, 0, panel.area.width, panel.area.height, 0, 0); - - draw (&panel.area); + XCopyArea (server.dsp, panel.area.pix.pmap, server.pmap, server.gc, 0, 0, panel.area.width, panel.area.height, 0, 0); - XCopyArea (server.dsp, server.pmap, window.main_win, server.gc, 0, 0, panel.area.width, panel.area.height, 0, 0); - XFlush(server.dsp); + // draw child object + GSList *l = panel.area.list; + for (; l ; l = l->next) + refresh (l->data); + + // main_win doesn't include panel.area.paddingx, so we have WM capabilities on left and right. + XCopyArea (server.dsp, server.pmap, window.main_win, server.gc, panel.area.paddingxlr, 0, panel.area.width-(2*panel.area.paddingxlr), panel.area.height, 0, 0); + XFlush (server.dsp); panel.refresh = 0; } @@ -65,7 +63,7 @@ void set_panel_properties (Window win) XChangeProperty(server.dsp, win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 8, PropModeReplace, (unsigned char *) name, (int) len); g_free(name); } - + // Dock long val = server.atom._NET_WM_WINDOW_TYPE_DOCK; XChangeProperty (server.dsp, win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1); @@ -85,7 +83,7 @@ void set_panel_properties (Window win) // Old specification : fluxbox need _NET_WM_STRUT. XChangeProperty (server.dsp, win, server.atom._NET_WM_STRUT, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 4); XChangeProperty (server.dsp, win, server.atom._NET_WM_STRUT_PARTIAL, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 12); - + // Sticky and below other window val = 0xFFFFFFFF; XChangeProperty (server.dsp, win, server.atom._NET_WM_DESKTOP, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1); @@ -94,18 +92,22 @@ void set_panel_properties (Window win) state[1] = server.atom._NET_WM_STATE_SKIP_TASKBAR; state[2] = server.atom._NET_WM_STATE_STICKY; state[3] = server.atom._NET_WM_STATE_BELOW; - XChangeProperty (server.dsp, win, server.atom._NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *) state, 4); - + XChangeProperty (server.dsp, win, server.atom._NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *) state, 4); + // Fixed position XSizeHints size_hints; size_hints.flags = PPosition; XChangeProperty (server.dsp, win, XA_WM_NORMAL_HINTS, XA_WM_SIZE_HINTS, 32, PropModeReplace, (unsigned char *) &size_hints, sizeof (XSizeHints) / 4); - + // Unfocusable XWMHints wmhints; wmhints.flags = InputHint; wmhints.input = False; XChangeProperty (server.dsp, win, XA_WM_HINTS, XA_WM_HINTS, 32, PropModeReplace, (unsigned char *) &wmhints, sizeof (XWMHints) / 4); + + // Undecorated + long prop[5] = { 2, 0, 0, 0, 0 }; + XChangeProperty(server.dsp, win, server.atom._MOTIF_WM_HINTS, server.atom._MOTIF_WM_HINTS, 32, PropModeReplace, (unsigned char *) prop, 5); } @@ -114,9 +116,9 @@ void window_draw_panel () Window win; /* panel position determined here */ - if (panel.position & LEFT) server.posx = server.monitor[panel.monitor].x + panel.marginx; + if (panel.position & LEFT) server.posx = server.monitor[panel.monitor].x + panel.marginleft; else { - if (panel.position & RIGHT) server.posx = server.monitor[panel.monitor].x + server.monitor[panel.monitor].width - panel.area.width - panel.marginx; + if (panel.position & RIGHT) server.posx = server.monitor[panel.monitor].x + server.monitor[panel.monitor].width - panel.area.width - panel.marginright; else server.posx = server.monitor[panel.monitor].x + ((server.monitor[panel.monitor].width - panel.area.width) / 2); } if (panel.position & TOP) server.posy = server.monitor[panel.monitor].y + panel.marginy; @@ -124,10 +126,11 @@ void window_draw_panel () /* Catch some events */ XSetWindowAttributes att = { ParentRelative, 0L, 0, 0L, 0, 0, Always, 0L, 0L, False, ExposureMask|ButtonPressMask|ButtonReleaseMask, NoEventMask, False, 0, 0 }; - - /* XCreateWindow(display, parent, x, y, w, h, border, depth, class, visual, mask, attrib) */ + + // XCreateWindow(display, parent, x, y, w, h, border, depth, class, visual, mask, attrib) + // main_win doesn't include panel.area.paddingx, so we have WM capabilities on left and right. if (window.main_win) XDestroyWindow(server.dsp, window.main_win); - win = XCreateWindow (server.dsp, server.root_win, server.posx, server.posy, panel.area.width, panel.area.height, 0, server.depth, InputOutput, CopyFromParent, CWEventMask, &att); + win = XCreateWindow (server.dsp, server.root_win, server.posx+panel.area.paddingxlr, server.posy, panel.area.width-(2*panel.area.paddingxlr), panel.area.height, 0, server.depth, InputOutput, CopyFromParent, CWEventMask, &att); set_panel_properties (win); window.main_win = win; @@ -136,7 +139,9 @@ void window_draw_panel () if (server.gc) XFree(server.gc); XGCValues gcValues; server.gc = XCreateGC(server.dsp, win, (unsigned long) 0, &gcValues); - + if (server.gc_root) XFree(server.gc_root); + server.gc_root = XCreateGC(server.dsp, server.root_win, (unsigned long) 0, &gcValues); + XMapWindow (server.dsp, win); XFlush (server.dsp); } @@ -146,7 +151,7 @@ void visible_object() { if (panel.area.list) { g_slist_free(panel.area.list); - panel.area.list = 0; + panel.area.list = 0; } // list of visible objects @@ -160,11 +165,70 @@ void visible_object() for (j=0 ; j < panel.nb_monitor ; j++) { taskbar = &panel.taskbar[index(i,j)]; if (panel.mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) continue; - + panel.area.list = g_slist_append(panel.area.list, taskbar); } } + set_redraw(&panel.area); panel.refresh = 1; } +Pixmap get_root_pixmap () +{ + Pixmap ret; + Window root = RootWindow(server.dsp, server.screen); + + ret = None; + int act_format, c = 2 ; + u_long nitems ; + u_long bytes_after ; + u_char *prop ; + Atom dummy_id; + + do { + if (XGetWindowProperty(server.dsp, root, server.atom._XROOTPMAP_ID, 0, 1, + False, XA_PIXMAP, &dummy_id, &act_format, + &nitems, &bytes_after, &prop) == Success) { + if (prop) { + ret = *((Pixmap *)prop); + XFree(prop); + break; + } + } + } while (--c > 0); + + if (ret == None) fprintf(stderr, "unknown background\n"); + return ret; +} + + +void set_panel_background() +{ + Pixmap wall = get_root_pixmap(); + + if (panel.area.pix.pmap) XFreePixmap (server.dsp, panel.area.pix.pmap); + panel.area.pix.pmap = XCreatePixmap (server.dsp, server.root_win, panel.area.width, panel.area.height, server.depth); + + // add layer of root pixmap + XCopyArea(server.dsp, wall, panel.area.pix.pmap, server.gc, server.posx, server.posy, panel.area.width, panel.area.height, 0, 0); + + // draw background panel + cairo_surface_t *cs; + cairo_t *c; + cs = cairo_xlib_surface_create (server.dsp, panel.area.pix.pmap, server.visual, panel.area.width, panel.area.height); + c = cairo_create (cs); + + draw_background (&panel.area, c, 0); + + cairo_destroy (c); + cairo_surface_destroy (cs); + + // copy background panel on desktop window + XCopyArea (server.dsp, panel.area.pix.pmap, server.root_win, server.gc_root, 0, 0, panel.area.width, panel.area.height, server.posx, server.posy); + + set_redraw (&panel.area); +} + + +