X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=4d73eeac4de70a32eb1f57c0e6d39036ce83f725;hb=5d5714f01e1a7140847f6e7f2922d457f6bbe66a;hp=4b91a6dd23f9812700adfe2152a55e4b968c34e1;hpb=b3023ac55b90d63cf8d5b21fb49a124f247f7e34;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index 4b91a6dd..4d73eeac 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -38,7 +38,6 @@
 #include "obt/display.h"
 #include "obt/xqueue.h"
 #include "obt/prop.h"
-#include "obt/mainloop.h"
 
 #include <X11/Xlib.h>
 #ifdef HAVE_UNISTD_H
@@ -71,6 +70,7 @@ Time            screen_desktop_user_time = CurrentTime;
 static Size     screen_physical_size;
 static guint    screen_old_desktop;
 static gboolean screen_desktop_timeout = TRUE;
+static guint    screen_desktop_timer = 0;
 /*! An array of desktops, holding an array of areas per monitor */
 static Rect  *monitor_area = NULL;
 /*! An array of desktops, holding an array of struts */
@@ -80,11 +80,12 @@ static GSList *struts_right = NULL;
 static GSList *struts_bottom = NULL;
 
 static ObPagerPopup *desktop_popup;
+static guint         desktop_popup_timer = 0;
 static gboolean      desktop_popup_perm;
 
 /*! The number of microseconds that you need to be on a desktop before it will
   replace the remembered "last desktop" */
-#define REMEMBER_LAST_DESKTOP_TIME 750000
+#define REMEMBER_LAST_DESKTOP_TIME 750
 
 static gboolean replace_wm(void)
 {
@@ -205,7 +206,7 @@ gboolean screen_annex(void)
                    NET_SUPPORTING_WM_CHECK, WINDOW, screen_support_win);
 
     /* set properties on the supporting window */
-    OBT_PROP_SETS(screen_support_win, NET_WM_NAME, utf8, "Openbox");
+    OBT_PROP_SETS(screen_support_win, NET_WM_NAME, "Openbox");
     OBT_PROP_SET32(screen_support_win, NET_SUPPORTING_WM_CHECK,
                    WINDOW, screen_support_win);
 
@@ -310,7 +311,7 @@ gboolean screen_annex(void)
                     NET_SUPPORTED, ATOM, supported, num_support);
     g_free(supported);
 
-    OBT_PROP_SETS(RootWindow(obt_display, ob_screen), OB_VERSION, utf8,
+    OBT_PROP_SETS(RootWindow(obt_display, ob_screen), OB_VERSION,
                   OPENBOX_VERSION);
 
     screen_tell_ksplash();
@@ -374,7 +375,7 @@ void screen_startup(gboolean reconfig)
     screen_resize();
 
     /* have names already been set for the desktops? */
-    if (OBT_PROP_GETSS(obt_root(ob_screen), NET_DESKTOP_NAMES, utf8, &names)) {
+    if (OBT_PROP_GETSS_UTF8(obt_root(ob_screen), NET_DESKTOP_NAMES, &names)) {
         g_strfreev(names);
         namesexist = TRUE;
     }
@@ -396,7 +397,7 @@ void screen_startup(gboolean reconfig)
 
         /* set the root window property */
         OBT_PROP_SETSS(obt_root(ob_screen),
-                       NET_DESKTOP_NAMES, utf8, (const gchar**)names);
+                       NET_DESKTOP_NAMES, (const gchar*const*)names);
 
         g_strfreev(names);
     }
@@ -601,7 +602,8 @@ static void screen_fallback_focus(void)
 static gboolean last_desktop_func(gpointer data)
 {
     screen_desktop_timeout = TRUE;
-    return FALSE;
+    screen_desktop_timer = 0;
+    return FALSE; /* don't repeat */
 }
 
 void screen_set_desktop(guint num, gboolean dofocus)
@@ -683,9 +685,9 @@ void screen_set_desktop(guint num, gboolean dofocus)
         }
     }
     screen_desktop_timeout = FALSE;
-    obt_main_loop_timeout_remove(ob_main_loop, last_desktop_func);
-    obt_main_loop_timeout_add(ob_main_loop, REMEMBER_LAST_DESKTOP_TIME,
-                              last_desktop_func, NULL, NULL, NULL);
+    if (screen_desktop_timer) g_source_remove(screen_desktop_timer);
+    screen_desktop_timer = g_timeout_add(REMEMBER_LAST_DESKTOP_TIME,
+                                         last_desktop_func, NULL);
 
     ob_debug("Moving to desktop %d", num+1);
 
@@ -937,6 +939,7 @@ static guint translate_row_col(guint r, guint c)
 static gboolean hide_desktop_popup_func(gpointer data)
 {
     pager_popup_hide(desktop_popup);
+    desktop_popup_timer = 0;
     return FALSE; /* don't repeat */
 }
 
@@ -959,21 +962,21 @@ void screen_show_desktop_popup(guint d, gboolean perm)
                           MAX(a->width/3, POPUP_WIDTH));
     pager_popup_show(desktop_popup, screen_desktop_names[d], d);
 
-    obt_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func);
+    if (desktop_popup_timer) g_source_remove(desktop_popup_timer);
+    desktop_popup_timer = 0;
     if (!perm && !desktop_popup_perm)
         /* only hide if its not already being show permanently */
-        obt_main_loop_timeout_add(ob_main_loop,
-                                  config_desktop_popup_time * 1000,
-                                  hide_desktop_popup_func, desktop_popup,
-                                  g_direct_equal, NULL);
+        desktop_popup_timer = g_timeout_add(config_desktop_popup_time,
+                                            hide_desktop_popup_func,
+                                            desktop_popup);
     if (perm)
         desktop_popup_perm = TRUE;
 }
 
 void screen_hide_desktop_popup(void)
 {
-    obt_main_loop_timeout_remove_data(ob_main_loop, hide_desktop_popup_func,
-                                      desktop_popup, FALSE);
+    if (desktop_popup_timer) g_source_remove(desktop_popup_timer);
+    desktop_popup_timer = 0;
     pager_popup_hide(desktop_popup);
     desktop_popup_perm = FALSE;
 }
@@ -1179,7 +1182,7 @@ void screen_update_desktop_names(void)
     screen_desktop_names = NULL;
 
     if (OBT_PROP_GETSS(obt_root(ob_screen),
-                       NET_DESKTOP_NAMES, utf8, &screen_desktop_names))
+                       NET_DESKTOP_NAMES, &screen_desktop_names))
         for (i = 0; screen_desktop_names[i] && i < screen_num_desktops; ++i);
     else
         i = 0;
@@ -1206,7 +1209,7 @@ void screen_update_desktop_names(void)
         /* if we changed any names, then set the root property so we can
            all agree on the names */
         OBT_PROP_SETSS(obt_root(ob_screen), NET_DESKTOP_NAMES,
-                       utf8, (const gchar**)screen_desktop_names);
+                       (const gchar*const*)screen_desktop_names);
     }
 
     /* resize the pager for these names */