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

diff --git a/openbox/dock.c b/openbox/dock.c
index 934d3d03..5a9e02ec 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -10,7 +10,7 @@
                          EnterWindowMask | LeaveWindowMask)
 #define DOCKAPP_EVENT_MASK (StructureNotifyMask)
 
-static Dock *dock;
+static ObDock *dock;
 
 Strut dock_strut;
 
@@ -20,7 +20,7 @@ void dock_startup()
 
     STRUT_SET(dock_strut, 0, 0, 0, 0);
 
-    dock = g_new0(struct Dock, 1);
+    dock = g_new0(ObDock, 1);
     dock->obwin.type = Window_Dock;
 
     dock->hidden = TRUE;
@@ -28,12 +28,13 @@ 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,
-                                render_depth, InputOutput, render_visual,
+                                RrDepth(ob_rr_inst), InputOutput,
+                                RrVisual(ob_rr_inst),
                                 CWOverrideRedirect | CWEventMask,
                                 &attrib);
-    dock->a_frame = appearance_copy(theme_a_unfocused_title);
-    XSetWindowBorder(ob_display, dock->frame, theme_b_color->pixel);
-    XSetWindowBorderWidth(ob_display, dock->frame, theme_bwidth);
+    dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
+    XSetWindowBorder(ob_display, dock->frame, ob_rr_theme->b_color->pixel);
+    XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth);
 
     g_hash_table_insert(window_map, &dock->frame, dock);
     stacking_add(DOCK_AS_WINDOW(dock));
@@ -43,18 +44,18 @@ void dock_startup()
 void dock_shutdown()
 {
     XDestroyWindow(ob_display, dock->frame);
-    appearance_free(dock->a_frame);
+    RrAppearanceFree(dock->a_frame);
     g_hash_table_remove(window_map, &dock->frame);
     stacking_remove(dock);
 }
 
 void dock_add(Window win, XWMHints *wmhints)
 {
-    DockApp *app;
+    ObDockApp *app;
     XWindowAttributes attrib;
-    char **data;
+    gchar **data;
 
-    app = g_new0(DockApp, 1);
+    app = g_new0(ObDockApp, 1);
     app->obwin.type = Window_DockApp;
     app->win = win;
     app->icon_win = (wmhints->flags & IconWindowHint) ?
@@ -90,7 +91,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 == State_Starting)
+    if (ob_state == OB_STATE_STARTING)
 	app->ignore_unmaps += 2;
 
     if (app->win != app->icon_win) {
@@ -108,7 +109,7 @@ void dock_add(Window win, XWMHints *wmhints)
 
     grab_button_full(2, 0, app->icon_win,
                      ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
-                     GrabModeAsync, ob_cursors.move);
+                     GrabModeAsync, OB_CURSOR_MOVE);
 
     g_hash_table_insert(window_map, &app->icon_win, app);
 
@@ -121,7 +122,7 @@ void dock_remove_all()
         dock_remove(dock->dock_apps->data, TRUE);
 }
 
