Ramove unneeded frame_get_window

diff --git a/engines/default/plugin.c b/engines/default/plugin.c
index a3ffa314141671bcfdd6df45efc84f05d1fe5981..fdf4ddf9dee48e9fa4b0ffd0573e265ccfbb986c 100644 (file)
--- a/engines/default/plugin.c
+++ b/engines/default/plugin.c
@@ -1683,7 +1683,6 @@ ObFrameEngine plugin = {
         frame_update_skin, /* */
         frame_set_hover_flag, /* */
         frame_set_press_flag, /* */
-        frame_get_window,/* */
         frame_get_size, /* */
         frame_get_decorations, /* */
         frame_is_visible, /* */

diff --git a/openbox/client.c b/openbox/client.c
index 0b5f1733f246c62511aeea163bd16cccd3385721..e462c63d130e48be71e345df3ca9f068541b25c2 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -600,7 +600,7 @@ void client_manage(Window window, ObPrompt *prompt)
     g_free(settings);
 
     ob_debug("Managed window 0x%lx plate 0x%x (%s)",
-             window, frame_engine->frame_get_window(self->frame), self->class);
+             window, self->w_frame, self->class);
 }
 
 
@@ -670,7 +670,7 @@ void client_unmanage(ObClient *self)
     gulong ignore_start;
 
     ob_debug("Unmanaging window: 0x%x plate 0x%x (%s) (%s)",
-             self->w_client, frame_engine->frame_get_window(self->frame),
+             self->w_client, self->w_frame,
              self->class, self->title ? self->title : "");
 
     g_assert(self != NULL);

diff --git a/openbox/engine_interface.h b/openbox/engine_interface.h
index ce67be62945462923b9b6dcc8437bcadd506eb33..c7bf39dc8e535f4699b8580a3dc33580cccd3241 100644 (file)
--- a/openbox/engine_interface.h
+++ b/openbox/engine_interface.h
@@ -172,8 +172,6 @@ struct _ObFrameEngine
     void (*frame_set_hover_flag)(gpointer, ObFrameButton);
     void (*frame_set_press_flag)(gpointer, ObFrameButton);
 
-    Window (*frame_get_window)(gpointer);
-
     void (*frame_get_size)(gpointer, Strut *);
     gint (*frame_get_decorations)(gpointer);
 

diff --git a/openbox/event.c b/openbox/event.c
index 00dce00e019c117fa78a6e759d2f33069abb519d..a9f526b2ef75f28d3c134316f47825aed963b537 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1226,7 +1226,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
         break;
     case ReparentNotify:
         /* this is when the client is first taken captive in the frame */
-        if (e->xreparent.parent == frame_engine->frame_get_window(client->frame)) break;
+        if (e->xreparent.parent == client->w_frame) break;
 
         /*
           This event is quite rare and is usually handled in unmapHandler.

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 031000a06416b6fe715ab98da778afe9ab3b0d35..f2903919eeaf6ced7120f2142888a62846068a9b 100644 (file)
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -117,7 +117,7 @@ void mouse_grab_for_client(ObClient *client, gboolean grab)
             guint mask;
 
             if (FRAME_CONTEXT(i, client)) {
-                win = frame_engine->frame_get_window(client->frame);
+                win = client->w_frame;
                 mode = GrabModeAsync;
                 mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
             } else if (CLIENT_CONTEXT(i, client)) {

diff --git a/openbox/window.c b/openbox/window.c
index 136720b3ddac3f406cef0312a9f962fd97646ddc..1e804fe5a83ce8b2fc51355772ad712f8c986ea0 100644 (file)
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -55,7 +55,7 @@ Window window_top(ObWindow *self)
     case OB_WINDOW_CLASS_DOCK:
         return WINDOW_AS_DOCK(self)->frame;
     case OB_WINDOW_CLASS_CLIENT:
-        return frame_engine->frame_get_window(WINDOW_AS_CLIENT(self)->frame);
+        return WINDOW_AS_CLIENT(self)->w_frame;
     case OB_WINDOW_CLASS_INTERNAL:
         return WINDOW_AS_INTERNAL(self)->window;
     case OB_WINDOW_CLASS_PROMPT: