]> Dogcows Code - chaz/tint2/blobdiff - src/panel.c
look like autohide need minimal height
[chaz/tint2] / src / panel.c
index eb839021d5740c1b04576ca6159ca98384e7cbeb..87bab8d42c9bef723c27571d038685cf3d4dd48e 100644 (file)
@@ -27,6 +27,7 @@
 #include <pango/pangocairo.h>
 
 #include "server.h"
+#include "config.h"
 #include "window.h"
 #include "task.h"
 #include "panel.h"
@@ -45,17 +46,18 @@ 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;
 
 Task *task_active;
 Task *task_drag;
@@ -64,18 +66,68 @@ 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 autohide_hide(void* p);
 void autohide_show(void* p);
 
 
+void default_panel()
+{
+       panel1 = 0;
+       nb_panel = 0;
+       default_icon = NULL;
+       task_active = 0;
+       task_drag = 0;
+       task_dragged = 0;
+       panel_horizontal = 1;
+       panel_position = CENTER;
+       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_MINIMUM;
+       panel_dock = 0;  // default not in the dock
+       panel_layer = BOTTOM_LAYER;  // default is bottom layer
+       wm_menu = 0;
+       max_tick_urgent = 7;
+       memset(&panel_config, 0, sizeof(Panel));
+       backgrounds = g_array_new(0, 0, sizeof(Background));
+
+       // 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];
+
+               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 (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;
@@ -96,6 +148,7 @@ void init_panel()
 
        cleanup_taskbar();
        for (i=0 ; i < nb_panel ; i++) {
+               autohide_show(&panel1[i]);
                free_area(&panel1[i].area);
                if (panel1[i].temp_pmap) {
                        XFreePixmap(server.dsp, panel1[i].temp_pmap);
@@ -165,12 +218,7 @@ void init_panel()
 
                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 };
+                       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);
                }
@@ -179,6 +227,13 @@ void init_panel()
                        XMoveResizeWindow(server.dsp, p->main_win, p->posx, p->posy, p->area.width, p->area.height);
                }
 
+               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;
                        server.gc = XCreateGC(server.dsp, p->main_win, 0, &gcv);
@@ -186,8 +241,8 @@ 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 (i >= old_nb_panel && snapshot_path == 0) {
+                       // if we are not in 'snapshot' mode then map new panel
                        XMapWindow (server.dsp, p->main_win);
                }
 
@@ -279,53 +334,6 @@ void init_panel_size_and_position(Panel *panel)
 }
 
 
-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;
@@ -429,6 +437,12 @@ void visible_object()
 
 void update_strut(Panel* p)
 {
+       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;
+       }
+
        // Reserved space
        unsigned int d1, screen_width, screen_height;
        Window d2;
@@ -557,7 +571,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 {
@@ -596,6 +610,15 @@ void set_panel_background(Panel *p)
                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);
+               }
+       }
 }
 
 
@@ -748,6 +771,7 @@ void autohide_show(void* p)
                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;
 }
 
@@ -762,6 +786,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);
This page took 0.030279 seconds and 4 git commands to generate.