X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=34954f7eba02b56bc1e0679282a98bcfe15c13d4;hb=b7aaf2ac709f85602ef6152980a639fd3a8577e7;hp=50aa5c38bf175e0779afff8e9fca4d844572d54a;hpb=9d9dc352d8af4d85c5e4984c72b45ad393fb65d6;p=chaz%2Ftint2 diff --git a/src/panel.c b/src/panel.c index 50aa5c3..34954f7 100644 --- a/src/panel.c +++ b/src/panel.c @@ -46,13 +46,13 @@ int mouse_tilt_right; int panel_mode; int wm_menu; int panel_dock=0; // default not in the dock +int panel_layer=BOTTOM_LAYER; // default is bottom layer int panel_position; int panel_horizontal; int panel_refresh; Task *task_active; Task *task_drag; -GSList *urgent_list; int max_tick_urgent; // panel's initial config @@ -152,14 +152,19 @@ void init_panel() long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask; if (g_tooltip.enabled) event_mask |= PointerMotionMask|LeaveWindowMask; - XSetWindowAttributes att = { ParentRelative, 0L, 0, 0L, 0, 0, Always, 0L, 0L, False, event_mask, NoEventMask, False, 0, 0 }; - p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, CopyFromParent, CWEventMask, &att); + XSetWindowAttributes att = { .event_mask=event_mask, .colormap=server.colormap, .background_pixel=0, .border_pixel=0 }; + unsigned long mask = CWEventMask|CWColormap|CWBackPixel|CWBorderPixel; + p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, server.visual, mask, &att); } else { // old panel XMoveResizeWindow(server.dsp, p->main_win, p->posx, p->posy, p->area.width, p->area.height); } + if (!server.gc) { + XGCValues gcv; + server.gc = XCreateGC(server.dsp, p->main_win, 0, &gcv); + } //printf("panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height); set_panel_properties(p); set_panel_background(p); @@ -239,11 +244,6 @@ void cleanup_panel() task_active = 0; task_drag = 0; - while (urgent_list) { - Task_urgent* t = urgent_list->data; - urgent_list = g_slist_remove(urgent_list, urgent_list->data); - free(t); - } cleanup_taskbar(); @@ -395,14 +395,14 @@ void set_panel_properties(Panel *p) XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1); // Sticky and below other window - val = 0xFFFFFFFF; + val = ALLDESKTOP; XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_DESKTOP, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1); Atom state[4]; state[0] = server.atom._NET_WM_STATE_SKIP_PAGER; 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, p->main_win, server.atom._NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *) state, 4); + state[3] = panel_layer == BOTTOM_LAYER ? server.atom._NET_WM_STATE_BELOW : server.atom._NET_WM_STATE_ABOVE; + XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *) state, panel_layer == NORMAL_LAYER ? 3 : 4); // Unfocusable XWMHints wmhints; @@ -427,16 +427,21 @@ void set_panel_properties(Panel *p) XChangeProperty(server.dsp, p->main_win, server.atom.XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&version, 1); // Reserved space + unsigned int d1, screen_width, screen_height; + Window d2; + int d3; + XGetGeometry(server.dsp, server.root_win, &d2, &d3, &d3, &screen_width, &screen_height, &d1, &d1); + Monitor monitor = server.monitor[p->monitor]; long struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; if (panel_horizontal) { if (panel_position & TOP) { - struts[2] = p->area.height + p->marginy; + struts[2] = p->area.height + p->marginy + monitor.y; struts[8] = p->posx; // p->area.width - 1 allowed full screen on monitor 2 struts[9] = p->posx + p->area.width - 1; } else { - struts[3] = p->area.height + p->marginy; + struts[3] = p->area.height + p->marginy + screen_height - monitor.y - monitor.height; struts[10] = p->posx; // p->area.width - 1 allowed full screen on monitor 2 struts[11] = p->posx + p->area.width - 1; @@ -444,13 +449,13 @@ void set_panel_properties(Panel *p) } else { if (panel_position & LEFT) { - struts[0] = p->area.width + p->marginx; + struts[0] = p->area.width + p->marginx + monitor.x; struts[4] = p->posy; // p->area.width - 1 allowed full screen on monitor 2 struts[5] = p->posy + p->area.height - 1; } else { - struts[1] = p->area.width + p->marginx; + struts[1] = p->area.width + p->marginx + screen_width - monitor.x - monitor.width; struts[6] = p->posy; // p->area.width - 1 allowed full screen on monitor 2 struts[7] = p->posy + p->area.height - 1; @@ -467,16 +472,28 @@ void set_panel_properties(Panel *p) size_hints.min_width = size_hints.max_width = p->area.width; size_hints.min_height = size_hints.max_height = p->area.height; XSetWMNormalHints(server.dsp, p->main_win, &size_hints); + + // Set WM_CLASS + XClassHint* classhint = XAllocClassHint(); + classhint->res_name = "tint2"; + classhint->res_class = "Tint2"; + XSetClassHint(server.dsp, p->main_win, classhint); + XFree(classhint); } void set_panel_background(Panel *p) { - get_root_pixmap(); - if (p->area.pix.pmap) XFreePixmap (server.dsp, p->area.pix.pmap); p->area.pix.pmap = XCreatePixmap (server.dsp, server.root_win, p->area.width, p->area.height, server.depth); + if (real_transparency) { + clear_pixmap(p->area.pix.pmap, 0, 0, p->area.width, p->area.height); + return; // no need for background pixmap, a transparent one is enough + } + + get_root_pixmap(); + // copy background (server.root_pmap) in panel.area.pix.pmap Window dummy; int x, y;