but don't count the same enter events more than once still

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 684dd5bb16e44b4ecc59e11d32b91e7ea8474d3b..a72bd7e5543a1269bd080fae2c7c722fbdf2d288 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -153,7 +153,7 @@ static gboolean replace_wm()
     return TRUE;
 }
 
-gboolean screen_annex(const gchar *program_name)
+gboolean screen_annex()
 {
     XSetWindowAttributes attrib;
     pid_t pid;
@@ -190,20 +190,19 @@ gboolean screen_annex(const gchar *program_name)
         return FALSE;
     }
 
-
     screen_set_root_cursor();
 
     /* set the OPENBOX_PID hint */
     pid = getpid();
     PROP_SET32(RootWindow(ob_display, ob_screen),
-               ob_pid, cardinal, pid);
+               openbox_pid, cardinal, pid);
 
     /* set supporting window */
     PROP_SET32(RootWindow(ob_display, ob_screen),
                net_supporting_wm_check, window, screen_support_win);
 
     /* set properties on the supporting window */
-    PROP_SETS(screen_support_win, net_wm_name, program_name);
+    PROP_SETS(screen_support_win, net_wm_name, "Openbox");
     PROP_SET32(screen_support_win, net_supporting_wm_check,
                window, screen_support_win);
 
@@ -289,8 +288,9 @@ gboolean screen_annex(const gchar *program_name)
     supported[i++] = prop_atoms.kde_net_wm_frame_strut;
     supported[i++] = prop_atoms.kde_net_wm_window_type_override;
 
+    supported[i++] = prop_atoms.ob_wm_action_undecorate;
     supported[i++] = prop_atoms.ob_wm_state_undecorated;
-    supported[i++] = prop_atoms.ob_pid;
+    supported[i++] = prop_atoms.openbox_pid;
     supported[i++] = prop_atoms.ob_config;
     supported[i++] = prop_atoms.ob_control;
     g_assert(i == num_support);
@@ -373,7 +373,7 @@ void screen_shutdown(gboolean reconfig)
                  NoEventMask);
 
     /* we're not running here no more! */
-    PROP_ERASE(RootWindow(ob_display, ob_screen), ob_pid);
+    PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_pid);
     /* not without us */
     PROP_ERASE(RootWindow(ob_display, ob_screen), net_supported);
     /* don't keep this mode */
@@ -506,12 +506,12 @@ void screen_set_desktop(guint num, gboolean dofocus)
            to call xsetinputfocus on the window ourselves. otherwise there is
            no guarantee the window will actually take focus.. */
         if (c->can_focus) {
-            /* do this here so that if you switch desktops to a window with
-               helper windows then the helper windows won't flash */
-            client_bring_helper_windows(c);
             /* reduce flicker by hiliting now rather than waiting for the
                server FocusIn event */
             frame_adjust_focus(c->frame, TRUE);
+            /* do this here so that if you switch desktops to a window with
+               helper windows then the helper windows won't flash */
+            client_bring_helper_windows(c);
         }
     }