commit d9d580e0382 broke kdesktop again, so we have to fix it at an even finer level...

diff --git a/openbox/actions.c b/openbox/actions.c
index 6068f19..11581af 100644 (file)
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -36,7 +36,6 @@ static ObActionsAct* actions_build_act_from_string(const gchar *name);
 
 static ObActionsAct *interactive_act = NULL;
 static guint         interactive_initial_state = 0;
 
 static ObActionsAct *interactive_act = NULL;
 static guint         interactive_initial_state = 0;

-static gboolean      replay_pointer = FALSE;

 
 struct _ObActionsDefinition {
     guint ref;
 
 struct _ObActionsDefinition {
     guint ref;


@@ -222,16 +221,6 @@ static void actions_setup_data(ObActionsData *data,
     data->client = client;
 }
 
     data->client = client;
 }
 

-void actions_set_need_pointer_replay_before_move(gboolean replay)
-{
-    replay_pointer = replay;
-}
-
-gboolean actions_get_need_pointer_replay_before_move()
-{
-    return replay_pointer;
-}
-

 void actions_run_acts(GSList *acts,
                       ObUserAction uact,
                       guint state,
 void actions_run_acts(GSList *acts,
                       ObUserAction uact,
                       guint state,


@@ -344,14 +333,8 @@ gboolean actions_interactive_input_event(XEvent *e)
 void actions_client_move(ObActionsData *data, gboolean start)
 {
     static gulong ignore_start = 0;
 void actions_client_move(ObActionsData *data, gboolean start)
 {
     static gulong ignore_start = 0;

-    if (start) {
+    if (start)

         ignore_start = event_start_ignore_all_enters();
         ignore_start = event_start_ignore_all_enters();

-        if (replay_pointer) {
-            /* replay the pointer event before any windows move */
-            XAllowEvents(obt_display, ReplayPointer, event_curtime);
-            replay_pointer = FALSE;
-        }
-    }

     else if (config_focus_follow &&
              data->context != OB_FRAME_CONTEXT_CLIENT)
     {
     else if (config_focus_follow &&
              data->context != OB_FRAME_CONTEXT_CLIENT)
     {

diff --git a/openbox/client.c b/openbox/client.c
index a54feb8..dd1f5e7 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2510,6 +2510,10 @@ gboolean client_show(ObClient *self)
     gboolean show = FALSE;
 
     if (client_should_show(self)) {
     gboolean show = FALSE;
 
     if (client_should_show(self)) {

+        /* replay pending pointer event before showing the window, in case it
+           should be going to something under the window */
+        mouse_replay_pointer();
+

         frame_show(self->frame);
         show = TRUE;
 
         frame_show(self->frame);
         show = TRUE;
 


@@ -2551,6 +2555,10 @@ gboolean client_hide(ObClient *self)
            so trying to ignore them is futile in case 3 anyways
         */
 
            so trying to ignore them is futile in case 3 anyways
         */
 

+        /* replay pending pointer event before hiding the window, in case it
+           should be going to the window */
+        mouse_replay_pointer();
+

         frame_hide(self->frame);
         hide = TRUE;
 
         frame_hide(self->frame);
         hide = TRUE;
 


@@ -2966,6 +2974,10 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
         if (!user)
             ignore_start = event_start_ignore_all_enters();
 
         if (!user)
             ignore_start = event_start_ignore_all_enters();
 

+        /* replay pending pointer event before move the window, in case it
+           would change what window gets the event */
+        mouse_replay_pointer();
+

         frame_adjust_area(self->frame, fmoved, fresized, FALSE);
 
         if (!user)
         frame_adjust_area(self->frame, fmoved, fresized, FALSE);
 
         if (!user)

diff --git a/openbox/mouse.c b/openbox/mouse.c
index b2893ce..071a23b 100644 (file)
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -45,6 +45,9 @@ typedef struct {
 
 /* Array of GSList*s of ObMouseBinding*s. */
 static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS];
 
 /* Array of GSList*s of ObMouseBinding*s. */
 static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS];

+/* TRUE when we have a grab on the pointer and need to reply the pointer event
+   to send it to other applications */
+static gboolean replay_pointer_needed;

 
 ObFrameContext mouse_button_frame_context(ObFrameContext context,
                                           guint button,
 
 ObFrameContext mouse_button_frame_context(ObFrameContext context,
                                           guint button,


@@ -199,6 +202,15 @@ static gboolean fire_binding(ObMouseAction a, ObFrameContext context,
     return TRUE;
 }
 
     return TRUE;
 }
 

+void mouse_replay_pointer()
+{
+    if (replay_pointer_needed) {
+        /* replay the pointer event before any windows move */
+        XAllowEvents(obt_display, ReplayPointer, event_curtime);
+        replay_pointer_needed = FALSE;
+    }
+}
+

 void mouse_event(ObClient *client, XEvent *e)
 {
     static Time ltime;
 void mouse_event(ObClient *client, XEvent *e)
 {
     static Time ltime;


@@ -228,12 +240,17 @@ void mouse_event(ObClient *client, XEvent *e)
            XAllowEvents with ReplayPointer at some point, to send the event
            through to the client.  when this happens though depends.  if
            windows are going to be moved on screen, then the click will end
            XAllowEvents with ReplayPointer at some point, to send the event
            through to the client.  when this happens though depends.  if
            windows are going to be moved on screen, then the click will end

-           up going somewhere wrong, so have the action system perform the
-           ReplayPointer for us if that is the case. */
+           up going somewhere wrong, set that we need it, and if nothing
+           else causes the replay pointer to be run, then we will do it
+           after all the actions are finished.
+
+           (We do it after all the actions because FocusIn interrupts
+           dragging for kdesktop, so if we send the button event now, and
+           then they get a focus event after, it breaks.  Instead, wait to send
+           the button press until after the actions when possible.)
+        */

         if (CLIENT_CONTEXT(context, client))
         if (CLIENT_CONTEXT(context, client))

-            actions_set_need_pointer_replay_before_move(TRUE);
-        else
-            actions_set_need_pointer_replay_before_move(FALSE);
+            replay_pointer_needed = TRUE;

 
         fire_binding(OB_MOUSE_ACTION_PRESS, context,
                      client, e->xbutton.state,
 
         fire_binding(OB_MOUSE_ACTION_PRESS, context,
                      client, e->xbutton.state,


@@ -247,8 +264,7 @@ void mouse_event(ObClient *client, XEvent *e)
 
         /* replay the pointer event if it hasn't been replayed yet (i.e. no
            windows were moved) */
 
         /* replay the pointer event if it hasn't been replayed yet (i.e. no
            windows were moved) */

-        if (actions_get_need_pointer_replay_before_move())
-            XAllowEvents(obt_display, ReplayPointer, event_curtime);
+        mouse_replay_pointer();

 
         /* in the client context, we won't get a button release because of the
            way it is grabbed, so just fake one */
 
         /* in the client context, we won't get a button release because of the
            way it is grabbed, so just fake one */

diff --git a/openbox/mouse.h b/openbox/mouse.h
index 44d563a..a862fe5 100644 (file)
--- a/openbox/mouse.h
+++ b/openbox/mouse.h
@@ -40,4 +40,9 @@ void mouse_grab_for_client(struct _ObClient *client, gboolean grab);
 ObFrameContext mouse_button_frame_context(ObFrameContext context,
                                           guint button, guint state);
 
 ObFrameContext mouse_button_frame_context(ObFrameContext context,
                                           guint button, guint state);
 

+/*! If a replay pointer is needed, then do it.  Call this when windows are
+  going to be moving/appearing/disappearing, so that you know the mouse click
+  will go to the right window */
+void mouse_replay_pointer();
+

 #endif
 #endif