X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Fpanel.c;h=6a98a26191aaf43ad2efc13daa1b5f3d4b8c019a;hp=0c5c3837b4825003dc2b71666cc086e017872dc6;hb=63bbffa4af17926ba2d52728883988eae402b07a;hpb=0ade529e3c99cdb5c85fd30ced3551758b85f256 diff --git a/src/panel.c b/src/panel.c index 0c5c383..6a98a26 100644 --- a/src/panel.c +++ b/src/panel.c @@ -27,6 +27,7 @@ #include #include "server.h" +#include "config.h" #include "window.h" #include "task.h" #include "panel.h" @@ -45,41 +46,88 @@ 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_dock; +int panel_layer; int panel_position; int panel_horizontal; int panel_refresh; +int task_dragged; -int panel_autohide = 0; -int panel_autohide_show_timeout = 0; -int panel_autohide_hide_timeout = 0; -int panel_autohide_height = 5; // for vertical panels this is of course the width -int panel_strut_policy = STRUT_MINIMUM; +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; int max_tick_urgent; // panel's initial config Panel panel_config; // panels (one panel per monitor) -Panel *panel1 = 0; -int nb_panel = 0; +Panel *panel1; +int nb_panel; -GArray* backgrounds = 0; +GArray* backgrounds; -Imlib_Image default_icon = NULL; +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 cleanup_panel() +{ + if (!panel1) return; + + cleanup_taskbar(); + + int i; + Panel *p; + for (i=0 ; i < nb_panel ; i++) { + p = &panel1[i]; -void autohide_hide(void* p); -void autohide_show(void* p); + 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, old_nb_panel; - Panel *new_panel, *p; + int i, k; + Panel *p; if (panel_config.monitor > (server.nb_monitor-1)) { // server.nb_monitor minimum value is 1 (see get_monitors()) @@ -89,95 +137,73 @@ void init_panel() init_tooltip(); init_systray(); + init_launcher(); init_clock(); #ifdef ENABLE_BATTERY init_battery(); #endif + init_taskbar(); - cleanup_taskbar(); - for (i=0 ; i < nb_panel ; i++) { - free_area(&panel1[i].area); - if (panel1[i].temp_pmap) { - XFreePixmap(server.dsp, panel1[i].temp_pmap); - panel1[i].temp_pmap = 0; - } - } - - // number of panels - old_nb_panel = nb_panel; + // number of panels (one monitor or 'all' monitors) if (panel_config.monitor >= 0) nb_panel = 1; else nb_panel = server.nb_monitor; - // freed old panels - for (i=nb_panel ; i < old_nb_panel ; i++) { - if (panel1[i].main_win) { - XDestroyWindow(server.dsp, panel1[i].main_win); - panel1[i].main_win = 0; - } - } - - // alloc & init new panel - Window old_win; - if (nb_panel != old_nb_panel) - new_panel = realloc(panel1, nb_panel * sizeof(Panel)); - else - new_panel = panel1; + panel1 = malloc(nb_panel * sizeof(Panel)); for (i=0 ; i < nb_panel ; i++) { - old_win = new_panel[i].main_win; - memcpy(&new_panel[i], &panel_config, sizeof(Panel)); - new_panel[i].main_win = old_win; + 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 = &new_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._resize = resize_panel; + p->area.size_mode = SIZE_BY_LAYOUT; + p->area._resize = resize_by_layout; p->g_taskbar.area.parent = p; p->g_taskbar.area.panel = p; p->g_task.area.panel = p; init_panel_size_and_position(p); - // add childs - if (clock_enabled) { - init_clock_panel(p); - p->area.list = g_slist_append(p->area.list, &p->clock); - } + // 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 (battery_enabled) { - init_battery_panel(p); - 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) { - init_systray_panel(p); - p->area.list = g_slist_append(p->area.list, &systray); - refresh_systray = 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); - if (i >= old_nb_panel) { - // new panel : catch some events - long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask; - if (g_tooltip.enabled) - event_mask |= PointerMotionMask|LeaveWindowMask; - if (panel_autohide) - event_mask |= LeaveWindowMask|EnterWindowMask; - 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); - } + // 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); + + long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask; + if (g_tooltip.enabled) + event_mask |= PointerMotionMask|LeaveWindowMask; + if (panel_autohide) + event_mask |= LeaveWindowMask|EnterWindowMask; + XChangeWindowAttributes(server.dsp, p->main_win, CWEventMask, &(XSetWindowAttributes){.event_mask=event_mask}); if (!server.gc) { XGCValues gcv; @@ -186,19 +212,17 @@ void init_panel() //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 (i >= old_nb_panel) { - // map new panel + if (snapshot_path == 0) { + // if we are not in 'snapshot' mode then map new panel XMapWindow (server.dsp, p->main_win); } if (panel_autohide) add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p); + + visible_taskbar(p); } - panel1 = new_panel; - panel_refresh = 1; - init_taskbar(); - visible_object(); task_refresh_tasklist(); active_task(); } @@ -264,171 +288,28 @@ void init_panel_size_and_position(Panel *panel) } } - if (panel_autohide) { - int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height; - if (panel_horizontal) { - panel->hidden_width = panel->area.width; - panel->hidden_height = panel->area.height - diff; - } - else { - 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 cleanup_panel() -{ - if (!panel1) return; - - task_active = 0; - task_drag = 0; - - cleanup_taskbar(); - - int i; - Panel *p; - for (i=0 ; i < nb_panel ; i++) { - p = &panel1[i]; - - free_area(&p->area); - - if (p->temp_pmap) { - XFreePixmap(server.dsp, p->temp_pmap); - p->temp_pmap = 0; - } - if (p->hidden_pixmap) - XFreePixmap(server.dsp, p->hidden_pixmap); - p->hidden_pixmap = 0; - if (p->main_win) { - XDestroyWindow(server.dsp, p->main_win); - p->main_win = 0; - } - } - - if (panel1) { - free(panel1); - panel1 = 0; - nb_panel = 0; - } - - if (panel_config.g_task.font_desc) { - pango_font_description_free(panel_config.g_task.font_desc); - panel_config.g_task.font_desc = 0; - } - - if (backgrounds) { - g_array_free(backgrounds, 1); - backgrounds = 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.bg->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.bg->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.bg->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.bg->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() +void update_strut(Panel* p) { - 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; - } - } + 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; } - panel_refresh = 1; -} -void update_strut(Panel* p) -{ // Reserved space unsigned int d1, screen_width, screen_height; Window d2; @@ -438,7 +319,7 @@ void update_strut(Panel* p) 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_autohide && (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden)) ) + 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] = height + monitor.y; @@ -455,7 +336,7 @@ void update_strut(Panel* p) } else { int width = p->area.width + p->marginx; - if (panel_autohide && (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden)) ) + 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] = width + monitor.x; @@ -476,6 +357,37 @@ void update_strut(Panel* p) } +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"); @@ -520,7 +432,7 @@ 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); @@ -557,7 +469,7 @@ void set_panel_background(Panel *p) else if (!panel_horizontal && panel_position & RIGHT) xoff = p->area.width-p->hidden_width; - if (real_transparency) { + if (server.real_transparency) { clear_pixmap(p->area.pix, 0, 0, p->area.width, p->area.height); } else { @@ -590,12 +502,23 @@ void set_panel_background(Panel *p) } // redraw panel's object + //p->area.redraw = 1; GSList *l0; Area *a; for (l0 = p->area.list; l0 ; l0 = l0->next) { a = l0->data; set_redraw(a); } + + // reset task 'state_pix' + int i; + Taskbar *tskbar; + for (i=0 ; i < p->nb_desktop ; i++) { + tskbar = &p->taskbar[i]; + for (l0 = tskbar->area.list; l0 ; l0 = l0->next) { + set_task_redraw((Task *)l0->data); + } + } } @@ -663,6 +586,43 @@ Task *click_task (Panel *panel, int x, int y) } +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) { @@ -763,6 +723,7 @@ void autohide_hide(void* 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);