move_in_progress is back in openbox-core

diff --git a/engines/default/plugin.c b/engines/default/plugin.c
index 27d00044c71df183e5860112911d902634b77dfd..0c21c30798745ed821fc816b2e40cb134dd4c9eb 100644 (file)
--- a/engines/default/plugin.c
+++ b/engines/default/plugin.c
@@ -1582,7 +1582,6 @@ ObFrameEngine engine = {
         load_theme_config, /* */
         /* This fields are fill by openbox. */
         0, /*struct _ObClient *focus_cycle_target; */
-        FALSE, /*gboolean moveresize_in_progress;*/
 };
 
 ObFrameEngine * get_info()

diff --git a/openbox/client.c b/openbox/client.c
index 15c430d78d45c225f9ffa25d29a88381c1cf466b..da38ea6ba40440106e98cb71c6a515b6bf27c6ff 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -474,7 +474,7 @@ void client_manage(Window window, ObPrompt *prompt)
                       self->w_client, map_time, launch_time,
                       event_last_user_time);
 
-        if (menu_frame_visible || frame_engine.moveresize_in_progress) {
+        if (menu_frame_visible || moveresize_in_progress) {
             activate = FALSE;
             raise = TRUE;
             ob_debug_type(OB_DEBUG_FOCUS,

diff --git a/openbox/engine_interface.c b/openbox/engine_interface.c
index 7c1c9e9e798b9ed2c39c5b6745c6fa1b379054ea..83641d470a254bd9c51ed15c2add1fde88444143 100644 (file)
--- a/openbox/engine_interface.c
+++ b/openbox/engine_interface.c
@@ -225,7 +225,7 @@ ObFrameContext frame_context_from_string(const gchar *name)
 ObFrameContext engine_frame_context(ObClient *client, Window win, gint x, gint y)
 {
     /* this part is commun to all engine */
-    if (frame_engine.moveresize_in_progress)
+    if (moveresize_in_progress)
         return OB_FRAME_CONTEXT_MOVE_RESIZE;
     if (win == obt_root(ob_screen))
         return OB_FRAME_CONTEXT_ROOT;

diff --git a/openbox/engine_interface.h b/openbox/engine_interface.h
index 7be7eae5730ab55adcb9b1e08689de0c8cfa6a52..1f1e62ea8988bdcafbb534da59c3f19a573a1c92 100644 (file)
--- a/openbox/engine_interface.h
+++ b/openbox/engine_interface.h
@@ -186,7 +186,7 @@ struct _ObFrameEngine
 
     /* Filled by openbox-core */
     struct _ObClient *focus_cycle_target;
-    gboolean moveresize_in_progress;
+    //gboolean moveresize_in_progress;
 };
 /* Define how to draw the current windows */
 enum _ObStyle

diff --git a/openbox/event.c b/openbox/event.c
index acbf671c3f4bfce93eb8596eb0e867b7cdc87691..074708daa899117fe781afd5cb668115bb9dee9c 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -727,7 +727,7 @@ static void event_process(const XEvent *ec, gpointer data)
              e->type == obt_display_extension_sync_basep + XSyncAlarmNotify)
     {
         XSyncAlarmNotifyEvent *se = (XSyncAlarmNotifyEvent*)e;
-        if (se->alarm == moveresize_alarm && frame_engine.moveresize_in_progress)
+        if (se->alarm == moveresize_alarm && moveresize_in_progress)
             moveresize_event(e);
     }
 #endif
@@ -1879,7 +1879,7 @@ static void event_handle_user_input(ObClient *client, XEvent *e)
     /* if the keyboard interactive action uses the event then dont
        use it for bindings. likewise is moveresize uses the event. */
     if (!actions_interactive_input_event(e) && !moveresize_event(e)) {
-        if (frame_engine.moveresize_in_progress)
+        if (moveresize_in_progress)
             /* make further actions work on the client being
                moved/resized */
             client = moveresize_client;
@@ -1914,7 +1914,7 @@ static gboolean focus_delay_func(gpointer data)
     Time old = event_curtime;
 
     /* don't move focus and kill the menu or the move/resize */
-    if (menu_frame_visible || frame_engine.moveresize_in_progress) return FALSE;
+    if (menu_frame_visible || moveresize_in_progress) return FALSE;
 
     event_curtime = d->time;
     event_curserial = d->serial;
@@ -2002,7 +2002,7 @@ void event_cancel_all_key_grabs(void)
         menu_frame_hide_all();
         ob_debug("KILLED open menus");
     }
-    else if (frame_engine.moveresize_in_progress) {
+    else if (moveresize_in_progress) {
         moveresize_end(TRUE);
         ob_debug("KILLED interactive moveresize");
     }

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index fbf865ae941c34db26dd9b1f8834154ad120d79e..9ffe0c6ef59d80fdd3530af017b22617c27d9456 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -40,7 +40,7 @@
 /* how far windows move and resize with the keyboard arrows */
 #define KEY_DIST 8
 
-//gboolean moveresize_in_progress = FALSE;
+gboolean moveresize_in_progress = FALSE;
 ObClient *moveresize_client = NULL;
 #ifdef SYNC
 XSyncAlarm moveresize_alarm = None;
@@ -85,7 +85,7 @@ void moveresize_startup(gboolean reconfig)
 void moveresize_shutdown(gboolean reconfig)
 {
     if (!reconfig) {
-        if (frame_engine.moveresize_in_progress)
+        if (moveresize_in_progress)
             moveresize_end(FALSE);
         client_remove_destroy_notify(client_dest);
     }
@@ -175,7 +175,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
     gint up = 1;
     gint left = 1;
 
-    if (frame_engine.moveresize_in_progress || !frame_engine.frame_is_visible(c->frame) ||
+    if (moveresize_in_progress || !frame_engine.frame_is_visible(c->frame) ||
         !(mv ?
           (c->functions & OB_CLIENT_FUNC_MOVE) :
           (c->functions & OB_CLIENT_FUNC_RESIZE)))
@@ -253,7 +253,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
     cur_w = start_cw;
     cur_h = start_ch;
 
-    frame_engine.moveresize_in_progress = TRUE;
+    moveresize_in_progress = TRUE;
 
 #ifdef SYNC
     if (config_resize_redraw && !moving && obt_display_extension_sync &&
@@ -331,7 +331,7 @@ void moveresize_end(gboolean cancel)
     /* dont edge warp after its ended */
     cancel_edge_warp();
 
-    frame_engine.moveresize_in_progress = FALSE;
+    moveresize_in_progress = FALSE;
     moveresize_client = NULL;
 }
 
@@ -835,7 +835,7 @@ gboolean moveresize_event(XEvent *e)
 {
     gboolean used = FALSE;
 
-    if (!frame_engine.moveresize_in_progress) return FALSE;
+    if (!moveresize_in_progress) return FALSE;
 
     if (e->type == ButtonPress) {
         if (!button) {

diff --git a/openbox/moveresize.h b/openbox/moveresize.h
index ad222558d6dd52ca01fdad47f9bdf7588a6d4bac..2d0f7dced493644a2804cab6291cfba424ffaf1d 100644 (file)
--- a/openbox/moveresize.h
+++ b/openbox/moveresize.h
@@ -33,7 +33,7 @@ typedef enum {
     OB_RESIZE_POS_FIXED
 } ObResizePopupPos;
 
-//extern gboolean moveresize_in_progress;
+extern gboolean moveresize_in_progress;
 extern struct _ObClient *moveresize_client;
 #ifdef SYNC
 extern XSyncAlarm moveresize_alarm;