-void dock_remove(DockApp *app, gboolean reparent)
+void dock_remove(ObDockApp *app, gboolean reparent)
 {
     ungrab_button(2, 0, app->icon_win);
     XSelectInput(ob_display, app->icon_win, NoEventMask);
@@ -147,14 +148,19 @@ void dock_remove(DockApp *app, gboolean reparent)
 void dock_configure()
 {
     GList *it;
-    int spot;
-    int gravity;
+    gint spot;
+    gint gravity;
+    gint minw, minh;
+    gint strw, strh;
+    Rect *a;
 
-    dock->w = dock->h = spot = 0;
+    RrMinsize(dock->a_frame, &minw, &minh);
+
+    dock->w = dock->h = 0;
 
     /* get the size */
     for (it = dock->dock_apps; it; it = it->next) {
-        struct DockApp *app = it->data;
+        ObDockApp *app = it->data;
         if (config_dock_horz) {
             dock->w += app->w;
             dock->h = MAX(dock->h, app->h);
@@ -164,9 +170,11 @@ void dock_configure()
         }
     }
 
+    spot = (config_dock_horz ? minw : minh) / 2;
+
     /* position the apps */
     for (it = dock->dock_apps; it; it = it->next) {
-        struct DockApp *app = it->data;
+        ObDockApp *app = it->data;
         if (config_dock_horz) {
             app->x = spot;
             app->y = (dock->h - app->h) / 2;
@@ -181,56 +189,59 @@ void dock_configure()
     }
 
     /* used for calculating offsets */
-    dock->w += theme_bwidth * 2;
-    dock->h += theme_bwidth * 2;
+    dock->w += ob_rr_theme->bwidth * 2;
+    dock->h += ob_rr_theme->bwidth * 2;
+
+    a = screen_physical_area();
 
     /* calculate position */
-    switch (config_dock_pos) {
-    case DockPos_Floating:
+    if (config_dock_floating) {
         dock->x = config_dock_x;
         dock->y = config_dock_y;
         gravity = NorthWestGravity;
-        break;
-    case DockPos_TopLeft:
-        dock->x = 0;
-        dock->y = 0;
-        gravity = NorthWestGravity;
-        break;
-    case DockPos_Top:
-        dock->x = screen_physical_size.width / 2;
-        dock->y = 0;
-        gravity = NorthGravity;
-        break;
-    case DockPos_TopRight:
-        dock->x = screen_physical_size.width;
-        dock->y = 0;
-        gravity = NorthEastGravity;
-        break;
-    case DockPos_Left:
-        dock->x = 0;
-        dock->y = screen_physical_size.height / 2;
-        gravity = WestGravity;
-        break;
-    case DockPos_Right:
-        dock->x = screen_physical_size.width;
-        dock->y = screen_physical_size.height / 2;
-        gravity = EastGravity;
-        break;
-    case DockPos_BottomLeft:
-        dock->x = 0;
-        dock->y = screen_physical_size.height;
-        gravity = SouthWestGravity;
-        break;
-    case DockPos_Bottom:
-        dock->x = screen_physical_size.width / 2;
-        dock->y = screen_physical_size.height;
-        gravity = SouthGravity;
-        break;
-    case DockPos_BottomRight:
-        dock->x = screen_physical_size.width;
-        dock->y = screen_physical_size.height;
-        gravity = SouthEastGravity;
-        break;
+    } else {
+        switch (config_dock_pos) {
+        case OB_DIRECTION_NORTHWEST:
+            dock->x = 0;
+            dock->y = 0;
+            gravity = NorthWestGravity;
+            break;
+        case OB_DIRECTION_NORTH:
+            dock->x = a->width / 2;
+            dock->y = 0;
+            gravity = NorthGravity;
+            break;
+        case OB_DIRECTION_NORTHEAST:
+            dock->x = a->width;
+            dock->y = 0;
+            gravity = NorthEastGravity;
+            break;
+        case OB_DIRECTION_WEST:
+            dock->x = 0;
+            dock->y = a->height / 2;
+            gravity = WestGravity;
+            break;
+        case OB_DIRECTION_EAST:
+            dock->x = a->width;
+            dock->y = a->height / 2;
+            gravity = EastGravity;
+            break;
+        case OB_DIRECTION_SOUTHWEST:
+            dock->x = 0;
+            dock->y = a->height;
+            gravity = SouthWestGravity;
+            break;
+        case OB_DIRECTION_SOUTH:
+            dock->x = a->width / 2;
+            dock->y = a->height;
+            gravity = SouthGravity;
+            break;
+        case OB_DIRECTION_SOUTHEAST:
+            dock->x = a->width;
+            dock->y = a->height;
+            gravity = SouthEastGravity;
+            break;
+        }
     }
 
     switch(gravity) {
@@ -259,124 +270,134 @@ void dock_configure()
     }
 
     if (config_dock_hide && dock->hidden) {
+        if (!config_dock_floating) {
+            switch (config_dock_pos) {
+            case OB_DIRECTION_NORTHWEST:
+                if (config_dock_horz)
+                    dock->y -= dock->h - ob_rr_theme->bwidth;
+                else
+                    dock->x -= dock->w - ob_rr_theme->bwidth;
+                break;
+            case OB_DIRECTION_NORTH:
+                dock->y -= dock->h - ob_rr_theme->bwidth;
+                break;
+            case OB_DIRECTION_NORTHEAST:
+                if (config_dock_horz)
+                    dock->y -= dock->h - ob_rr_theme->bwidth;
+                else
+                    dock->x += dock->w - ob_rr_theme->bwidth;
+                break;
+            case OB_DIRECTION_WEST:
+                dock->x -= dock->w - ob_rr_theme->bwidth;
+                break;
+            case OB_DIRECTION_EAST:
+                dock->x += dock->w - ob_rr_theme->bwidth;
+                break;
+            case OB_DIRECTION_SOUTHWEST:
+                if (config_dock_horz)
+                    dock->y += dock->h - ob_rr_theme->bwidth;
+                else
+                    dock->x -= dock->w - ob_rr_theme->bwidth;
+                break;
+            case OB_DIRECTION_SOUTH:
+                dock->y += dock->h - ob_rr_theme->bwidth;
+                break;
+            case OB_DIRECTION_SOUTHEAST:
+                if (config_dock_horz)
+                    dock->y += dock->h - ob_rr_theme->bwidth;
+                else
+                    dock->x += dock->w - ob_rr_theme->bwidth;
+                break;
+            }    
+        }
+    }
+
+    if (!config_dock_floating && config_dock_hide) {
+        strw = strh = ob_rr_theme->bwidth;
+    } else {
+        strw = dock->w;
+        strh =  dock->h;
+    }
+
+    /* set the strut */
+    if (config_dock_floating) {
+        STRUT_SET(dock_strut, 0, 0, 0, 0);
+    } else {
         switch (config_dock_pos) {
-        case DockPos_Floating:
-            break;
-        case DockPos_TopLeft:
+        case OB_DIRECTION_NORTHWEST:
             if (config_dock_horz)
-                dock->y -= dock->h - theme_bwidth;
+                STRUT_SET(dock_strut, 0, strh, 0, 0);
             else
-                dock->x -= dock->w - theme_bwidth;
+                STRUT_SET(dock_strut, strw, 0, 0, 0);
             break;
-        case DockPos_Top:
-            dock->y -= dock->h - theme_bwidth;
+        case OB_DIRECTION_NORTH:
+            STRUT_SET(dock_strut, 0, strh, 0, 0);
             break;
-        case DockPos_TopRight:
+        case OB_DIRECTION_NORTHEAST:
             if (config_dock_horz)
-                dock->y -= dock->h - theme_bwidth;
+                STRUT_SET(dock_strut, 0, strh, 0, 0);
             else
-                dock->x += dock->w - theme_bwidth;
+                STRUT_SET(dock_strut, 0, 0, strw, 0);
             break;
-        case DockPos_Left:
-            dock->x -= dock->w - theme_bwidth;
+        case OB_DIRECTION_WEST:
+            STRUT_SET(dock_strut, strw, 0, 0, 0);
             break;
-        case DockPos_Right:
-            dock->x += dock->w - theme_bwidth;
+        case OB_DIRECTION_EAST:
+            STRUT_SET(dock_strut, 0, 0, strw, 0);
             break;
-        case DockPos_BottomLeft:
+        case OB_DIRECTION_SOUTHWEST:
             if (config_dock_horz)
-                dock->y += dock->h - theme_bwidth;
+                STRUT_SET(dock_strut, 0, 0, 0, strh);
             else
-                dock->x -= dock->w - theme_bwidth;
+                STRUT_SET(dock_strut, strw, 0, 0, 0);
             break;
-        case DockPos_Bottom:
-            dock->y += dock->h - theme_bwidth;
+        case OB_DIRECTION_SOUTH:
+            STRUT_SET(dock_strut, 0, 0, 0, strh);
             break;
-        case DockPos_BottomRight:
+        case OB_DIRECTION_SOUTHEAST:
             if (config_dock_horz)
-                dock->y += dock->h - theme_bwidth;
+                STRUT_SET(dock_strut, 0, 0, 0, strh);
             else
-                dock->x += dock->w - theme_bwidth;
+                STRUT_SET(dock_strut, 0, 0, strw, 0);
             break;
-        }    
+        }
     }
 
-    /* set the strut */
-    switch (config_dock_pos) {
-    case DockPos_Floating:
-        STRUT_SET(dock_strut, 0, 0, 0, 0);
-        break;
-    case DockPos_TopLeft:
-        if (config_dock_horz)
-            STRUT_SET(dock_strut, 0, dock->h, 0, 0);
-        else
-            STRUT_SET(dock_strut, dock->w, 0, 0, 0);
-        break;
-    case DockPos_Top:
-        STRUT_SET(dock_strut, 0, dock->h, 0, 0);
-        break;
-    case DockPos_TopRight:
-        if (config_dock_horz)
-            STRUT_SET(dock_strut, 0, dock->h, 0, 0);
-        else
-            STRUT_SET(dock_strut, 0, 0, dock->w, 0);
-        break;
-    case DockPos_Left:
-        STRUT_SET(dock_strut, dock->w, 0, 0, 0);
-        break;
-    case DockPos_Right:
-        STRUT_SET(dock_strut, 0, 0, dock->w, 0);
-        break;
-    case DockPos_BottomLeft:
-        if (config_dock_horz)
-            STRUT_SET(dock_strut, 0, 0, 0, dock->h);
-        else
-            STRUT_SET(dock_strut, dock->w, 0, 0, 0);
-        break;
-    case DockPos_Bottom:
-        STRUT_SET(dock_strut, 0, 0, 0, dock->h);
-        break;
-    case DockPos_BottomRight:
-        if (config_dock_horz)
-            STRUT_SET(dock_strut, 0, 0, 0, dock->h);
-        else
-            STRUT_SET(dock_strut, 0, 0, dock->w, 0);
-        break;
-    }
+    dock->w += minw;
+    dock->h += minh;
 
     /* not used for actually sizing shit */
-    dock->w -= theme_bwidth * 2;
-    dock->h -= theme_bwidth * 2;
+    dock->w -= ob_rr_theme->bwidth * 2;
+    dock->h -= ob_rr_theme->bwidth * 2;
 
     if (dock->w > 0 && dock->h > 0) {
-        RECT_SET(dock->a_frame->area, 0, 0, dock->w, dock->h);
         XMoveResizeWindow(ob_display, dock->frame,
                           dock->x, dock->y, dock->w, dock->h);
 
-        paint(dock->frame, dock->a_frame);
+        RrPaint(dock->a_frame, dock->frame, dock->w, dock->h);
         XMapWindow(ob_display, dock->frame);
     } else
         XUnmapWindow(ob_display, dock->frame);
 
     /* but they are useful outside of this function! */
-    dock->w += theme_bwidth * 2;
-    dock->h += theme_bwidth * 2;
+    dock->w += ob_rr_theme->bwidth * 2;
+    dock->h += ob_rr_theme->bwidth * 2;
 
-    screen_update_struts();
+    screen_update_areas();
 }
 
-void dock_app_configure(DockApp *app, int w, int h)
+void dock_app_configure(ObDockApp *app, gint w, gint h)
 {
     app->w = w;
     app->h = h;
     dock_configure();
 }
 
-void dock_app_drag(DockApp *app, XMotionEvent *e)
+void dock_app_drag(ObDockApp *app, XMotionEvent *e)
 {
-    DockApp *over = NULL;
+    ObDockApp *over = NULL;
     GList *it;
-    int x, y;
+    gint x, y;
     gboolean after;
 
     x = e->x_root;