X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Fpanel.c;h=3971bc8021564bd182f5ddea39db7eb9c85dc06c;hp=2341237b90db8c82490cfcbfef0b515d25810865;hb=275fa7c8678c39a1c1f7437de12aac0144f61a85;hpb=b0ff4722b169b9bc26240a0fdecbc2d911f7afb8 diff --git a/src/panel.c b/src/panel.c index 2341237..3971bc8 100644 --- a/src/panel.c +++ b/src/panel.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -26,6 +27,7 @@ #include #include "server.h" +#include "config.h" #include "window.h" #include "task.h" #include "panel.h" @@ -44,84 +46,185 @@ int mouse_tilt_right; int panel_mode; int wm_menu; -int panel_dock=0; // default not in the dock +int panel_dock; +int panel_layer; int panel_position; int panel_horizontal; int panel_refresh; +int task_dragged; + +int panel_autohide; +int panel_autohide_show_timeout; +int panel_autohide_hide_timeout; +int panel_autohide_height; +int panel_strut_policy; +char *panel_items_order; -Task *task_active; -Task *task_drag; -Task *task_urgent; -int tick_urgent; int max_tick_urgent; -Panel *panel1 = 0; +// panel's initial config +Panel panel_config; +// panels (one panel per monitor) +Panel *panel1; int nb_panel; +GArray* backgrounds; + Imlib_Image default_icon; +void default_panel() +{ + panel1 = 0; + nb_panel = 0; + default_icon = NULL; + task_dragged = 0; + panel_horizontal = 1; + panel_position = CENTER; + panel_items_order = 0; + panel_autohide = 0; + panel_autohide_show_timeout = 0; + panel_autohide_hide_timeout = 0; + panel_autohide_height = 5; // for vertical panels this is of course the width + panel_strut_policy = STRUT_FOLLOW_SIZE; + panel_dock = 0; // default not in the dock + panel_layer = BOTTOM_LAYER; // default is bottom layer + wm_menu = 0; + max_tick_urgent = 14; + backgrounds = g_array_new(0, 0, sizeof(Background)); + + memset(&panel_config, 0, sizeof(Panel)); + + // append full transparency background + Background transparent_bg; + memset(&transparent_bg, 0, sizeof(Background)); + g_array_append_val(backgrounds, transparent_bg); +} -void init_panel() +void cleanup_panel() { + if (!panel1) return; + + cleanup_taskbar(); + int i; Panel *p; + for (i=0 ; i < nb_panel ; i++) { + p = &panel1[i]; - // load default icon - char *path; - const gchar * const *data_dirs; - data_dirs = g_get_system_data_dirs (); - for (i = 0; data_dirs[i] != NULL; i++) { - path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL); - if (g_file_test (path, G_FILE_TEST_EXISTS)) - default_icon = imlib_load_image(path); - g_free(path); + free_area(&p->area); + if (p->temp_pmap) XFreePixmap(server.dsp, p->temp_pmap); + if (p->hidden_pixmap) XFreePixmap(server.dsp, p->hidden_pixmap); + if (p->main_win) XDestroyWindow(server.dsp, p->main_win); } + if (panel_items_order) g_free(panel_items_order); + if (panel1) free(panel1); + if (backgrounds) + g_array_free(backgrounds, 1); + if (panel_config.g_task.font_desc) pango_font_description_free(panel_config.g_task.font_desc); +} + +void init_panel() +{ + int i, k; + Panel *p; + + if (panel_config.monitor > (server.nb_monitor-1)) { + // server.nb_monitor minimum value is 1 (see get_monitors()) + fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n"); + panel_config.monitor = 0; + } + + init_tooltip(); + init_systray(); + init_launcher(); + init_clock(); +#ifdef ENABLE_BATTERY + init_battery(); +#endif + init_taskbar(); + + // number of panels (one monitor or 'all' monitors) + if (panel_config.monitor >= 0) + nb_panel = 1; + else + nb_panel = server.nb_monitor; + + panel1 = malloc(nb_panel * sizeof(Panel)); + for (i=0 ; i < nb_panel ; i++) { + memcpy(&panel1[i], &panel_config, sizeof(Panel)); + } + + fprintf(stderr, "tint2 : nb monitor %d, nb monitor used %d, nb desktop %d\n", server.nb_monitor, nb_panel, server.nb_desktop); for (i=0 ; i < nb_panel ; i++) { p = &panel1[i]; + if (panel_config.monitor < 0) + p->monitor = i; + if ( p->area.bg == 0 ) + p->area.bg = &g_array_index(backgrounds, Background, 0); p->area.parent = p; p->area.panel = p; p->area.on_screen = 1; p->area.resize = 1; + p->area.size_mode = SIZE_BY_LAYOUT; p->area._resize = resize_panel; - p->g_taskbar.parent = p; - p->g_taskbar.panel = p; + p->g_taskbar.area.parent = p; + p->g_taskbar.area.panel = p; p->g_task.area.panel = p; - - // add childs - if (p->clock.area.on_screen) - p->area.list = g_slist_append(p->area.list, &p->clock); + init_panel_size_and_position(p); + // add childs according to panel_items + for (k=0 ; k < strlen(panel_items_order) ; k++) { + if (panel_items_order[k] == 'L') + init_launcher_panel(p); + if (panel_items_order[k] == 'T') + init_taskbar_panel(p); #ifdef ENABLE_BATTERY - if (p->battery.area.on_screen) - p->area.list = g_slist_append(p->area.list, &p->battery); + if (panel_items_order[k] == 'B') + init_battery_panel(p); #endif - // systray only on first panel - if (systray.area.on_screen && i == 0) - p->area.list = g_slist_append(p->area.list, &systray); - - // full width mode - if (!p->initial_width) { - p->initial_width = 100; - p->pourcentx = 1; + if (panel_items_order[k] == 'S') { + // TODO : check systray is only on 1 panel + init_systray_panel(p); + refresh_systray = 1; + } + if (panel_items_order[k] == 'C') + init_clock_panel(p); } + set_panel_items_order(p); - init_panel_size_and_position(p); + // catch some events + XSetWindowAttributes att = { .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); - // Catch some events - long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask; + long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask; 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 }; - if (p->main_win) XDestroyWindow(server.dsp, p->main_win); - 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); + if (panel_autohide) + event_mask |= LeaveWindowMask|EnterWindowMask; + XChangeWindowAttributes(server.dsp, p->main_win, CWEventMask, &(XSetWindowAttributes){.event_mask=event_mask}); + 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); + if (snapshot_path == 0) { + // if we are not in 'snapshot' mode then map new panel + XMapWindow (server.dsp, p->main_win); + } - XMapWindow (server.dsp, p->main_win); + if (panel_autohide) + add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p); + + visible_taskbar(p); } - panel_refresh = 1; + + task_refresh_tasklist(); + active_task(); } @@ -130,27 +233,32 @@ void init_panel_size_and_position(Panel *panel) // detect panel size if (panel_horizontal) { if (panel->pourcentx) - panel->area.width = (float)server.monitor[panel->monitor].width * panel->initial_width / 100; - else - panel->area.width = panel->initial_width; + panel->area.width = (float)server.monitor[panel->monitor].width * panel->area.width / 100; if (panel->pourcenty) - panel->area.height = (float)server.monitor[panel->monitor].height * panel->initial_height / 100; - else - panel->area.height = panel->initial_height; - if (panel->area.pix.border.rounded > panel->area.height/2) - panel->area.pix.border.rounded = panel->area.height/2; + panel->area.height = (float)server.monitor[panel->monitor].height * panel->area.height / 100; + if (panel->area.bg->border.rounded > panel->area.height/2) { + printf("panel_background_id rounded is too big... please fix your tint2rc\n"); + g_array_append_val(backgrounds, *panel->area.bg); + panel->area.bg = &g_array_index(backgrounds, Background, backgrounds->len-1); + panel->area.bg->border.rounded = panel->area.height/2; + } } else { + int old_panel_height = panel->area.height; if (panel->pourcentx) - panel->area.height = (float)server.monitor[panel->monitor].height * panel->initial_width / 100; + panel->area.height = (float)server.monitor[panel->monitor].height * panel->area.width / 100; else - panel->area.height = panel->initial_width; + panel->area.height = panel->area.width; if (panel->pourcenty) - panel->area.width = (float)server.monitor[panel->monitor].width * panel->initial_height / 100; + panel->area.width = (float)server.monitor[panel->monitor].width * old_panel_height / 100; else - panel->area.width = panel->initial_height; - if (panel->area.pix.border.rounded > panel->area.width/2) - panel->area.pix.border.rounded = panel->area.width/2; + panel->area.width = old_panel_height; + if (panel->area.bg->border.rounded > panel->area.width/2) { + printf("panel_background_id rounded is too big... please fix your tint2rc\n"); + g_array_append_val(backgrounds, *panel->area.bg); + panel->area.bg = &g_array_index(backgrounds, Background, backgrounds->len-1); + panel->area.bg->border.rounded = panel->area.width/2; + } } // panel position determined here @@ -179,206 +287,86 @@ void init_panel_size_and_position(Panel *panel) panel->posy = server.monitor[panel->monitor].y + ((server.monitor[panel->monitor].height - panel->area.height) / 2); } } - // printf("panel : posx %d, posy %d, width %d, height %d\n", panel->posx, panel->posy, panel->area.width, panel->area.height); -} - - -void cleanup_panel() -{ - if (!panel1) return; - - task_active = 0; - task_drag = 0; - task_urgent = 0; - cleanup_systray(); - cleanup_taskbar(); - - if (default_icon) { - imlib_context_set_image(default_icon); - imlib_free_image(); - } - - // font allocated once - if (panel1[0].g_task.font_desc) { - pango_font_description_free(panel1[0].g_task.font_desc); - panel1[0].g_task.font_desc = 0; - } - - int i; - Panel *p; - for (i=0 ; i < nb_panel ; i++) { - p = &panel1[i]; - - free_area(&p->area); - free_area(&p->g_task.area); - free_area(&p->g_taskbar); - - if (p->temp_pmap) { - XFreePixmap(server.dsp, p->temp_pmap); - p->temp_pmap = 0; - } - if (p->main_win) { - XDestroyWindow(server.dsp, p->main_win); - p->main_win = 0; - } - } - - if (panel1) free(panel1); - panel1 = 0; - - if (g_tooltip.window) { - XDestroyWindow(server.dsp, g_tooltip.window); - g_tooltip.window = 0; - } - if (g_tooltip.font_desc) { - pango_font_description_free(g_tooltip.font_desc); - g_tooltip.font_desc = 0; - } -} - - -void resize_panel(void *obj) -{ - Panel *panel = (Panel*)obj; + // autohide or strut_policy=minimum + int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height; if (panel_horizontal) { - int taskbar_width, modulo_width = 0; - - taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width); - if (panel->clock.area.on_screen && panel->clock.area.width) - taskbar_width -= (panel->clock.area.width + panel->area.paddingx); - #ifdef ENABLE_BATTERY - if (panel->battery.area.on_screen && panel->battery.area.width) - taskbar_width -= (panel->battery.area.width + panel->area.paddingx); - #endif - // TODO : systray only on first panel. search better implementation ! - if (systray.area.on_screen && systray.area.width && panel == &panel1[0]) - taskbar_width -= (systray.area.width + panel->area.paddingx); - - if (panel_mode == MULTI_DESKTOP) { - int width = taskbar_width - ((panel->nb_desktop-1) * panel->area.paddingx); - taskbar_width = width / panel->nb_desktop; - modulo_width = width % panel->nb_desktop; - } - - // change posx and width for all taskbar - int i, posx; - posx = panel->area.pix.border.width + panel->area.paddingxlr; - for (i=0 ; i < panel->nb_desktop ; i++) { - panel->taskbar[i].area.posx = posx; - panel->taskbar[i].area.width = taskbar_width; - panel->taskbar[i].area.resize = 1; - if (modulo_width) { - panel->taskbar[i].area.width++; - modulo_width--; - } - //printf("taskbar %d : posx %d, width, %d, posy %d\n", i, posx, panel->taskbar[i].area.width, posx + panel->taskbar[i].area.width); - if (panel_mode == MULTI_DESKTOP) - posx += panel->taskbar[i].area.width + panel->area.paddingx; - } + panel->hidden_width = panel->area.width; + panel->hidden_height = panel->area.height - diff; } else { - int taskbar_height, modulo_height = 0; - int i, posy; - - taskbar_height = panel->area.height - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width); - if (panel->clock.area.on_screen && panel->clock.area.height) - taskbar_height -= (panel->clock.area.height + panel->area.paddingx); - #ifdef ENABLE_BATTERY - if (panel->battery.area.on_screen && panel->battery.area.height) - taskbar_height -= (panel->battery.area.height + panel->area.paddingx); - #endif - // TODO : systray only on first panel. search better implementation ! - if (systray.area.on_screen && systray.area.height && panel == &panel1[0]) - taskbar_height -= (systray.area.height + panel->area.paddingx); - - posy = panel->area.height - panel->area.pix.border.width - panel->area.paddingxlr - taskbar_height; - if (panel_mode == MULTI_DESKTOP) { - int height = taskbar_height - ((panel->nb_desktop-1) * panel->area.paddingx); - taskbar_height = height / panel->nb_desktop; - modulo_height = height % panel->nb_desktop; - } - - // change posy and height for all taskbar - for (i=0 ; i < panel->nb_desktop ; i++) { - panel->taskbar[i].area.posy = posy; - panel->taskbar[i].area.height = taskbar_height; - panel->taskbar[i].area.resize = 1; - if (modulo_height) { - panel->taskbar[i].area.height++; - modulo_height--; - } - if (panel_mode == MULTI_DESKTOP) - posy += panel->taskbar[i].area.height + panel->area.paddingx; - } + panel->hidden_width = panel->area.width - diff; + panel->hidden_height = panel->area.height; } + // printf("panel : posx %d, posy %d, width %d, height %d\n", panel->posx, panel->posy, panel->area.width, panel->area.height); } -void visible_object() +int resize_panel(void *obj) { - Panel *panel; - int i, j; - - for (i=0 ; i < nb_panel ; i++) { - panel = &panel1[i]; - - Taskbar *taskbar; - for (j=0 ; j < panel->nb_desktop ; j++) { - taskbar = &panel->taskbar[j]; - if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) { - // SINGLE_DESKTOP and not current desktop - taskbar->area.on_screen = 0; - } - else { - taskbar->area.on_screen = 1; - } + resize_by_layout(obj, 0); + + //printf("resize_panel\n"); + if (panel_mode != MULTI_DESKTOP && taskbar_enabled) { + // propagate width/height on hidden taskbar + int i, width, height; + Panel *panel = (Panel*)obj; + width = panel->taskbar[server.desktop].area.width; + height = panel->taskbar[server.desktop].area.height; + for (i=0 ; i < panel->nb_desktop ; i++) { + panel->taskbar[i].area.width = width; + panel->taskbar[i].area.height = height; + panel->taskbar[i].area.resize = 1; } } - panel_refresh = 1; + return 0; } -void set_panel_properties(Panel *p) +void update_strut(Panel* p) { - XStoreName (server.dsp, p->main_win, "tint2"); - - gsize len; - gchar *name = g_locale_to_utf8("tint2", -1, NULL, &len, NULL); - if (name != NULL) { - XChangeProperty(server.dsp, p->main_win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 8, PropModeReplace, (unsigned char *) name, (int) len); - g_free(name); + if (panel_strut_policy == STRUT_NONE) { + XDeleteProperty(server.dsp, p->main_win, server.atom._NET_WM_STRUT); + XDeleteProperty(server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL); + return; } - // Dock - long val = server.atom._NET_WM_WINDOW_TYPE_DOCK; - XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 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) { + int height = p->area.height + p->marginy; + if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden)) + height = p->hidden_height; if (panel_position & TOP) { - struts[2] = p->area.height + p->marginy; + struts[2] = height + 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] = height + 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; } } else { + int width = p->area.width + p->marginx; + if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden)) + width = p->hidden_width; if (panel_position & LEFT) { - struts[0] = p->area.width + p->marginx; + struts[0] = width + 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] = width + 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; @@ -387,28 +375,69 @@ void set_panel_properties(Panel *p) // Old specification : fluxbox need _NET_WM_STRUT. XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 4); XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 12); +} + + +void set_panel_items_order(Panel *p) +{ + int k, j; + + if (p->area.list) { + g_slist_free(p->area.list); + p->area.list = 0; + } + + for (k=0 ; k < strlen(panel_items_order) ; k++) { + if (panel_items_order[k] == 'L') + p->area.list = g_slist_append(p->area.list, &p->launcher); + if (panel_items_order[k] == 'T') { + for (j=0 ; j < p->nb_desktop ; j++) + p->area.list = g_slist_append(p->area.list, &p->taskbar[j]); + } +#ifdef ENABLE_BATTERY + if (panel_items_order[k] == 'B') + p->area.list = g_slist_append(p->area.list, &p->battery); +#endif + if (panel_items_order[k] == 'S') { + // TODO : check systray is only on 1 panel + p->area.list = g_slist_append(p->area.list, &systray); + } + if (panel_items_order[k] == 'C') + p->area.list = g_slist_append(p->area.list, &p->clock); + } + init_rendering(&p->area, 0); +} + + +void set_panel_properties(Panel *p) +{ + XStoreName (server.dsp, p->main_win, "tint2"); + + gsize len; + gchar *name = g_locale_to_utf8("tint2", -1, NULL, &len, NULL); + if (name != NULL) { + XChangeProperty(server.dsp, p->main_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, 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); - - // Fixed position and non-resizable window - XSizeHints size_hints; - size_hints.flags = PPosition|PMinSize|PMaxSize; - 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); + state[3] = panel_layer == BOTTOM_LAYER ? server.atom._NET_WM_STATE_BELOW : server.atom._NET_WM_STATE_ABOVE; + int nb_atoms = panel_layer == NORMAL_LAYER ? 3 : 4; + XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *) state, nb_atoms); // Unfocusable XWMHints wmhints; if (panel_dock) { - // TODO: Xdnd feature cannot be used in withdrawn state at the moment (at least GTK apps fail, qt seems to work) wmhints.icon_window = wmhints.window_group = p->main_win; wmhints.flags = StateHint | IconWindowHint; wmhints.initial_state = WithdrawnState; @@ -424,36 +453,75 @@ void set_panel_properties(Panel *p) XChangeProperty(server.dsp, p->main_win, server.atom._MOTIF_WM_HINTS, server.atom._MOTIF_WM_HINTS, 32, PropModeReplace, (unsigned char *) prop, 5); // XdndAware - Register for Xdnd events - int version=5; + Atom version=4; XChangeProperty(server.dsp, p->main_win, server.atom.XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&version, 1); + + update_strut(p); + + // Fixed position and non-resizable window + // Allow panel move and resize when tint2 reload config file + int minwidth = panel_autohide ? p->hidden_width : p->area.width; + int minheight = panel_autohide ? p->hidden_height : p->area.height; + XSizeHints size_hints; + size_hints.flags = PPosition|PMinSize|PMaxSize; + size_hints.min_width = minwidth; + size_hints.max_width = p->area.width; + size_hints.min_height = minheight; + 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) XFreePixmap (server.dsp, p->area.pix); + p->area.pix = XCreatePixmap (server.dsp, server.root_win, p->area.width, p->area.height, server.depth); - 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); + int xoff=0, yoff=0; + if (panel_horizontal && panel_position & BOTTOM) + yoff = p->area.height-p->hidden_height; + else if (!panel_horizontal && panel_position & RIGHT) + xoff = p->area.width-p->hidden_width; - // copy background (server.root_pmap) in panel.area.pix.pmap - Window dummy; - int x, y; - XTranslateCoordinates(server.dsp, p->main_win, server.root_win, 0, 0, &x, &y, &dummy); - XSetTSOrigin(server.dsp, server.gc, -x, -y) ; - XFillRectangle(server.dsp, p->area.pix.pmap, server.gc, 0, 0, p->area.width, p->area.height); + if (server.real_transparency) { + clear_pixmap(p->area.pix, 0, 0, p->area.width, p->area.height); + } + else { + get_root_pixmap(); + // copy background (server.root_pmap) in panel.area.pix + Window dummy; + int x, y; + XTranslateCoordinates(server.dsp, p->main_win, server.root_win, 0, 0, &x, &y, &dummy); + if (panel_autohide && p->is_hidden) { + x -= xoff; + y -= yoff; + } + XSetTSOrigin(server.dsp, server.gc, -x, -y); + XFillRectangle(server.dsp, p->area.pix, server.gc, 0, 0, p->area.width, p->area.height); + } // draw background panel cairo_surface_t *cs; cairo_t *c; - cs = cairo_xlib_surface_create (server.dsp, p->area.pix.pmap, server.visual, p->area.width, p->area.height); + cs = cairo_xlib_surface_create (server.dsp, p->area.pix, server.visual, p->area.width, p->area.height); c = cairo_create (cs); - - draw_background(&p->area, c, 0); - + draw_background(&p->area, c); cairo_destroy (c); cairo_surface_destroy (cs); + if (panel_autohide) { + if (p->hidden_pixmap) XFreePixmap(server.dsp, p->hidden_pixmap); + p->hidden_pixmap = XCreatePixmap(server.dsp, server.root_win, p->hidden_width, p->hidden_height, server.depth); + XCopyArea(server.dsp, p->area.pix, p->hidden_pixmap, server.gc, xoff, yoff, p->hidden_width, p->hidden_height, 0, 0); + } + // redraw panel's object GSList *l0; Area *a; @@ -461,6 +529,21 @@ void set_panel_background(Panel *p) a = l0->data; set_redraw(a); } + + // reset task/taskbar 'state_pix' + int i, k; + Taskbar *tskbar; + for (i=0 ; i < p->nb_desktop ; i++) { + tskbar = &p->taskbar[i]; + for (k=0; kstate_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]); + tskbar->state_pix[k] = 0; + } + tskbar->area.pix = 0; + for (l0 = tskbar->area.list; l0 ; l0 = l0->next) { + set_task_redraw((Task *)l0->data); + } + } } @@ -475,3 +558,237 @@ Panel *get_panel(Window win) return 0; } + +Taskbar *click_taskbar (Panel *panel, int x, int y) +{ + Taskbar *tskbar; + int i; + + if (panel_horizontal) { + for (i=0; i < panel->nb_desktop ; i++) { + tskbar = &panel->taskbar[i]; + if (tskbar->area.on_screen && x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width)) + return tskbar; + } + } + else { + for (i=0; i < panel->nb_desktop ; i++) { + tskbar = &panel->taskbar[i]; + if (tskbar->area.on_screen && y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height)) + return tskbar; + } + } + return NULL; +} + + +Task *click_task (Panel *panel, int x, int y) +{ + GSList *l0; + Taskbar *tskbar; + + if ( (tskbar = click_taskbar(panel, x, y)) ) { + if (panel_horizontal) { + Task *tsk; + for (l0 = tskbar->area.list; l0 ; l0 = l0->next) { + tsk = l0->data; + if (tsk->area.on_screen && x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) { + return tsk; + } + } + } + else { + Task *tsk; + for (l0 = tskbar->area.list; l0 ; l0 = l0->next) { + tsk = l0->data; + if (tsk->area.on_screen && y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) { + return tsk; + } + } + } + } + return NULL; +} + + +Launcher *click_launcher (Panel *panel, int x, int y) +{ + Launcher *launcher = &panel->launcher; + + if (panel_horizontal) { + if (launcher->area.on_screen && x >= launcher->area.posx && x <= (launcher->area.posx + launcher->area.width)) + return launcher; + } + else { + if (launcher->area.on_screen && y >= launcher->area.posy && y <= (launcher->area.posy + launcher->area.height)) + return launcher; + } + return NULL; +} + + +LauncherIcon *click_launcher_icon (Panel *panel, int x, int y) +{ + GSList *l0; + Launcher *launcher; + + //printf("Click x=%d y=%d\n", x, y); + if ( (launcher = click_launcher(panel, x, y)) ) { + LauncherIcon *icon; + for (l0 = launcher->list_icons; l0 ; l0 = l0->next) { + icon = l0->data; + if (x >= (launcher->area.posx + icon->x) && x <= (launcher->area.posx + icon->x + icon->icon_size) && + y >= (launcher->area.posy + icon->y) && y <= (launcher->area.posy + icon->y + icon->icon_size)) { + //printf("Hit rect x=%d y=%d xmax=%d ymax=%d\n", launcher->area.posx + icon->x, launcher->area.posy + icon->y, launcher->area.posx + icon->x + icon->width, launcher->area.posy + icon->y + icon->height); + return icon; + } + } + } + return NULL; +} + + +int click_padding(Panel *panel, int x, int y) +{ + if (panel_horizontal) { + if (x < panel->area.paddingxlr || x > panel->area.width-panel->area.paddingxlr) + return 1; + } + else { + if (y < panel->area.paddingxlr || y > panel->area.height-panel->area.paddingxlr) + return 1; + } + return 0; +} + + +int click_clock(Panel *panel, int x, int y) +{ + Clock clk = panel->clock; + if (panel_horizontal) { + if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width)) + return TRUE; + } else { + if (clk.area.on_screen && y >= clk.area.posy && y <= (clk.area.posy + clk.area.height)) + return TRUE; + } + return FALSE; +} + + +Area* click_area(Panel *panel, int x, int y) +{ + Area* result = &panel->area; + Area* new_result = result; + do { + result = new_result; + GSList* it = result->list; + while (it) { + Area* a = it->data; + if (panel_horizontal) { + if (a->on_screen && x >= a->posx && x <= (a->posx + a->width)) { + new_result = a; + break; + } + } else { + if (a->on_screen && y >= a->posy && y <= (a->posy + a->height)) { + new_result = a; + break; + } + } + it = it->next; + } + } while (new_result != result); + return result; +} + + +void stop_autohide_timeout(Panel* p) +{ + if (p->autohide_timeout) { + stop_timeout(p->autohide_timeout); + p->autohide_timeout = 0; + } +} + + +void autohide_show(void* p) +{ + Panel* panel = p; + stop_autohide_timeout(panel); + panel->is_hidden = 0; + if (panel_strut_policy == STRUT_FOLLOW_SIZE) + update_strut(p); + + XMapSubwindows(server.dsp, panel->main_win); // systray windows + if (panel_horizontal) { + if (panel_position & TOP) + XResizeWindow(server.dsp, panel->main_win, panel->area.width, panel->area.height); + else + XMoveResizeWindow(server.dsp, panel->main_win, panel->posx, panel->posy, panel->area.width, panel->area.height); + } + else { + if (panel_position & LEFT) + XResizeWindow(server.dsp, panel->main_win, panel->area.width, panel->area.height); + else + XMoveResizeWindow(server.dsp, panel->main_win, panel->posx, panel->posy, panel->area.width, panel->area.height); + } + refresh_systray = 1; // ugly hack, because we actually only need to call XSetBackgroundPixmap + panel_refresh = 1; +} + + +void autohide_hide(void* p) +{ + Panel* panel = p; + stop_autohide_timeout(panel); + panel->is_hidden = 1; + if (panel_strut_policy == STRUT_FOLLOW_SIZE) + update_strut(p); + + XUnmapSubwindows(server.dsp, panel->main_win); // systray windows + int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height; + //printf("autohide_hide : diff %d, w %d, h %d\n", diff, panel->hidden_width, panel->hidden_height); + if (panel_horizontal) { + if (panel_position & TOP) + XResizeWindow(server.dsp, panel->main_win, panel->hidden_width, panel->hidden_height); + else + XMoveResizeWindow(server.dsp, panel->main_win, panel->posx, panel->posy+diff, panel->hidden_width, panel->hidden_height); + } + else { + if (panel_position & LEFT) + XResizeWindow(server.dsp, panel->main_win, panel->hidden_width, panel->hidden_height); + else + XMoveResizeWindow(server.dsp, panel->main_win, panel->posx+diff, panel->posy, panel->hidden_width, panel->hidden_height); + } + panel_refresh = 1; +} + + +void autohide_trigger_show(Panel* p) +{ + if (!p) + return; + if (p->autohide_timeout) + change_timeout(p->autohide_timeout, panel_autohide_show_timeout, 0, autohide_show, p); + else + p->autohide_timeout = add_timeout(panel_autohide_show_timeout, 0, autohide_show, p); +} + + +void autohide_trigger_hide(Panel* p) +{ + if (!p) + return; + + Window root, child; + int xr, yr, xw, yw; + unsigned int mask; + if (XQueryPointer(server.dsp, p->main_win, &root, &child, &xr, &yr, &xw, &yw, &mask)) + if (child) return; // mouse over one of the system tray icons + + if (p->autohide_timeout) + change_timeout(p->autohide_timeout, panel_autohide_hide_timeout, 0, autohide_hide, p); + else + p->autohide_timeout = add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p); +}