save the dock's class/name for future evil purposes!

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 41e174d98e65c7b939d17137ef7d23a0752356f5..6206ccf4ac0288afa4cf0911d1d6d41a6fa723d5 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1,12 +1,10 @@
 #include "client.h"
-#include "grab.h"
 #include "focus.h"
 #include "moveresize.h"
 #include "menu.h"
 #include "prop.h"
 #include "stacking.h"
 #include "frame.h"
-#include "framerender.h"
 #include "screen.h"
 #include "action.h"
 #include "dispatch.h"
@@ -224,14 +222,14 @@ void action_focusraise(union ActionData *data)
 {
     if (data->client.c) {
         client_focus(data->client.c);
-        stacking_raise(data->client.c);
+        stacking_raise(CLIENT_AS_WINDOW(data->client.c));
     }
 }
 
 void action_raise(union ActionData *data)
 {
     if (data->client.c)
-        stacking_raise(data->client.c);
+        stacking_raise(CLIENT_AS_WINDOW(data->client.c));
 }
 
 void action_unshaderaise(union ActionData *data)
@@ -240,7 +238,7 @@ void action_unshaderaise(union ActionData *data)
         if (data->client.c->shaded)
             client_shade(data->client.c, FALSE);
         else
-            stacking_raise(data->client.c);
+            stacking_raise(CLIENT_AS_WINDOW(data->client.c));
     }
 }
 
@@ -248,7 +246,7 @@ void action_shadelower(union ActionData *data)
 {
     if (data->client.c) {
         if (data->client.c->shaded)
-            stacking_lower(data->client.c);
+            stacking_lower(CLIENT_AS_WINDOW(data->client.c));
         else
             client_shade(data->client.c, TRUE);
     }
@@ -257,7 +255,7 @@ void action_shadelower(union ActionData *data)
 void action_lower(union ActionData *data)
 {
     if (data->client.c)
-        stacking_lower(data->client.c);
+        stacking_lower(CLIENT_AS_WINDOW(data->client.c));
 }
 
 void action_close(union ActionData *data)
@@ -683,49 +681,11 @@ void action_showmenu(union ActionData *data)
     }
 }
 
-static void popup_cycle(Client *c, gboolean hide)
-{
-    XSetWindowAttributes attrib;
-    static Window coords = None;
-
-    if (coords == None) {
-        attrib.override_redirect = TRUE;
-        coords = XCreateWindow(ob_display, ob_root,
-                               0, 0, 1, 1, 0, render_depth, InputOutput,
-                               render_visual, CWOverrideRedirect, &attrib);
-        g_assert(coords != None);
-
-        grab_pointer(TRUE, None);
-
-        XMapWindow(ob_display, coords);
-    }
-
-    if (hide) {
-        XDestroyWindow(ob_display, coords);
-        coords = None;
-
-        grab_pointer(FALSE, None);
-    } else {
-        Rect *a;
-        Size s;
-
-        a = screen_area(c->desktop);
-
-        framerender_size_popup_label(c->title, &s);
-        XMoveResizeWindow(ob_display, coords,
-                          a->x + (a->width - s.width) / 2,
-                          a->y + (a->height - s.height) / 2,
-                          s.width, s.height);
-        framerender_popup_label(coords, &s, c->title);
-    }
-}
-
 void action_cycle_windows(union ActionData *data)
 {
     Client *c;
     
     c = focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final,
                     data->cycle.cancel);
-    popup_cycle(c, !c || data->cycle.final || data->cycle.cancel);
 }