X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=592446a2ff22e193966dfb23bb3eecca0ff018e7;hb=174de91c343dfbdfe866e566393bf4790ae22596;hp=5a9e02ec7be0364955661889242e9fdb06e4e0af;hpb=d206303a9f0742ff330aebe8129d6044ade30a94;p=chaz%2Fopenbox

diff --git a/openbox/dock.c b/openbox/dock.c
index 5a9e02ec..592446a2 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -1,4 +1,24 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   dock.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#include "debug.h"
 #include "dock.h"
+#include "mainloop.h"
 #include "screen.h"
 #include "prop.h"
 #include "config.h"
@@ -12,13 +32,48 @@
 
 static ObDock *dock;
 
-Strut dock_strut;
+StrutPartial dock_strut;
 
-void dock_startup()
+static void dock_app_grab_button(ObDockApp *app, gboolean grab)
+{
+    if (grab) {
+        grab_button_full(config_dock_app_move_button,
+                         config_dock_app_move_modifiers, app->icon_win,
+                         ButtonPressMask | ButtonReleaseMask |
+                         ButtonMotionMask,
+                         GrabModeAsync, OB_CURSOR_MOVE);
+    } else {
+        ungrab_button(config_dock_app_move_button,
+                      config_dock_app_move_modifiers, app->icon_win);
+    }
+}
+
+void dock_startup(gboolean reconfig)
 {
     XSetWindowAttributes attrib;
 
-    STRUT_SET(dock_strut, 0, 0, 0, 0);
+    if (reconfig) {
+        GList *it;
+
+        XSetWindowBorder(ob_display, dock->frame,
+                         RrColorPixel(ob_rr_theme->b_color));
+        XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth);
+
+        RrAppearanceFree(dock->a_frame);
+        dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
+
+        stacking_add(DOCK_AS_WINDOW(dock));
+
+        dock_configure();
+        dock_hide(TRUE);
+
+        for (it = dock->dock_apps; it; it = g_list_next(it))
+            dock_app_grab_button(it->data, TRUE);
+        return;
+    }
+
+    STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
+                      0, 0, 0, 0, 0, 0, 0, 0);
 
     dock = g_new0(ObDock, 1);
     dock->obwin.type = Window_Dock;
@@ -27,22 +82,33 @@ void dock_startup()
 
     attrib.event_mask = DOCK_EVENT_MASK;
     attrib.override_redirect = True;
-    dock->frame = XCreateWindow(ob_display, ob_root, 0, 0, 1, 1, 0,
+    dock->frame = XCreateWindow(ob_display, RootWindow(ob_display, ob_screen),
+                                0, 0, 1, 1, 0,
                                 RrDepth(ob_rr_inst), InputOutput,
                                 RrVisual(ob_rr_inst),
                                 CWOverrideRedirect | CWEventMask,
                                 &attrib);
     dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
-    XSetWindowBorder(ob_display, dock->frame, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, dock->frame,
+                     RrColorPixel(ob_rr_theme->b_color));
     XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth);
 
     g_hash_table_insert(window_map, &dock->frame, dock);
     stacking_add(DOCK_AS_WINDOW(dock));
-    stacking_raise(DOCK_AS_WINDOW(dock));
 }
 
