moved initial values in function default_xxx

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index c8521a04e584d74718fd29959eb297741133dbe9..35141b06829593afece63cfed2a2b55b03c5960b 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -42,6 +42,7 @@
 #include "tooltip.h"
 #include "timer.h"
 
+
 void signal_handler(int sig)
 {
        // signal handler is light as it should be
@@ -53,6 +54,16 @@ void init (int argc, char *argv[])
 {
        int i;
 
+       // set global data
+       default_timeout();
+       default_systray();
+       memset(&server, 0, sizeof(Server_global));
+       default_battery();
+       default_clock();
+       default_taskbar();
+       default_tooltip();
+       default_config();
+
        // read options
        for (i = 1; i < argc; ++i) {
                if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))       {
@@ -91,10 +102,6 @@ void init (int argc, char *argv[])
 //     sigaddset(&block_mask, SIGHUP);
 //     sigaddset(&block_mask, SIGUSR1);
 //     sigprocmask(SIG_BLOCK, &block_mask, 0);
-
-       // set global data
-       memset(&server, 0, sizeof(Server_global));
-       memset(&systray, 0, sizeof(Systraybar));
 }
 
 void init_X11()
@@ -140,7 +147,8 @@ void init_X11()
 
 void cleanup()
 {
-       stop_all_timeouts();
+printf("*** cleanup()\n");
+       cleanup_timeout();
        cleanup_systray();
        stop_net();
        cleanup_panel();
@@ -149,13 +157,12 @@ void cleanup()
 #ifdef ENABLE_BATTERY
        cleanup_battery();
 #endif
+       cleanup_config();
 
        if (default_icon) {
                imlib_context_set_image(default_icon);
                imlib_free_image();
        }
-       if (config_path) g_free(config_path);
-       if (snapshot_path) g_free(snapshot_path);
 
        cleanup_server();
        if (server.dsp) XCloseDisplay(server.dsp);
@@ -166,9 +173,10 @@ void get_snapshot(const char *path)
 {
        Panel *panel = &panel1[0];
 
-       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);
+       if (panel->area.width > server.monitor[0].width)
+               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);
 
        Imlib_Image img = NULL;
@@ -176,8 +184,14 @@ void get_snapshot(const char *path)
        img = imlib_create_image_from_drawable(0, 0, 0, panel->area.width, panel->area.height, 0);
 
        imlib_context_set_image(img);
+       if (!panel_horizontal) {
+               // rotate 90° vertical panel
+               imlib_image_flip_horizontal();
+               imlib_image_flip_diagonal();
+       }
        imlib_save_image(path);
        imlib_free_image();
+       XFreePixmap(server.dsp, panel->temp_pmap);
 }
 
 
@@ -308,7 +322,7 @@ void event_button_motion_notify (XEvent *e)
        Panel * panel = get_panel(e->xany.window);
        if(!panel || !task_drag)
                return;
- 
+
        // Find the taskbar on the event's location
        Taskbar * event_taskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y);
        if(event_taskbar == NULL)
@@ -407,12 +421,6 @@ void event_button_release (XEvent *e)
                return;
        }
 
-       // switch desktop
-       if (panel_mode == MULTI_DESKTOP) {
-               if (tskbar->desktop != server.desktop && action != CLOSE && action != DESKTOP_LEFT && action != DESKTOP_RIGHT)
-                       set_desktop (tskbar->desktop);
-       }
-
        // drag and drop task
        if (task_dragged) {
                task_drag = 0;
@@ -420,6 +428,12 @@ void event_button_release (XEvent *e)
                return;
        }
 
+       // switch desktop
+       if (panel_mode == MULTI_DESKTOP) {
+               if (tskbar->desktop != server.desktop && action != CLOSE && action != DESKTOP_LEFT && action != DESKTOP_RIGHT)
+                       set_desktop (tskbar->desktop);
+       }
+
        // action on task
        window_action( click_task(panel, e->xbutton.x, e->xbutton.y), action);
 
@@ -692,6 +706,8 @@ int main (int argc, char *argv[])
 
        init (argc, argv);
        init_config();
+       init_X11();
+
        i = 0;
        if (config_path)
                i = config_read_file (config_path);
@@ -703,7 +719,6 @@ int main (int argc, char *argv[])
                exit(1);
        }
 
-       init_X11();
        init_panel();
        cleanup_config();
        if (snapshot_path) {
@@ -789,7 +804,7 @@ int main (int argc, char *argv[])
                                                unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask;
                                                if (e.xmotion.state & button_mask)
                                                        event_button_motion_notify (&e);
-                                               
+
                                                if (!g_tooltip.enabled) break;
                                                Panel* panel = get_panel(e.xmotion.window);
                                                Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);