changes to the timer api, pass the timer to the callback function.

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index b312aba9b73d443b3305187871b5e3c6a7f0d6ca..4f9e6a2c89af68a9a8578196d0d37044ab06907f 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -10,6 +10,7 @@
 #include "client.h"
 #include "frame.h"
 #include "focus.h"
+#include "popup.h"
 #include "dispatch.h"
 #include "extensions.h"
 #include "render/render.h"
@@ -43,6 +44,9 @@ Window   screen_support_win;
 static Rect  **area; /* array of desktop holding array of xinerama areas */
 static Rect  *monitor_area;
 
+static Popup *desktop_cycle_popup;
+static ObTimer *popup_timer = NULL;
+
 #ifdef USE_LIBSN
 static SnMonitorContext *sn_context;
 static int sn_busy_cnt;
@@ -274,6 +278,8 @@ void screen_startup()
     GSList *it;
     guint i;
 
+    desktop_cycle_popup = popup_new(FALSE);
+
     /* get the initial size */
     screen_resize();
 
@@ -313,6 +319,8 @@ void screen_shutdown()
 {
     Rect **r;
 
+    popup_free(desktop_cycle_popup);
+
     XSelectInput(ob_display, RootWindow(ob_display, ob_screen), NoEventMask);
 
     /* we're not running here no more! */
@@ -353,8 +361,8 @@ void screen_resize()
     if (ob_state() == OB_STATE_STARTING)
        return;
 
-    dock_configure();
     screen_update_areas();
+    dock_configure();
 
     for (it = client_list; it; it = it->next)
         client_move_onscreen(it->data, FALSE);
@@ -412,6 +420,36 @@ void screen_set_num_desktops(guint num)
        screen_set_desktop(num - 1);
 }
 
+static void popup_cycle_hide(ObTimer *t, void *d)
+{
+    timer_stop(t);
+    popup_timer = NULL;
+
+    popup_hide(desktop_cycle_popup);
+}
+
+static void popup_cycle_show()
+{
+    Rect *a;
+
+    a = screen_physical_area_monitor(0);
+    popup_position(desktop_cycle_popup, CenterGravity,
+                   a->x + a->width / 2, a->y + a->height / 2);
+    /* XXX the size and the font extents need to be related on some level
+     */
+    popup_size(desktop_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT);
+
+    popup_set_text_align(desktop_cycle_popup, RR_JUSTIFY_CENTER);
+
+    popup_show(desktop_cycle_popup,
+               screen_desktop_names[screen_desktop], NULL);
+
+    g_message("%s", screen_desktop_names[screen_desktop]);
+
+    if (popup_timer) timer_stop(popup_timer);
+    popup_timer = timer_start(G_USEC_PER_SEC / 2, popup_cycle_hide, NULL);
+}
+
 void screen_set_desktop(guint num)
 {
     GList *it;
@@ -460,6 +498,9 @@ void screen_set_desktop(guint num)
     ob_debug("/switch fallback\n");
 #endif
 
+    if (ob_state() == OB_STATE_RUNNING)
+        popup_cycle_show();
+
     dispatch_ob(Event_Ob_Desktop, num, old);
 }
 
@@ -487,7 +528,9 @@ void screen_update_layout()
             if (num < 4)
                 corner = OB_CORNER_TOPLEFT;
             else {
-                if (data[3] == prop_atoms.net_wm_topright)
+                if (data[3] == prop_atoms.net_wm_topleft)
+                    corner = OB_CORNER_TOPLEFT;
+                else if (data[3] == prop_atoms.net_wm_topright)
                     corner = OB_CORNER_TOPRIGHT;
                 else if (data[3] == prop_atoms.net_wm_bottomright)
                     corner = OB_CORNER_BOTTOMRIGHT;
@@ -637,8 +680,6 @@ void screen_update_areas()
 {
     guint i, x;
     guint32 *dims;
-    Rect **old_area = area;
-    Rect **rit;
     GList *it;
 
     g_free(monitor_area);
@@ -657,7 +698,6 @@ void screen_update_areas()
      
     dims = g_new(guint32, 4 * screen_num_desktops);
 
-    rit = old_area;
     for (i = 0; i < screen_num_desktops + 1; ++i) {
         Strut s;
         int l, r, t, b;
@@ -800,7 +840,7 @@ void screen_update_areas()
         }
     }
     PROP_SETA32(RootWindow(ob_display, ob_screen), net_workarea, cardinal,
-               dims, 4 * screen_num_desktops);
+                dims, 4 * screen_num_desktops);
 
     g_free(dims);
 }
@@ -847,7 +887,7 @@ static void set_root_cursor()
 }
 
 #ifdef USE_LIBSN
-static void sn_timeout(void *data)
+static void sn_timeout(ObTimer *t, void *data)
 {
     timer_stop(sn_timer);
     sn_timer = NULL;