-void dock_shutdown()
+void dock_shutdown(gboolean reconfig)
 {
+    if (reconfig) {
+        GList *it;
+
+        stacking_remove(DOCK_AS_WINDOW(dock));
+
+        for (it = dock->dock_apps; it; it = g_list_next(it))
+            dock_app_grab_button(it->data, FALSE);
+        return;
+    }
+
     XDestroyWindow(ob_display, dock->frame);
     RrAppearanceFree(dock->a_frame);
     g_hash_table_remove(window_map, &dock->frame);
@@ -91,7 +157,7 @@ void dock_add(Window win, XWMHints *wmhints)
       member set the root window, and one set to the client, but both get
       handled and need to be ignored.
     */
-    if (ob_state == OB_STATE_STARTING)
+    if (ob_state() == OB_STATE_STARTING)
 	app->ignore_unmaps += 2;
 
     if (app->win != app->icon_win) {
@@ -107,13 +173,11 @@ void dock_add(Window win, XWMHints *wmhints)
     XChangeSaveSet(ob_display, app->icon_win, SetModeInsert);
     XSelectInput(ob_display, app->icon_win, DOCKAPP_EVENT_MASK);
 
-    grab_button_full(2, 0, app->icon_win,
-                     ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
-                     GrabModeAsync, OB_CURSOR_MOVE);
+    dock_app_grab_button(app, TRUE);
 
     g_hash_table_insert(window_map, &app->icon_win, app);
 
-    g_message("Managed Dock App: 0x%lx (%s)", app->icon_win, app->class);
+    ob_debug("Managed Dock App: 0x%lx (%s)\n", app->icon_win, app->class);
 }
 
 void dock_remove_all()
@@ -124,7 +188,7 @@ void dock_remove_all()
 
 void dock_remove(ObDockApp *app, gboolean reparent)
 {
-    ungrab_button(2, 0, app->icon_win);
+    dock_app_grab_button(app, FALSE);
     XSelectInput(ob_display, app->icon_win, NoEventMask);
     /* remove the window from our save set */
     XChangeSaveSet(ob_display, app->icon_win, SetModeDelete);
@@ -133,12 +197,13 @@ void dock_remove(ObDockApp *app, gboolean reparent)
     g_hash_table_remove(window_map, &app->icon_win);
 
     if (reparent)
-	XReparentWindow(ob_display, app->icon_win, ob_root, app->x, app->y);
+	XReparentWindow(ob_display, app->icon_win,
+                        RootWindow(ob_display, ob_screen), app->x, app->y);
 
     dock->dock_apps = g_list_remove(dock->dock_apps, app);
     dock_configure();
 
-    g_message("Unmanaged Dock App: 0x%lx (%s)", app->icon_win, app->class);
+    ob_debug("Unmanaged Dock App: 0x%lx (%s)\n", app->icon_win, app->class);
 
     g_free(app->name);
     g_free(app->class);
@@ -159,30 +224,36 @@ void dock_configure()
     dock->w = dock->h = 0;
 
     /* get the size */
-    for (it = dock->dock_apps; it; it = it->next) {
+    for (it = dock->dock_apps; it; it = g_list_next(it)) {
         ObDockApp *app = it->data;
-        if (config_dock_horz) {
+        switch (config_dock_orient) {
+        case OB_ORIENTATION_HORZ:
             dock->w += app->w;
             dock->h = MAX(dock->h, app->h);
-        } else {
+            break;
+        case OB_ORIENTATION_VERT:
             dock->w = MAX(dock->w, app->w);
             dock->h += app->h;
+            break;
         }
     }
 
-    spot = (config_dock_horz ? minw : minh) / 2;
+    spot = (config_dock_orient == OB_ORIENTATION_HORZ ? minw : minh) / 2;
 
     /* position the apps */
-    for (it = dock->dock_apps; it; it = it->next) {
+    for (it = dock->dock_apps; it; it = g_list_next(it)) {
         ObDockApp *app = it->data;
-        if (config_dock_horz) {
+        switch (config_dock_orient) {
+        case OB_ORIENTATION_HORZ:
             app->x = spot;
             app->y = (dock->h - app->h) / 2;
             spot += app->w;
-        } else {
+            break;
+        case OB_ORIENTATION_VERT:
             app->x = (dock->w - app->w) / 2;
             app->y = spot;
             spot += app->h;
+            break;
         }
 
         XMoveWindow(ob_display, app->icon_win, app->x, app->y);
@@ -273,19 +344,27 @@ void dock_configure()
         if (!config_dock_floating) {
             switch (config_dock_pos) {
             case OB_DIRECTION_NORTHWEST:
-                if (config_dock_horz)
+                switch (config_dock_orient) {
+                case OB_ORIENTATION_HORZ:
                     dock->y -= dock->h - ob_rr_theme->bwidth;
-                else
+                    break;
+                case OB_ORIENTATION_VERT:
                     dock->x -= dock->w - ob_rr_theme->bwidth;
+                    break;
+                }
                 break;
             case OB_DIRECTION_NORTH:
                 dock->y -= dock->h - ob_rr_theme->bwidth;
                 break;
             case OB_DIRECTION_NORTHEAST:
-                if (config_dock_horz)
+                switch (config_dock_orient) {
+                case OB_ORIENTATION_HORZ:
                     dock->y -= dock->h - ob_rr_theme->bwidth;
-                else
+                    break;
+                case OB_ORIENTATION_VERT:
                     dock->x += dock->w - ob_rr_theme->bwidth;
+                    break;
+                }
                 break;
             case OB_DIRECTION_WEST:
                 dock->x -= dock->w - ob_rr_theme->bwidth;
@@ -294,71 +373,123 @@ void dock_configure()
                 dock->x += dock->w - ob_rr_theme->bwidth;
                 break;
             case OB_DIRECTION_SOUTHWEST:
-                if (config_dock_horz)
+                switch (config_dock_orient) {
+                case OB_ORIENTATION_HORZ:
                     dock->y += dock->h - ob_rr_theme->bwidth;
-                else
+                    break;
+                case OB_ORIENTATION_VERT:
                     dock->x -= dock->w - ob_rr_theme->bwidth;
-                break;
+                    break;
+                } break;
             case OB_DIRECTION_SOUTH:
                 dock->y += dock->h - ob_rr_theme->bwidth;
                 break;
             case OB_DIRECTION_SOUTHEAST:
-                if (config_dock_horz)
+                switch (config_dock_orient) {
+                case OB_ORIENTATION_HORZ:
                     dock->y += dock->h - ob_rr_theme->bwidth;
-                else
+                    break;
+                case OB_ORIENTATION_VERT:
                     dock->x += dock->w - ob_rr_theme->bwidth;
+                    break;
+                }
                 break;
             }    
         }
     }
 
     if (!config_dock_floating && config_dock_hide) {
-        strw = strh = ob_rr_theme->bwidth;
+        strw = ob_rr_theme->bwidth;
+        strh = ob_rr_theme->bwidth;
     } else {
         strw = dock->w;
-        strh =  dock->h;
+        strh = dock->h;
     }
 
     /* set the strut */
-    if (config_dock_floating) {
-        STRUT_SET(dock_strut, 0, 0, 0, 0);
+    if (!dock->dock_apps) {
+        STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
+                          0, 0, 0, 0, 0, 0, 0, 0);
+    } else if (config_dock_floating) {
+        STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
+                          0, 0, 0, 0, 0, 0, 0, 0);
     } else {
         switch (config_dock_pos) {
         case OB_DIRECTION_NORTHWEST:
-            if (config_dock_horz)
-                STRUT_SET(dock_strut, 0, strh, 0, 0);
-            else
-                STRUT_SET(dock_strut, strw, 0, 0, 0);
+            switch (config_dock_orient) {
+            case OB_ORIENTATION_HORZ:
+                STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
+                                  0, 0, dock->x, dock->x + dock->w - 1,
+                                  0, 0, 0, 0);
+                break;
+            case OB_ORIENTATION_VERT:
+                STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
+                                  dock->y, dock->y + dock->h - 1,
+                                  0, 0, 0, 0, 0, 0);
+                break;
+            }
             break;
         case OB_DIRECTION_NORTH:
-            STRUT_SET(dock_strut, 0, strh, 0, 0);
+            STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
+                              dock->x, dock->x + dock->w - 1,
+                              0, 0, 0, 0, 0, 0);
             break;
         case OB_DIRECTION_NORTHEAST:
-            if (config_dock_horz)
-                STRUT_SET(dock_strut, 0, strh, 0, 0);
-            else
-                STRUT_SET(dock_strut, 0, 0, strw, 0);
+            switch (config_dock_orient) {
+            case OB_ORIENTATION_HORZ:
+                STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
+                                  0, 0, dock->x, dock->x + dock->w -1,
+                                  0, 0, 0, 0);
+                break;
+            case OB_ORIENTATION_VERT:
+                STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
+                                  0, 0, 0, 0,
+                                  dock->y, dock->y + dock->h - 1, 0, 0);
+                break;
+            }
             break;
         case OB_DIRECTION_WEST:
-            STRUT_SET(dock_strut, strw, 0, 0, 0);
+            STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
+                              dock->y, dock->y + dock->h - 1,
+                              0, 0, 0, 0, 0, 0);
             break;
         case OB_DIRECTION_EAST:
-            STRUT_SET(dock_strut, 0, 0, strw, 0);
+            STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
+                              0, 0, 0, 0,
+                              dock->y, dock->y + dock->h - 1, 0, 0);
             break;
         case OB_DIRECTION_SOUTHWEST:
