Revert "Make edges more likely to eventually do something useful."

This reverts commit 0c2b74a4b69e5e6ddc28b27a67d5e4c9f44156e5.

diff --git a/openbox/edges.c b/openbox/edges.c
index f24094291729896656f24e0f1bd994a0dd5bd49d..d0f38a2fbdb2053f21a1d6d1029cfa42dca9c8ca 100644 (file)
--- a/openbox/edges.c
+++ b/openbox/edges.c
@@ -73,11 +73,9 @@ void edges_startup(gboolean reconfigure)
         edge[i]->obwin.type = OB_WINDOW_CLASS_INTERNAL;
 
         get_position(i, *screen, &r);
-        edge[i]->win = XCreateWindow(obt_display, obt_root(ob_screen),
+        edge[i]->win = XCreateWindow(obt_display, RootWindow(obt_display, ob_screen),
                                      r.x, r.y, r.width, r.height, 0, 0, InputOnly,
                                      CopyFromParent, CWOverrideRedirect, &xswa);
-        XSelectInput(obt_display, edge[i]->win, ButtonPressMask | ButtonReleaseMask
-                     | EnterWindowMask | LeaveWindowMask);
         XMapWindow(obt_display, edge[i]->win);
 
         stacking_add(INTERNAL_AS_WINDOW(edge[i]));

diff --git a/openbox/event.c b/openbox/event.c
index 3b0985e35005de8618015ae561b5078031b25971..8fd5c66d859502d729a225db621546aa8c3fddc5 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -87,7 +87,6 @@ static void event_process(const XEvent *e, gpointer data);
 static void event_handle_root(XEvent *e);
 static gboolean event_handle_menu_input(XEvent *e);
 static void event_handle_menu(ObMenuFrame *frame, XEvent *e);
-static void event_handle_internal(ObInternalWindow *internal, XEvent *e);
 static gboolean event_handle_prompt(ObPrompt *p, XEvent *e);
 static void event_handle_dock(ObDock *s, XEvent *e);
 static void event_handle_dockapp(ObDockApp *app, XEvent *e);
@@ -471,7 +470,6 @@ static void event_process(const XEvent *ec, gpointer data)
     ObWindow *obwin = NULL;
     ObMenuFrame *menu = NULL;
     ObPrompt *prompt = NULL;
-    ObInternalWindow *internal = NULL;
 
     /* make a copy we can mangle */
     ee = *ec;
@@ -494,7 +492,7 @@ static void event_process(const XEvent *ec, gpointer data)
             menu = WINDOW_AS_MENUFRAME(obwin);
             break;
         case OB_WINDOW_CLASS_INTERNAL:
-            internal = WINDOW_AS_INTERNAL(obwin);
+            /* we don't do anything with events directly on these windows */
             break;
         case OB_WINDOW_CLASS_PROMPT:
             prompt = WINDOW_AS_PROMPT(obwin);
@@ -653,8 +651,6 @@ static void event_process(const XEvent *ec, gpointer data)
         event_handle_dock(dock, e);
     else if (menu)
         event_handle_menu(menu, e);
-    else if (internal)
-        event_handle_internal(internal, e);
     else if (window == obt_root(ob_screen))
         event_handle_root(e);
     else if (e->type == MapRequest)
@@ -1896,12 +1892,6 @@ static void event_handle_menu(ObMenuFrame *frame, XEvent *ev)
     }
 }
 
-static void event_handle_internal(ObInternalWindow *internal, XEvent *ev)
-{
-    printf("haha!\n");
-    fflush(stdout);
-}
-
 static void event_handle_user_input(ObClient *client, XEvent *e)
 {
     g_assert(e->type == ButtonPress || e->type == ButtonRelease ||

diff --git a/openbox/frame.c b/openbox/frame.c
index 0f585ab3717d1324d0111f46e7339c6dca88bca4..23d4473cecbb65f7716e497ea54907fac1476a02 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1330,6 +1330,7 @@ ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y)
     if (moveresize_in_progress)
         return OB_FRAME_CONTEXT_MOVE_RESIZE;
 
+#warning figure out how to return the edge context from here
     if (win == obt_root(ob_screen))
         return OB_FRAME_CONTEXT_ROOT ;
     if (client == NULL) return OB_FRAME_CONTEXT_NONE;