X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=2341237b90db8c82490cfcbfef0b515d25810865;hb=b0ff4722b169b9bc26240a0fdecbc2d911f7afb8;hp=7ef7e205f263360ebea094ce86a011b6385e3b1b;hpb=501a421b337b6e08b58904b1c008bd05dbbf954b;p=chaz%2Ftint2 diff --git a/src/panel.c b/src/panel.c index 7ef7e20..2341237 100644 --- a/src/panel.c +++ b/src/panel.c @@ -29,6 +29,7 @@ #include "window.h" #include "task.h" #include "panel.h" +#include "tooltip.h" int signal_pending; @@ -57,6 +58,7 @@ int max_tick_urgent; Panel *panel1 = 0; int nb_panel; +Imlib_Image default_icon; void init_panel() @@ -64,6 +66,17 @@ void init_panel() 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]; @@ -93,59 +106,7 @@ void init_panel() 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); + init_panel_size_and_position(p); // Catch some events long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask; @@ -164,6 +125,64 @@ void init_panel() } +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; + 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; + } + else { + if (panel->pourcentx) + panel->area.height = (float)server.monitor[panel->monitor].height * panel->initial_width / 100; + else + panel->area.height = panel->initial_width; + if (panel->pourcenty) + panel->area.width = (float)server.monitor[panel->monitor].width * panel->initial_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 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_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) { + 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 { + 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; @@ -174,6 +193,11 @@ void cleanup_panel() 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); @@ -319,7 +343,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) { @@ -375,10 +398,12 @@ void set_panel_properties(Panel *p) 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 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); + 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); // Unfocusable XWMHints wmhints; @@ -392,7 +417,7 @@ void set_panel_properties(Panel *p) wmhints.flags = InputHint; wmhints.input = False; } - XSetWMHints(server.dsp, p->main_win, &wmhints); + XSetWMHints(server.dsp, p->main_win, &wmhints); // Undecorated long prop[5] = { 2, 0, 0, 0, 0 };