X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=7f7f0f9e4291a1a576a5917abd8359257c1a8d7b;hb=ad92a56f453f1c0d50efc4a53754a60591b512b2;hp=5275d38c5c557344c05dbf58f9581bbbf39b2554;hpb=17d9dedc35b17eec00a2b11e776c122e1725fd64;p=chaz%2Ftint2 diff --git a/src/panel.c b/src/panel.c index 5275d38..7f7f0f9 100644 --- a/src/panel.c +++ b/src/panel.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -29,6 +30,7 @@ #include "window.h" #include "task.h" #include "panel.h" +#include "tooltip.h" int signal_pending; @@ -43,6 +45,7 @@ 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; @@ -53,19 +56,62 @@ Task *task_urgent; int tick_urgent; int max_tick_urgent; -Panel *panel1 = 0; -int nb_panel; +// panel's initial config +Panel panel_config; +// panels (one panel per monitor) +Panel *panel1 = NULL; +int nb_panel = 0; + +Imlib_Image default_icon = NULL; void init_panel() { - int i; - Panel *p; + int i, old_nb_panel; + Panel *new_panel, *p; + cleanup_taskbar(); for (i=0 ; i < nb_panel ; i++) { - p = &panel1[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; + 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; + 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; + } + fprintf(stderr, "tint2 : nb monitor %d, nb desktop %d\n", nb_panel, server.nb_desktop); + for (i=0 ; i < nb_panel ; i++) { + p = &new_panel[i]; + + p->monitor = i; p->area.parent = p; p->area.panel = p; p->area.on_screen = 1; @@ -74,89 +120,110 @@ void init_panel() p->g_taskbar.parent = p; p->g_taskbar.panel = p; p->g_task.area.panel = p; + init_panel_size_and_position(p); // add childs - if (p->clock.area.on_screen) + if (p->clock.area.on_screen) { + init_clock_panel(p); p->area.list = g_slist_append(p->area.list, &p->clock); + } #ifdef ENABLE_BATTERY - if (p->battery.area.on_screen) + if (p->battery.area.on_screen) { + init_battery_panel(p); p->area.list = g_slist_append(p->area.list, &p->battery); + } #endif // systray only on first panel - if (systray.area.on_screen && i == 0) + if (systray.area.on_screen && i == 0) { + init_systray_panel(p); p->area.list = g_slist_append(p->area.list, &systray); - - // full width mode - if (!p->initial_width) { - p->initial_width = 100; - p->pourcentx = 1; + refresh_systray = 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; + if (i >= old_nb_panel) { + // new panel : 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); } 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; + // old panel + XMoveResizeWindow(server.dsp, p->main_win, p->posx, p->posy, p->area.width, p->area.height); } - /* panel position determined here */ - if (panel_position & LEFT) { - p->posx = server.monitor[p->monitor].x + p->marginx; + //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 + XMapWindow (server.dsp, p->main_win); + } + } + + panel1 = new_panel; + panel_refresh = 1; + init_taskbar(); + visible_object(); + task_refresh_tasklist(); + active_task(); +} + + +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->area.width / 100; + if (panel->pourcenty) + panel->area.height = (float)server.monitor[panel->monitor].height * panel->area.height / 100; + if (panel->area.pix.border.rounded > panel->area.height/2) + panel->area.pix.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->area.width / 100; + else + panel->area.height = panel->area.width; + if (panel->pourcenty) + panel->area.width = (float)server.monitor[panel->monitor].width * old_panel_height / 100; + else + panel->area.width = old_panel_height; + if (panel->area.pix.border.rounded > panel->area.width/2) + panel->area.pix.border.rounded = panel->area.width/2; + } + + // panel position determined here + if (panel_position & LEFT) { + panel->posx = server.monitor[panel->monitor].x + panel->marginx; + } + else { + if (panel_position & RIGHT) { + panel->posx = server.monitor[panel->monitor].x + server.monitor[panel->monitor].width - panel->area.width - panel->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_horizontal) + panel->posx = server.monitor[panel->monitor].x + ((server.monitor[panel->monitor].width - panel->area.width) / 2); + else + panel->posx = server.monitor[panel->monitor].x + panel->marginx; } - if (panel_position & TOP) { - p->posy = server.monitor[p->monitor].y + p->marginy; + } + if (panel_position & TOP) { + panel->posy = server.monitor[panel->monitor].y + panel->marginy; + } + else { + if (panel_position & BOTTOM) { + panel->posy = server.monitor[panel->monitor].y + server.monitor[panel->monitor].height - panel->area.height - panel->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); - } + 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", p->posx, p->posy, p->area.width, p->area.height); - - // Catch some events - XSetWindowAttributes att = { ParentRelative, 0L, 0, 0L, 0, 0, Always, 0L, 0L, False, ExposureMask|ButtonPressMask|ButtonReleaseMask, 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; + // printf("panel : posx %d, posy %d, width %d, height %d\n", panel->posx, panel->posy, panel->area.width, panel->area.height); } @@ -167,7 +234,6 @@ void cleanup_panel() task_active = 0; task_drag = 0; task_urgent = 0; - cleanup_systray(); cleanup_taskbar(); // font allocated once @@ -182,8 +248,6 @@ void cleanup_panel() 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); @@ -306,7 +370,6 @@ void set_panel_properties(Panel *p) { 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) { @@ -318,6 +381,38 @@ void set_panel_properties(Panel *p) 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; + 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); + + // 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); + // Reserved space long struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; if (panel_horizontal) { @@ -352,34 +447,13 @@ void set_panel_properties(Panel *p) 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 + // Fixed position and non-resizable window + // Allow panel move and resize when tint2 reload config file 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; - wmhints.flags = InputHint; - wmhints.input = False; - XChangeProperty (server.dsp, p->main_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, 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); + 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); }