basic systray with some bugs, update tintrc sample file

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 13e380fdd1c78c67e629bae633a3c4b196dfad9f..7b6b3c5dd06b05d0b1341bf9f4ce515e70da6b5f 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -55,6 +55,7 @@ void init ()
 
    // set global data
    memset(&server, 0, sizeof(Server_global));
+   memset(&systray, 0, sizeof(Systraybar));
 
    server.dsp = XOpenDisplay (NULL);
    if (!server.dsp) {
@@ -86,6 +87,7 @@ void init ()
 void cleanup()
 {
        cleanup_panel();
+       cleanup_systray();
 
    if (time1_font_desc) pango_font_description_free(time1_font_desc);
    if (time2_font_desc) pango_font_description_free(time2_font_desc);
@@ -138,7 +140,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 (!tskbar->area.on_screen) continue;
       if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
          break;
    }
@@ -188,7 +190,7 @@ 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 (!tskbar->area.on_screen) continue;
       if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
          goto suite;
    }
@@ -401,6 +403,37 @@ void event_property_notify (XEvent *e)
 }
 
 
+void event_expose (XEvent *e)
+{
+   Panel *panel;
+
+       panel = get_panel(e->xany.window);
+       if (!panel) return;
+/*
+       if (systray.area.on_screen) {
+               // force trayer refresh
+               //XClearWindow(tray_data.dpy, ti->mid_parent);
+               //x11_send_visibility(tray_data.dpy, dst, VisibilityFullyObscured);
+               //x11_send_visibility(tray_data.dpy, dst, VisibilityUnobscured);
+
+               GSList *l;
+               TrayWindow *traywin;
+               for (l = systray.list_icons; l ; l = l->next) {
+                       traywin = (TrayWindow*)l->data;
+                       // send Expose event
+                       XClearArea(server.dsp, traywin->id, 0, 0, systray.area.width, systray.area.height, True);
+                       //printf("expose %lx\n", traywin->id);
+               }
+
+               //x11_refresh_window(tray_data.dpy, ti->wid, ti->l.wnd_sz.x, ti->l.wnd_sz.y, True);
+       }
+*/
+   panel_refresh = 1;
+       //XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
+
+}
+
+
 void event_configure_notify (Window win)
 {
    if (panel_mode != SINGLE_MONITOR) return;
@@ -453,6 +486,7 @@ int main (int argc, char *argv[])
    int x11_fd, i, c;
    struct timeval tv;
    Panel *panel;
+       GSList *it;
 
    c = getopt (argc, argv, "c:");
    init ();
@@ -495,17 +529,15 @@ load_config:
                   break;
 
                case ButtonRelease:
-                  event_button_release (&e);
+                  event_button_release(&e);
                   break;
 
                case Expose:
-                       panel = get_panel(e.xany.window);
-                       if (!panel) break;
-                  XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
+                       event_expose(&e);
                   break;
 
                case PropertyNotify:
-                  event_property_notify (&e);
+                  event_property_notify(&e);
                   break;
 
                case ConfigureNotify:
@@ -517,15 +549,12 @@ load_config:
 
                                        case UnmapNotify:
                                        case DestroyNotify:
-//     printf("destroy client\n");
-                                       /*
-                                               GSList *it;
-                                               for (it = icons; it; it = g_slist_next(it)) {
+                                               for (it = systray.list_icons; it; it = g_slist_next(it)) {
                                                        if (((TrayWindow*)it->data)->id == e.xany.window) {
-                                                               icon_remove(it);
+                                                               icon_remove((TrayWindow*)it->data);
                                                                break;
                                                        }
-                                               }*/
+                                               }
                                        break;
 
                                        case ClientMessage:
@@ -557,7 +586,7 @@ load_config:
                                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);
+                               refresh(&panel->area);
                           XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
                        }
                        XFlush (server.dsp);