-            if (config_dock_horz)
-                STRUT_SET(dock_strut, 0, 0, 0, strh);
-            else
-                STRUT_SET(dock_strut, strw, 0, 0, 0);
+            switch (config_dock_orient) {
+            case OB_ORIENTATION_HORZ:
+                STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
+                                  0, 0, 0, 0, 0, 0,
+                                  dock->x, dock->x + dock->w - 1);
+                break;
+            case OB_ORIENTATION_VERT:
+                STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
+                                  dock->y, dock->y + dock->h - 1,
+                                  0, 0, 0, 0, 0, 0);
+                break;
+            }
             break;
         case OB_DIRECTION_SOUTH:
-            STRUT_SET(dock_strut, 0, 0, 0, strh);
+            STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
+                              0, 0, 0, 0, 0, 0,
+                              dock->x, dock->x + dock->w - 1);
             break;
         case OB_DIRECTION_SOUTHEAST:
-            if (config_dock_horz)
-                STRUT_SET(dock_strut, 0, 0, 0, strh);
-            else
-                STRUT_SET(dock_strut, 0, 0, strw, 0);
+            switch (config_dock_orient) {
+            case OB_ORIENTATION_HORZ:
+                STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
+                                  0, 0, 0, 0, 0, 0,
+                                  dock->x, dock->x + dock->w - 1);
+                break;
+            case OB_ORIENTATION_VERT:
+                STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
+                                  0, 0, 0, 0,
+                                  dock->y, dock->y + dock->h - 1, 0, 0);
+                break;
+            }
             break;
         }
     }
