dockapps are ObWindows now.

set the type when creating new dockapps.

diff --git a/openbox/dock.c b/openbox/dock.c
index 6e45850ebe7ca2e01eac4284e04698f8ef9d1ea8..b25c7e49b423313b7e923594f450600a983c78d3 100644 (file)
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -50,6 +50,7 @@ void dock_add(Window win, XWMHints *wmhints)
     XWindowAttributes attrib;
 
     app = g_new0(DockApp, 1);
+    app->obwin.type = Window_DockApp;
     app->win = win;
     app->icon_win = (wmhints->flags & IconWindowHint) ?
         wmhints->icon_window : win;

diff --git a/openbox/dock.h b/openbox/dock.h
index ef7707692e28d4c4debac22f133552d1883a126c..fdfaaf05d249131942d203ecf32caec63fe7eaeb 100644 (file)
--- a/openbox/dock.h
+++ b/openbox/dock.h
@@ -39,6 +39,8 @@ typedef struct Dock {
 } Dock;
 
 typedef struct DockApp {
+    ObWindow obwin;
+
     int ignore_unmaps;
 
     Window icon_win;

diff --git a/openbox/event.c b/openbox/event.c
index 732857e0886486a6b29b60267b88443f773effe7..f55950b527562b7a308fe90e73bfb00de63c19dc 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1007,6 +1007,7 @@ static void event_handle_dockapp(DockApp *app, XEvent *e)
         dock_app_drag(app, &e->xmotion);
         break;
     case UnmapNotify:
+        g_message("Unmap");
        if (app->ignore_unmaps) {
            app->ignore_unmaps--;
            break;
@@ -1014,6 +1015,7 @@ static void event_handle_dockapp(DockApp *app, XEvent *e)
        dock_remove(app, TRUE);
        break;
     case DestroyNotify:
+        g_message("Destroy");
        dock_remove(app, FALSE);
        break;
     case ReparentNotify: