]> Dogcows Code - chaz/tint2/blobdiff - src/tint.c
mem leak
[chaz/tint2] / src / tint.c
index ec30b5d25566c20d6c6e52c1f7ad895161560969..163fd9ea223e8a2b2e649ebda61dd93cad6fac09 100644 (file)
@@ -49,21 +49,27 @@ void signal_handler(int sig)
 
 void init (int argc, char *argv[])
 {
-       int c;
+       int i;
 
        // read options
-       while ((c = getopt(argc , argv, "c:j:v")) != -1) {
-               switch (c) {
-                       case 'c':
-                       config_path = strdup (optarg);
-                       break;
-                       case 'j':
-                       thumbnail_path = strdup (optarg);
-                       break;
-                       case 'v':
-                       printf("tint2 version 0.7-svn\n");
+       for (i = 1; i < argc; ++i) {
+               if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))       {
+                       printf("Usage: tint2 [-c] <config_file>\n");
                        exit(0);
-                       break;
+               }
+               if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version"))    {
+                       printf("tint2 version 0.7.svn\n");
+                       exit(0);
+               }
+               if (!strcmp(argv[i], "-c"))     {
+                       i++;
+                       if (i < argc)
+                               config_path = strdup(argv[i]);
+               }
+               if (!strcmp(argv[i], "-s"))     {
+                       i++;
+                       if (i < argc)
+                               snapshot_path = strdup(argv[i]);
                }
        }
 
@@ -91,7 +97,7 @@ void init (int argc, char *argv[])
        server.visual = DefaultVisual (server.dsp, server.screen);
        server.desktop = server_get_current_desktop ();
        XGCValues  gcv;
-       server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv) ;
+       server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv);
 
        XSetErrorHandler ((XErrorHandler) server_catch_error);
 
@@ -105,7 +111,6 @@ void init (int argc, char *argv[])
        setlocale (LC_ALL, "");
 
        // load default icon
-       int i;
        char *path;
        const gchar * const *data_dirs;
        data_dirs = g_get_system_data_dirs ();
@@ -115,43 +120,30 @@ void init (int argc, char *argv[])
                        default_icon = imlib_load_image(path);
                g_free(path);
        }
+
+       // get monitor and desktop config
+       get_monitors();
+       get_desktops();
 }
 
 
 void cleanup()
 {
        cleanup_systray();
+       stop_net();
        cleanup_panel();
+       cleanup_tooltip();
+       cleanup_clock();
+#ifdef ENABLE_BATTERY
+       cleanup_battery();
+#endif
 
        if (default_icon) {
                imlib_context_set_image(default_icon);
                imlib_free_image();
        }
-       if (g_tooltip.window) {
-               XDestroyWindow(server.dsp, g_tooltip.window);
-               g_tooltip.window = 0;
-       }
-       if (g_tooltip.font_desc) {
-               pango_font_description_free(g_tooltip.font_desc);
-               g_tooltip.font_desc = 0;
-       }
-       if (time1_font_desc) pango_font_description_free(time1_font_desc);
-       if (time2_font_desc) pango_font_description_free(time2_font_desc);
-       if (time1_format) g_free(time1_format);
-       if (time2_format) g_free(time2_format);
-#ifdef ENABLE_BATTERY
-       if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
-       if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
-       if (battery_low_cmd) g_free(battery_low_cmd);
-       if (path_energy_now) g_free(path_energy_now);
-       if (path_energy_full) g_free(path_energy_full);
-       if (path_current_now) g_free(path_current_now);
-       if (path_status) g_free(path_status);
-#endif
-       if (clock_lclick_command) g_free(clock_lclick_command);
-       if (clock_rclick_command) g_free(clock_rclick_command);
        if (config_path) g_free(config_path);
-       if (thumbnail_path) g_free(thumbnail_path);
+       if (snapshot_path) g_free(snapshot_path);
 
        if (server.monitor) free(server.monitor);
        XFreeGC(server.dsp, server.gc);
@@ -159,6 +151,25 @@ void cleanup()
 }
 
 
+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);
+
+       refresh(&panel->area);
+
+       Imlib_Image img = NULL;
+       imlib_context_set_drawable(panel->temp_pmap);
+       img = imlib_create_image_from_drawable(0, 0, 0, panel->area.width, panel->area.height, 0);
+
+       imlib_context_set_image(img);
+       imlib_save_image(path);
+       imlib_free_image();
+}
+
+
 Taskbar *click_taskbar (Panel *panel, int x, int y)
 {
        Taskbar *tskbar;
@@ -299,10 +310,10 @@ void event_button_press (XEvent *e)
                e->xbutton.window = server.root_win;
                // icewm doesn't open under the mouse.
                // and xfce doesn't open at all.
-               //e->xbutton.x = e->xbutton.x_root;
-               //e->xbutton.y = e->xbutton.y_root;
+               e->xbutton.x = e->xbutton.x_root;
+               e->xbutton.y = e->xbutton.y_root;
                //printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y);
-               XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
+               //XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
                XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e);
                return;
        }
@@ -415,9 +426,9 @@ void event_property_notify (XEvent *e)
                                if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) {
                                        // redraw both taskbar
                                        panel->taskbar[old_desktop].area.is_active = 0;
-                                       panel->taskbar[old_desktop].area.redraw = 1;
+                                       panel->taskbar[old_desktop].area.resize = 1;
                                        panel->taskbar[server.desktop].area.is_active = 1;
-                                       panel->taskbar[server.desktop].area.redraw = 1;
+                                       panel->taskbar[server.desktop].area.resize = 1;
                                        panel_refresh = 1;
                                }
                                // check ALLDESKTOP task => resize taskbar
@@ -453,44 +464,7 @@ void event_property_notify (XEvent *e)
                }
                // Change active
                else if (at == server.atom._NET_ACTIVE_WINDOW) {
-                       GSList *l0;
-                       if (task_active) {
-                               for (i=0 ; i < nb_panel ; i++) {
-                                       for (j=0 ; j < panel1[i].nb_desktop ; j++) {
-                                               for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
-                                                       tsk = l0->data;
-                                                       tsk->area.is_active = 0;
-                                               }
-                                       }
-                               }
-                               task_active = 0;
-                       }
-                       Window w1 = window_get_active ();
-                       Task *t = task_get_task(w1);
-                       if (!t) {
-                               Window w2;
-                               if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
-                                       if (w2) t = task_get_task(w2);
-                       }
-                       if (task_urgent == t) {
-                               init_precision();
-                               task_urgent = 0;
-                       }
-                       // put active state on all task (multi_desktop)
-                       if (t) {
-                               for (i=0 ; i < nb_panel ; i++) {
-                                       for (j=0 ; j < panel1[i].nb_desktop ; j++) {
-                                               for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
-                                                       tsk = l0->data;
-                                                       if (tsk->win == t->win) {
-                                                               tsk->area.is_active = 1;
-                                                               //printf("active monitor %d, task %s\n", panel1[i].monitor, tsk->title);
-                                                       }
-                                               }
-                                       }
-                               }
-                               task_active = t;
-                       }
+                       active_task();
                        panel_refresh = 1;
                }
                else if (at == server.atom._XROOTPMAP_ID) {
@@ -637,7 +611,10 @@ void event_configure_notify (Window win)
        // change in root window (xrandr)
        if (win == server.root_win) {
                get_monitors();
+               init_config();
+               config_read_file (config_path);
                init_panel();
+               cleanup_config();
                return;
        }
 
@@ -695,7 +672,7 @@ void event_timer()
 
        // update battery
 #ifdef ENABLE_BATTERY
-       if (panel1[0].battery.area.on_screen) {
+       if (battery_enabled) {
                update_battery();
                for (i=0 ; i < nb_panel ; i++)
                        panel1[i].battery.area.resize = 1;
@@ -763,10 +740,10 @@ int main (int argc, char *argv[])
                cleanup();
                exit(1);
        }
-       config_finish();
-       if (thumbnail_path) {
-               // usage: tint2 -j <file> for internal use
-               printf("file %s\n", thumbnail_path);
+       init_panel();
+       cleanup_config();
+       if (snapshot_path) {
+               get_snapshot(snapshot_path);
                cleanup();
                exit(0);
        }
@@ -799,6 +776,7 @@ int main (int argc, char *argv[])
                                                break;
 
                                        case MotionNotify: {
+                                               if (!g_tooltip.enabled) break;
                                                Panel* panel = get_panel(e.xmotion.window);
                                                Task* task = click_task(panel, e.xmotion.x, e.xmotion.y);
                                                if (task)
@@ -825,7 +803,7 @@ int main (int argc, char *argv[])
                                                break;
 
                                        case ReparentNotify:
-                                               if (!systray.area.on_screen)
+                                               if (!systray_enabled)
                                                        break;
                                                panel = (Panel*)systray.area.panel;
                                                if (e.xany.window == panel->main_win) // reparented to us
@@ -859,11 +837,12 @@ int main (int argc, char *argv[])
                event_timer();
 
                switch (signal_pending) {
-                       case SIGUSR1:
+                       case SIGUSR1: // reload config file
                                signal_pending = 0;
                                init_config();
                                config_read_file (config_path);
                                init_panel();
+                               cleanup_config();
                                break;
                        case SIGINT:
                        case SIGTERM:
This page took 0.028143 seconds and 4 git commands to generate.