cleanup code

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 4f5c67372f18132a3f27b4f7c51e33001176888b..2f5edc6f0991cf429611982a31808646399dbca9 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -38,6 +38,7 @@
 #include "task.h"
 #include "taskbar.h"
 #include "systraybar.h"
+#include "launcher.h"
 #include "panel.h"
 #include "tooltip.h"
 #include "timer.h"
@@ -63,6 +64,7 @@ void init (int argc, char *argv[])
        default_battery();
 #endif
        default_clock();
+       default_launcher();
        default_taskbar();
        default_tooltip();
        default_panel();
@@ -156,12 +158,13 @@ void cleanup()
 {
        cleanup_timeout();
        cleanup_systray();
-       cleanup_panel();
        cleanup_tooltip();
        cleanup_clock();
+       cleanup_launcher();
 #ifdef ENABLE_BATTERY
        cleanup_battery();
 #endif
+       cleanup_panel();
        cleanup_config();
 
        if (default_icon) {
@@ -183,7 +186,7 @@ void get_snapshot(const char *path)
                panel->area.width = server.monitor[0].width;
 
        panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
-       refresh(&panel->area);
+       rendering(panel);
 
        Imlib_Image img = NULL;
        imlib_context_set_drawable(panel->temp_pmap);
@@ -278,7 +281,15 @@ int tint2_handles_click(Panel* panel, XButtonEvent* e)
                else
                        return 0;
        }
-       // no task clicked --> check if taskbar clicked
+       LauncherIcon *icon = click_launcher_icon(panel, e->x, e->y);
+       if (icon) {
+               if (e->button == 1) {
+                       return 1;
+               } else {
+                       return 0;
+               }
+       }
+       // no launcher/task clicked --> check if taskbar clicked
        Taskbar *tskbar = click_taskbar(panel, e->x, e->y);
        if (tskbar && e->button == 1 && panel_mode == MULTI_DESKTOP)
                return 1;
@@ -421,6 +432,15 @@ void event_button_release (XEvent *e)
                return;
        }
 
+       if ( click_launcher(panel, e->xbutton.x, e->xbutton.y)) {
+               LauncherIcon *icon = click_launcher_icon(panel, e->xbutton.x, e->xbutton.y);
+               if (icon) {
+                       launcher_action(icon);
+               }
+               task_drag = 0;
+               return;
+       }
+
        Taskbar *tskbar;
        if ( !(tskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y)) ) {
                // TODO: check better solution to keep window below
@@ -467,11 +487,14 @@ void event_property_notify (XEvent *e)
 
                // Change number of desktops
                else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
+                       if (!taskbar_enabled) return;
                        server.nb_desktop = server_get_number_of_desktop ();
                        cleanup_taskbar();
                        init_taskbar();
-                       visible_object();
                        for (i=0 ; i < nb_panel ; i++) {
+                               init_taskbar_panel(&panel1[i]);
+                               set_panel_items_order(&panel1[i]);
+                               visible_taskbar(&panel1[i]);
                                panel1[i].area.resize = 1;
                        }
                        task_refresh_tasklist();
@@ -480,11 +503,12 @@ void event_property_notify (XEvent *e)
                }
                // Change desktop
                else if (at == server.atom._NET_CURRENT_DESKTOP) {
+                       if (!taskbar_enabled) return;
                        int old_desktop = server.desktop;
                        server.desktop = server_get_current_desktop ();
                        for (i=0 ; i < nb_panel ; i++) {
                                Panel *panel = &panel1[i];
-                               if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) {
+                               if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.bg != panel->g_taskbar.bg_active) {
                                        // redraw both taskbar
                                        if (server.nb_desktop > old_desktop) {
                                                // can happen if last desktop is deleted and we've been on the last desktop
@@ -518,9 +542,8 @@ void event_property_notify (XEvent *e)
                                                tskbar->area.resize = 1;
                                        }
                                }
-                       }
-                       if (panel_mode != MULTI_DESKTOP) {
-                               visible_object();
+                               if (panel_mode != MULTI_DESKTOP) 
+                                       visible_taskbar(panel);
                        }
                }
                // Window list
@@ -755,7 +778,7 @@ start:
                                else {
                                        if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
                                        panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
-                                       refresh(&panel->area);
+                                       rendering(panel);
                                        XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
                                }
                        }
@@ -825,7 +848,7 @@ start:
                                                Panel* panel = get_panel(e.xmotion.window);
                                                Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);
                                                if (area->_get_tooltip_text)
-                                                       tooltip_trigger_show(area, panel, e.xmotion.x_root, e.xmotion.y_root);
+                                                       tooltip_trigger_show(area, panel, &e);
                                                else
                                                        tooltip_trigger_hide();
                                                break;
@@ -863,7 +886,7 @@ start:
                                                        signal_pending = SIGUSR1;
                                                        break;
                                                }
-                                               if (e.xany.window == g_tooltip.window || !systray.area.on_screen)
+                                               if (e.xany.window == g_tooltip.window || !systray_enabled)
                                                        break;
                                                for (it = systray.list_icons; it; it = g_slist_next(it)) {
                                                        if (((TrayWindow*)it->data)->tray_id == e.xany.window) {
@@ -883,7 +906,7 @@ start:
                                                                // Start real_transparency
                                                                signal_pending = SIGUSR1;
                                                }
-                                               if (systray.area.on_screen && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
+                                               if (systray_enabled && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
                                                        net_message(&e.xclient);
                                                }
                                                else if (e.xclient.message_type == server.atom.XdndPosition) {