]> Dogcows Code - chaz/tint2/blobdiff - src/tint.c
fixed issue 48
[chaz/tint2] / src / tint.c
index b84ee185c1ee7879c2eed94d86935e5f905ebb23..13e380fdd1c78c67e629bae633a3c4b196dfad9f 100644 (file)
@@ -58,7 +58,7 @@ void init ()
 
    server.dsp = XOpenDisplay (NULL);
    if (!server.dsp) {
-      fprintf(stderr, "Could not open display.\n");
+      fprintf(stderr, "tint2 exit : could not open display.\n");
       exit(0);
    }
    server_init_atoms ();
@@ -138,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;
    }
@@ -187,6 +188,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 (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
          goto suite;
    }
@@ -232,10 +234,12 @@ suite:
 }
 
 
-void event_property_notify (Window win, Atom at)
+void event_property_notify (XEvent *e)
 {
        int i, j;
    Task *tsk;
+   Window win = e->xproperty.window;
+   Atom at = e->xproperty.atom;
 
    if (win == server.root_win) {
       if (!server.got_root_win) {
@@ -243,31 +247,31 @@ void event_property_notify (Window win, Atom at)
          server.got_root_win = 1;
       }
 
-      /* Change number of desktops */
+      // Change number of desktops
       else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
              server.nb_desktop = server_get_number_of_desktop ();
                        cleanup_taskbar();
                        init_taskbar();
                        visible_object();
                        for (i=0 ; i < nb_panel ; i++) {
-                               set_resize(&panel1[i]);
+                               panel1[i].area.resize = 1;
                        }
                        task_refresh_tasklist();
                        panel_refresh = 1;
       }
-      /* Change desktop */
+      // Change desktop
       else if (at == server.atom._NET_CURRENT_DESKTOP) {
          server.desktop = server_get_current_desktop ();
          if (panel_mode != MULTI_DESKTOP) {
                                visible_object();
          }
       }
-      /* Window list */
+      // Window list
       else if (at == server.atom._NET_CLIENT_LIST) {
          task_refresh_tasklist();
          panel_refresh = 1;
       }
-      /* Change active */
+      // Change active
       else if (at == server.atom._NET_ACTIVE_WINDOW) {
          GSList *l0;
        if (task_active) {
@@ -304,7 +308,7 @@ void event_property_notify (Window win, Atom at)
                        }
          panel_refresh = 1;
       }
-      /* Wallpaper changed */
+      // Wallpaper changed
       else if (at == server.atom._XROOTPMAP_ID) {
                        for (i=0 ; i < nb_panel ; i++) {
                                set_panel_background(&panel1[i]);
@@ -317,7 +321,7 @@ void event_property_notify (Window win, Atom at)
       if (!tsk) return;
       //printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title);
 
-      /* Window title changed */
+      // Window title changed
       if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) {
                        Task *tsk2;
                        GSList *l0;
@@ -336,9 +340,18 @@ void event_property_notify (Window win, Atom at)
                        }
          panel_refresh = 1;
       }
-      /* Iconic state */
+               // Demand attention
+      else if (at == server.atom._NET_WM_STATE) {
+         if (window_is_urgent (win)) {
+                               printf("  event_property_notify _NET_WM_STATE_DEMANDS_ATTENTION\n");
+                       }
+                       else {
+                       }
+               }
       else if (at == server.atom.WM_STATE) {
-         if (window_is_iconified (win))
+       // Iconic state
+                       // TODO : try to delete following code
+         if (window_is_iconified (win)) {
             if (task_active) {
                if (task_active->win == tsk->win) {
                                                Task *tsk2;
@@ -354,8 +367,9 @@ void event_property_notify (Window win, Atom at)
                   task_active = 0;
                }
             }
-      }
-      /* Window icon changed */
+                       }
+               }
+      // Window icon changed
       else if (at == server.atom._NET_WM_ICON) {
                   get_icon(tsk);
                        Task *tsk2;
@@ -375,7 +389,7 @@ void event_property_notify (Window win, Atom at)
                        }
          panel_refresh = 1;
       }
-      /* Window desktop changed */
+      // Window desktop changed
       else if (at == server.atom._NET_WM_DESKTOP) {
          remove_task (tsk);
          add_task (win);
@@ -400,6 +414,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;
    }
 }
@@ -421,7 +440,6 @@ 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;
@@ -483,13 +501,11 @@ 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:
-                  event_property_notify (e.xproperty.window, e.xproperty.atom);
+                  event_property_notify (&e);
                   break;
 
                case ConfigureNotify:
@@ -501,6 +517,7 @@ load_config:
 
                                        case UnmapNotify:
                                        case DestroyNotify:
+//     printf("destroy client\n");
                                        /*
                                                GSList *it;
                                                for (it = icons; it; it = g_slist_next(it)) {
@@ -512,10 +529,10 @@ load_config:
                                        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)
+                                               //printf("ClientMessage\n");
+                                               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;
             }
          }
@@ -532,14 +549,26 @@ load_config:
       }
 
       if (panel_refresh) {
+                       panel_refresh = 0;
+
                        for (i=0 ; i < nb_panel ; i++) {
-                visual_refresh(&panel1[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);
-                       panel_refresh = 0;
                }
    }
 }
 
+// ****************************************************
+// 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);
 
This page took 0.025947 seconds and 4 git commands to generate.