X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=a753dfec1646f033342734788d2b6f1885be4739;hb=8354267448dab01626da0c4b3d2eedfa20e6858a;hp=2e1c2283928f2dd69c4a7566cc0da531cdd27162;hpb=d1123a0ede12eb1126eb5eb932d9177de67d46c5;p=chaz%2Ftint2 diff --git a/src/panel.c b/src/panel.c index 2e1c228..a753dfe 100644 --- a/src/panel.c +++ b/src/panel.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **************************************************************************/ +#include +#include #include #include #include @@ -27,223 +29,442 @@ #include "window.h" #include "task.h" #include "panel.h" +#include "tooltip.h" -void visual_refresh () +int signal_pending; +// -------------------------------------------------- +// mouse events +int mouse_middle; +int mouse_right; +int mouse_scroll_up; +int mouse_scroll_down; +int mouse_tilt_left; +int mouse_tilt_right; + +int panel_mode; +int wm_menu; +int panel_dock=0; // default not in the dock +int panel_position; +int panel_horizontal; +int panel_refresh; + +Task *task_active; +Task *task_drag; +Task *task_urgent; +int tick_urgent; +int max_tick_urgent; + +Panel *panel1 = 0; +int nb_panel; + +Imlib_Image default_icon; + + +void init_panel() { - server_refresh_root_pixmap (); - - draw (&panel.area); - refresh (&panel.area); - -/* -pour version 0.7 -gestion du systray - positionnement et taille fixe du systray (objet systray) - détection des notifications (détection des icones, ajout a la liste) - ajouter la transparence des icones - gérer le redimentionnement des éléments - => voir si lon peut faire abstraction sur le positionnement des objets ? - sachant que certains objets (task, taskbar) on une taille définit par l'extérieur - et d'autres objets (clock, systray) on une taille définit par l'intérieur - -gestion du layout - voir le positionnement des taskbar, task et systray - définir panel_layout dans la configuration - comment gérer le multi panel avec des layouts différents - -vérifier le niveau d'abstraction du code - utiliser la fonction draw(obj) récurrente sur Taskbar, Task, Systray, Clock - est ce compatible avec l'affichage de la tache active et les changement de taille -> redessine le panel - -correction de bugs : - memory, segfault - background - remettre en place single_desktop avec nouveau layout - remettre en place multi_monitor avec nouveau layout - vérifier le changement de configuration - -pour version 0.8 -gestion du thème - voir la gestion du dégradé sur le bord et le fond (inkscape) - faut-il trois coordonnées de padding x, y, x inter-objects - -gestion du zoom - définir le zoom du panel - -*/ - - if (panel.clock.time1_format) { - if (panel.clock.area.redraw) - panel.refresh = 1; - if (draw (&panel.clock.area)) { - panel.clock.area.redraw = 1; - draw (&panel.clock.area); - resize_clock(); - resize_taskbar(); - redraw(&panel.area); - } - refresh (&panel.clock.area); - } - - // TODO: ne pas afficher les taskbar invisibles - //if (panel.mode != MULTI_DESKTOP && desktop != server.desktop) continue; - Task *tsk; - Taskbar *tskbar; - GSList *l0; - for (l0 = panel.area.list; l0 ; l0 = l0->next) { - tskbar = l0->data; - draw (&tskbar->area); - refresh (&tskbar->area); - - GSList *l1; - for (l1 = tskbar->area.list; l1 ; l1 = l1->next) { - tsk = l1->data; - draw(&tsk->area); - - if (tsk == panel.task_active) refresh (&tsk->area_active); - else refresh (&tsk->area); - } - } - - XCopyArea (server.dsp, server.pmap, window.main_win, server.gc, 0, 0, panel.area.width, panel.area.height, 0, 0); - XFlush(server.dsp); - panel.refresh = 0; + int i; + Panel *p; + + // 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); + } + + for (i=0 ; i < nb_panel ; i++) { + p = &panel1[i]; + + p->area.parent = p; + p->area.panel = p; + p->area.on_screen = 1; + p->area.resize = 1; + p->area._resize = resize_panel; + p->g_taskbar.parent = p; + p->g_taskbar.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); +#ifdef ENABLE_BATTERY + if (p->battery.area.on_screen) + p->area.list = g_slist_append(p->area.list, &p->battery); +#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; + } + + // detect panel size + if (panel_horizontal) { + if (p->pourcentx) + p->area.width = (float)server.monitor[p->monitor].width * p->initial_width / 100; + else + p->area.width = p->initial_width; + if (p->pourcenty) + p->area.height = (float)server.monitor[p->monitor].height * p->initial_height / 100; + else + p->area.height = p->initial_height; + if (p->area.pix.border.rounded > p->area.height/2) + p->area.pix.border.rounded = p->area.height/2; + } + else { + if (p->pourcentx) + p->area.height = (float)server.monitor[p->monitor].height * p->initial_width / 100; + else + p->area.height = p->initial_width; + if (p->pourcenty) + p->area.width = (float)server.monitor[p->monitor].width * p->initial_height / 100; + else + p->area.width = p->initial_height; + if (p->area.pix.border.rounded > p->area.width/2) + p->area.pix.border.rounded = p->area.width/2; + } + + /* panel position determined here */ + if (panel_position & LEFT) { + p->posx = server.monitor[p->monitor].x + p->marginx; + } + else { + if (panel_position & RIGHT) { + p->posx = server.monitor[p->monitor].x + server.monitor[p->monitor].width - p->area.width - p->marginx; + } + else { + if (panel_horizontal) + p->posx = server.monitor[p->monitor].x + ((server.monitor[p->monitor].width - p->area.width) / 2); + else + p->posx = server.monitor[p->monitor].x + p->marginx; + } + } + if (panel_position & TOP) { + p->posy = server.monitor[p->monitor].y + p->marginy; + } + else { + if (panel_position & BOTTOM) { + p->posy = server.monitor[p->monitor].y + server.monitor[p->monitor].height - p->area.height - p->marginy; + } + else { + p->posy = server.monitor[p->monitor].y + ((server.monitor[p->monitor].height - p->area.height) / 2); + } + } + // printf("panel : posx %d, posy %d, width %d, height %d\n", p->posx, p->posy, p->area.width, p->area.height); + + // Catch some events + 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 }; + 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); + + set_panel_properties(p); + set_panel_background(p); + + XMapWindow (server.dsp, p->main_win); + } + panel_refresh = 1; } -void set_panel_properties (Window win) +void cleanup_panel() { - XStoreName (server.dsp, win, "tint2"); - - // TODO: check if the name is really needed for a panel/taskbar ? - gsize len; - gchar *name = g_locale_to_utf8("tint2", -1, NULL, &len, NULL); - if (name != NULL) { - 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); - - // Reserved space - long struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - if (panel.position & TOP) { - struts[2] = panel.area.height + panel.marginy; - struts[8] = server.posx; - struts[9] = server.posx + panel.area.width; - } - else { - struts[3] = panel.area.height + panel.marginy; - struts[10] = server.posx; - struts[11] = server.posx + panel.area.width; - } - XChangeProperty (server.dsp, win, server.atom._NET_WM_STRUT_PARTIAL, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 12); - // Old specification - XChangeProperty (server.dsp, win, server.atom._NET_WM_STRUT, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 4); - - // Sticky and below other window - val = 0xFFFFFFFF; - XChangeProperty (server.dsp, 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, 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); + 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 window_draw_panel () +void resize_panel(void *obj) { - Window win; - - /* panel position determined here */ - if (panel.position & LEFT) server.posx = server.monitor[panel.monitor].x + panel.marginx; - else { - if (panel.position & RIGHT) server.posx = server.monitor[panel.monitor].x + server.monitor[panel.monitor].width - panel.area.width - panel.marginx; - 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; - else server.posy = server.monitor[panel.monitor].y + server.monitor[panel.monitor].height - panel.area.height - panel.marginy; - - /* 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) */ - 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); - - set_panel_properties (win); - window.main_win = win; - - // replaced : server.gc = DefaultGC (server.dsp, 0); - if (server.gc) XFree(server.gc); - XGCValues gcValues; - server.gc = XCreateGC(server.dsp, win, (unsigned long) 0, &gcValues); - - XMapWindow (server.dsp, win); - XFlush (server.dsp); + Panel *panel = (Panel*)obj; + + 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; + } + } + 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; + } + } } -void resize_clock() +void visible_object() { - panel.clock.area.posx = panel.area.width - panel.clock.area.width - panel.area.paddingx - panel.area.border.width; + 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; + } + } + } + panel_refresh = 1; } -// initialise taskbar posx and width -void resize_taskbar() +void set_panel_properties(Panel *p) { - int taskbar_width, modulo_width, taskbar_on_screen; - - if (panel.mode == MULTI_DESKTOP) taskbar_on_screen = panel.nb_desktop; - else taskbar_on_screen = panel.nb_monitor; - - taskbar_width = panel.area.width - (2 * panel.area.paddingx) - (2 * panel.area.border.width); - if (panel.clock.time1_format) - taskbar_width -= (panel.clock.area.width + panel.area.paddingx); - taskbar_width = (taskbar_width - ((taskbar_on_screen-1) * panel.area.paddingx)) / taskbar_on_screen; - - if (taskbar_on_screen > 1) - modulo_width = (taskbar_width - ((taskbar_on_screen-1) * panel.area.paddingx)) % taskbar_on_screen; - else - modulo_width = 0; - - int posx, modulo, i; - Taskbar *tskbar; - GSList *l0; - for (i = 0, l0 = panel.area.list; l0 ; i++, l0 = l0->next) { - if ((i % taskbar_on_screen) == 0) { - posx = panel.area.border.width + panel.area.paddingx; - modulo = modulo_width; - } - else posx += taskbar_width + panel.area.paddingx; - - tskbar = l0->data; - tskbar->area.posx = posx; - tskbar->area.width = taskbar_width; - if (modulo) { - tskbar->area.width++; - modulo--; - } - - resize_tasks(tskbar); - } + XStoreName (server.dsp, p->main_win, "tint2"); + + // TODO: check if the name is really needed for a panel/taskbar ? + 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); + + // Reserved space + 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[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[10] = p->posx; + // p->area.width - 1 allowed full screen on monitor 2 + struts[11] = p->posx + p->area.width - 1; + } + } + else { + if (panel_position & LEFT) { + struts[0] = p->area.width + p->marginx; + 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[6] = p->posy; + // p->area.width - 1 allowed full screen on monitor 2 + struts[7] = p->posy + p->area.height - 1; + } + } + // 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); + + // Sticky and below other window + val = 0xFFFFFFFF; + 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 + XSizeHints size_hints; + size_hints.flags = PPosition; + XChangeProperty (server.dsp, p->main_win, XA_WM_NORMAL_HINTS, XA_WM_SIZE_HINTS, 32, PropModeReplace, (unsigned char *) &size_hints, sizeof (XSizeHints) / 4); + + // 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; + } + else { + wmhints.flags = InputHint; + wmhints.input = False; + } + XSetWMHints(server.dsp, p->main_win, &wmhints); + + // Undecorated + long prop[5] = { 2, 0, 0, 0, 0 }; + 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; + XChangeProperty(server.dsp, p->main_win, server.atom.XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&version, 1); } +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); + + // 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); + + // 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); + c = cairo_create (cs); + + draw_background(&p->area, c, 0); + + cairo_destroy (c); + cairo_surface_destroy (cs); + + // redraw panel's object + GSList *l0; + Area *a; + for (l0 = p->area.list; l0 ; l0 = l0->next) { + a = l0->data; + set_redraw(a); + } +} + + +Panel *get_panel(Window win) +{ + int i; + for (i=0 ; i < nb_panel ; i++) { + if (panel1[i].main_win == win) { + return &panel1[i]; + } + } + return 0; +} +