EnterWindowMask | LeaveWindowMask)
#define DOCKAPP_EVENT_MASK (StructureNotifyMask)
-static Dock *dock;
+static ObDock *dock;
Strut dock_strut;
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;
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);
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) ?
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) {
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);
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);
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;
- if (config_dock_horz) {
+ ObDockApp *app = it->data;
+ 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_orient == OB_ORIENTATION_HORZ ? minw : minh) / 2;
+
/* position the apps */
for (it = dock->dock_apps; it; it = it->next) {
- struct DockApp *app = it->data;
- if (config_dock_horz) {
+ ObDockApp *app = it->data;
+ 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);
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) {
}
if (config_dock_hide && dock->hidden) {
- switch (config_dock_pos) {
- case DockPos_Floating:
- break;
- case DockPos_TopLeft:
- if (config_dock_horz)
+ if (!config_dock_floating) {
+ switch (config_dock_pos) {
+ case OB_DIRECTION_NORTHWEST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ dock->y -= dock->h - ob_rr_theme->bwidth;
+ 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;
- else
+ break;
+ case OB_DIRECTION_NORTHEAST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ dock->y -= dock->h - ob_rr_theme->bwidth;
+ 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;
+ break;
+ case OB_DIRECTION_EAST:
+ dock->x += dock->w - ob_rr_theme->bwidth;
+ break;
+ case OB_DIRECTION_SOUTHWEST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ dock->y += dock->h - ob_rr_theme->bwidth;
+ break;
+ case OB_ORIENTATION_VERT:
+ dock->x -= dock->w - ob_rr_theme->bwidth;
+ break;
+ } break;
+ case OB_DIRECTION_SOUTH:
+ dock->y += dock->h - ob_rr_theme->bwidth;
+ break;
+ case OB_DIRECTION_SOUTHEAST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ dock->y += dock->h - ob_rr_theme->bwidth;
+ 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;
+ } 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 OB_DIRECTION_NORTHWEST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ STRUT_SET(dock_strut, 0, strh, 0, 0);
+ break;
+ case OB_ORIENTATION_VERT:
+ STRUT_SET(dock_strut, strw, 0, 0, 0);
+ break;
+ }
break;
- case DockPos_Top:
- dock->y -= dock->h - ob_rr_theme->bwidth;
+ case OB_DIRECTION_NORTH:
+ STRUT_SET(dock_strut, 0, strh, 0, 0);
break;
- case DockPos_TopRight:
- if (config_dock_horz)
- dock->y -= dock->h - ob_rr_theme->bwidth;
- else
- dock->x += dock->w - ob_rr_theme->bwidth;
+ case OB_DIRECTION_NORTHEAST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ STRUT_SET(dock_strut, 0, strh, 0, 0);
+ break;
+ case OB_ORIENTATION_VERT:
+ STRUT_SET(dock_strut, 0, 0, strw, 0);
+ break;
+ }
break;
- case DockPos_Left:
- dock->x -= dock->w - ob_rr_theme->bwidth;
+ case OB_DIRECTION_WEST:
+ STRUT_SET(dock_strut, strw, 0, 0, 0);
break;
- case DockPos_Right:
- dock->x += dock->w - ob_rr_theme->bwidth;
+ case OB_DIRECTION_EAST:
+ STRUT_SET(dock_strut, 0, 0, strw, 0);
break;
- case DockPos_BottomLeft:
- if (config_dock_horz)
- dock->y += dock->h - ob_rr_theme->bwidth;
- else
- dock->x -= dock->w - ob_rr_theme->bwidth;
+ case OB_DIRECTION_SOUTHWEST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ STRUT_SET(dock_strut, 0, 0, 0, strh);
+ break;
+ case OB_ORIENTATION_VERT:
+ STRUT_SET(dock_strut, strw, 0, 0, 0);
+ break;
+ }
break;
- case DockPos_Bottom:
- dock->y += dock->h - ob_rr_theme->bwidth;
+ case OB_DIRECTION_SOUTH:
+ STRUT_SET(dock_strut, 0, 0, 0, strh);
break;
- case DockPos_BottomRight:
- if (config_dock_horz)
- dock->y += dock->h - ob_rr_theme->bwidth;
- else
- dock->x += dock->w - ob_rr_theme->bwidth;
+ case OB_DIRECTION_SOUTHEAST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ STRUT_SET(dock_strut, 0, 0, 0, strh);
+ break;
+ case OB_ORIENTATION_VERT:
+ STRUT_SET(dock_strut, 0, 0, strw, 0);
+ break;
+ }
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 -= ob_rr_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;
+ gboolean stop;
x = e->x_root;
y = e->y_root;
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 && !stop; it = it->next) {
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;
}
}
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);
} else {
g_assert(!dock->hide_timer);
dock->hide_timer = timer_start(config_dock_hide_timeout * 1000,
- (TimeoutHandler)hide_timeout,
+ (ObTimeoutHandler)hide_timeout,
NULL);
}
}
projects / chaz / openbox / blobdiff