@@ -370,7 +501,10 @@ void dock_configure()
     dock->w -= ob_rr_theme->bwidth * 2;
     dock->h -= ob_rr_theme->bwidth * 2;
 
-    if (dock->w > 0 && dock->h > 0) {
+    if (dock->dock_apps) {
+        g_assert(dock->w > 0);
+        g_assert(dock->h > 0);
+
         XMoveResizeWindow(ob_display, dock->frame,
                           dock->x, dock->y, dock->w, dock->h);
 
@@ -399,6 +533,7 @@ void dock_app_drag(ObDockApp *app, XMotionEvent *e)
     GList *it;
     gint x, y;
     gboolean after;
+    gboolean stop;
 
     x = e->x_root;
     y = e->y_root;
@@ -414,25 +549,35 @@ void dock_app_drag(ObDockApp *app, XMotionEvent *e)
     y -= dock->y;
 
     /* which dock app are we on top of? */
-    for (it = dock->dock_apps; it; it = it->next) {
+    stop = FALSE;
+    for (it = dock->dock_apps; it; it = g_list_next(it)) {
         over = it->data;
-        if (config_dock_horz) {
+        switch (config_dock_orient) {
+        case OB_ORIENTATION_HORZ:
             if (x >= over->x && x < over->x + over->w)
-                break;
-        } else {
+                stop = TRUE;
+            break;
+        case OB_ORIENTATION_VERT:
             if (y >= over->y && y < over->y + over->h)
-                break;
+                stop = TRUE;
+            break;
         }
+        /* dont go to it->next! */
+        if (stop) break;
     }
     if (!it || app == over) return;
 
     x -= over->x;
     y -= over->y;
 
-    if (config_dock_horz)
+    switch (config_dock_orient) {
+    case OB_ORIENTATION_HORZ:
         after = (x > over->w / 2);
-    else
+        break;
+    case OB_ORIENTATION_VERT:
         after = (y > over->h / 2);
+        break;
+    }
 
     /* remove before doing the it->next! */
     dock->dock_apps = g_list_remove(dock->dock_apps, app);
@@ -443,35 +588,26 @@ void dock_app_drag(ObDockApp *app, XMotionEvent *e)
     dock_configure();
 }
 
-static void hide_timeout(void *n)
+static gboolean hide_timeout(gpointer data)
 {
-    /* dont repeat */
-    timer_stop(dock->hide_timer);
-    dock->hide_timer = NULL;
-
     /* hide */
     dock->hidden = TRUE;
     dock_configure();
+
+    return FALSE; /* don't repeat */
 }
 
 void dock_hide(gboolean hide)
 {
-    if (dock->hidden == hide || !config_dock_hide)
-        return;
     if (!hide) {
         /* show */
         dock->hidden = FALSE;
         dock_configure();
 
         /* if was hiding, stop it */
-        if (dock->hide_timer) {
-            timer_stop(dock->hide_timer);
-            dock->hide_timer = NULL;
-        }
-    } else {
-        g_assert(!dock->hide_timer);
-        dock->hide_timer = timer_start(config_dock_hide_timeout * 1000,
-                                       (TimeoutHandler)hide_timeout,
-                                       NULL);
+        ob_main_loop_timeout_remove(ob_main_loop, hide_timeout);
+    } else if (!dock->hidden && config_dock_hide) {
+        ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_delay,
+                                 hide_timeout, NULL, NULL);
     }
 }