tint2 looks good for me. if you see bugs, report it.

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 10ccb3638672d9b366994d9907cb726bb4ce71a8..20038c14c88eeddb698e6e99352193edb5d6e456 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -35,10 +35,8 @@
 #include "config.h"
 #include "task.h"
 #include "taskbar.h"
+#include "systraybar.h"
 #include "panel.h"
-#include "docker.h"
-#include "net.h"
-#include "kde.h"
 
 
 void signal_handler(int sig)
@@ -74,14 +72,6 @@ void init ()
 
    XSetErrorHandler ((XErrorHandler) server_catch_error);
 
-   // init systray
-   //display = server.dsp;
-   //root = RootWindow(display, DefaultScreen(display));
-   //create_main_window();
-   //kde_init();
-   //net_init();
-   //printf("ici 4\n");
-
    imlib_context_set_display (server.dsp);
    imlib_context_set_visual (server.visual);
    imlib_context_set_colormap (DefaultColormap (server.dsp, server.screen));
@@ -138,7 +128,7 @@ void event_button_press (XEvent *e)
 
    if (panel_mode != MULTI_DESKTOP) {
       // drag and drop disabled
-      //XLowerWindow (server.dsp, panel.main_win);
+      XLowerWindow (server.dsp, panel->main_win);
       return;
    }
 
@@ -148,6 +138,7 @@ void event_button_press (XEvent *e)
    int y = e->xbutton.y;
    for (l0 = panel->area.list; l0 ; l0 = l0->next) {
       tskbar = l0->data;
+      if (!tskbar->area.visible) continue;
       if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
          break;
    }
@@ -163,7 +154,7 @@ void event_button_press (XEvent *e)
       }
    }
 
-   //XLowerWindow (server.dsp, panel.main_win);
+   XLowerWindow (server.dsp, panel->main_win);
 }
 
 
@@ -197,12 +188,13 @@ void event_button_release (XEvent *e)
    GSList *l0;
    for (l0 = panel->area.list; l0 ; l0 = l0->next) {
       tskbar = l0->data;
+      if (!tskbar->area.visible) continue;
       if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
          goto suite;
    }
 
    // TODO: check better solution to keep window below
-   //XLowerWindow (server.dsp, panel.main_win);
+   XLowerWindow (server.dsp, panel->main_win);
    task_drag = 0;
    return;
 
@@ -238,7 +230,7 @@ suite:
    }
 
    // to keep window below
-   //XLowerWindow (server.dsp, panel.main_win);
+   XLowerWindow (server.dsp, panel->main_win);
 }
 
 
@@ -259,6 +251,9 @@ void event_property_notify (Window win, Atom at)
                        cleanup_taskbar();
                        init_taskbar();
                        visible_object();
+                       for (i=0 ; i < nb_panel ; i++) {
+                               panel1[i].area.resize = 1;
+                       }
                        task_refresh_tasklist();
                        panel_refresh = 1;
       }
@@ -407,6 +402,11 @@ void event_configure_notify (Window win)
       // task on another monitor
       remove_task (tsk);
       add_task (win);
+      if (win == window_get_active ()) {
+                  Task *tsk = task_get_task (win);
+                       tsk->area.is_active = 1;
+                       task_active = tsk;
+               }
       panel_refresh = 1;
    }
 }
@@ -428,7 +428,7 @@ void event_timer()
 
        int i;
        for (i=0 ; i < nb_panel ; i++) {
-          panel1[i].clock.area.redraw = 1;
+          panel1[i].clock.area.resize = 1;
        }
    panel_refresh = 1;
 }
@@ -459,11 +459,6 @@ load_config:
    }
    config_finish();
 
-   // BUG: refresh(clock) is needed here, but 'on the paper' it's not necessary.
-       for (i=0 ; i < nb_panel ; i++) {
-               refresh(&panel1[i].clock.area);
-       }
-
    x11_fd = ConnectionNumber(server.dsp);
    XSync(server.dsp, False);
 
@@ -494,13 +489,10 @@ load_config:
                case Expose:
                        panel = get_panel(e.xany.window);
                        if (!panel) break;
-                  //XCopyArea (server.dsp, panel.area.pix.pmap, server.root_win, server.gc_root, 0, 0, panel.area.width, panel.area.height, server.posx, server.posy);
-                  //XCopyArea (server.dsp, server.pmap, panel.main_win, server.gc, panel.area.paddingxlr, 0, panel.area.width-(2*panel.area.paddingxlr), panel.area.height, 0, 0);
-                  XCopyArea (server.dsp, panel->root_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
+                  XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
                   break;
 
                case PropertyNotify:
-                  //printf("PropertyNotify %lx\n", e.xproperty.window);
                   event_property_notify (e.xproperty.window, e.xproperty.atom);
                   break;
 
@@ -509,6 +501,25 @@ load_config:
                      goto load_config;
                   else
                      event_configure_notify (e.xconfigure.window);
+                  break;
+
+                                       case UnmapNotify:
+                                       case DestroyNotify:
+                                       /*
+                                               GSList *it;
+                                               for (it = icons; it; it = g_slist_next(it)) {
+                                                       if (((TrayWindow*)it->data)->id == e.xany.window) {
+                                                               icon_remove(it);
+                                                               break;
+                                                       }
+                                               }*/
+                                       break;
+
+                                       case ClientMessage:
+                                               break;
+                                               if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32)
+                                               // &&   e.xclient.window == net_sel_win)
+                                                       net_message(&e.xclient);
                   break;
             }
          }
@@ -525,12 +536,26 @@ load_config:
       }
 
       if (panel_refresh) {
-                       for (i=0 ; i < nb_panel ; i++)
-                visual_refresh(&panel1[i]);
-                       XFlush (server.dsp);
                        panel_refresh = 0;
+
+                       for (i=0 ; i < nb_panel ; i++) {
+                               panel = &panel1[i];
+
+                               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);
+                          XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
+                       }
+                       XFlush (server.dsp);
                }
    }
 }
 
+// ****************************************************
+// main_win doesn't include panel.area.paddingx, so we have WM capabilities on left and right.
+// this feature is disabled !
+//XCopyArea (server.dsp, server.pmap, p->main_win, server.gc, p->area.paddingxlr, 0, p->area.width-(2*p->area.paddingxlr), p->area.height, 0, 0);
+//XCopyArea (server.dsp, panel.area.pix.pmap, server.root_win, server.gc_root, 0, 0, panel.area.width, panel.area.height, server.posx, server.posy);
+//XCopyArea (server.dsp, server.pmap, panel.main_win, server.gc, panel.area.paddingxlr, 0, panel.area.width-(2*panel.area.paddingxlr), panel.area.height, 0, 0);