screen_physical_size.height = geometry[1] = h;
PROP_SETA32(ob_root, net_desktop_geometry, cardinal, geometry, 2);
- if (ob_state == State_Starting)
+ if (ob_state == OB_STATE_STARTING)
return;
dock_configure();
/* move windows on desktops that will no longer exist! */
for (it = client_list; it != NULL; it = it->next) {
- Client *c = it->data;
+ ObClient *c = it->data;
if (c->desktop >= num && c->desktop != DESKTOP_ALL)
client_set_desktop(c, num - 1, FALSE);
}
/* show windows from top to bottom */
for (it = stacking_list; it != NULL; it = it->next) {
if (WINDOW_IS_CLIENT(it->data)) {
- Client *c = it->data;
+ ObClient *c = it->data;
if (!c->frame->visible && client_should_show(c))
frame_show(c->frame);
}
/* hide windows from bottom to top */
for (it = g_list_last(stacking_list); it != NULL; it = it->prev) {
if (WINDOW_IS_CLIENT(it->data)) {
- Client *c = it->data;
+ ObClient *c = it->data;
if (c->frame->visible && !client_should_show(c))
frame_hide(c->frame);
}
/* focus the last focused window on the desktop, and ignore enter events
from the switch so it doesnt mess with the focus */
while (XCheckTypedEvent(ob_display, EnterNotify, &e));
+#ifdef DEBUG_FOCUS
g_message("switch fallback");
- focus_fallback(Fallback_Desktop);
+#endif
+ focus_fallback(OB_FOCUS_FALLBACK_DESKTOP);
+#ifdef DEBUG_FOCUS
g_message("/switch fallback");
+#endif
dispatch_ob(Event_Ob_Desktop, num, old);
}
void screen_update_layout()
{
- guint32 *data = NULL;
+ ObOrientation orient;
+ ObCorner corner;
+ guint rows;
+ guint cols;
+ guint32 *data;
guint num;
-
- /* defaults */
- screen_desktop_layout.orientation = prop_atoms.net_wm_orientation_horz;
- screen_desktop_layout.start_corner = prop_atoms.net_wm_topleft;
- screen_desktop_layout.rows = 1;
- screen_desktop_layout.columns = screen_num_desktops;
+ gboolean valid = FALSE;
if (PROP_GETA32(ob_root, net_desktop_layout, cardinal, &data, &num)) {
if (num == 3 || num == 4) {
+
if (data[0] == prop_atoms.net_wm_orientation_vert)
- screen_desktop_layout.orientation = data[0];
- if (num == 3)
- screen_desktop_layout.start_corner =
- prop_atoms.net_wm_topright;
+ orient = OB_ORIENTATION_VERT;
+ else if (data[0] == prop_atoms.net_wm_orientation_horz)
+ orient = OB_ORIENTATION_HORZ;
+ else
+ goto screen_update_layout_bail;
+
+ if (num < 4)
+ corner = OB_CORNER_TOPLEFT;
else {
if (data[3] == prop_atoms.net_wm_topright)
- screen_desktop_layout.start_corner = data[3];
+ corner = OB_CORNER_TOPRIGHT;
else if (data[3] == prop_atoms.net_wm_bottomright)
- screen_desktop_layout.start_corner = data[3];
+ corner = OB_CORNER_BOTTOMRIGHT;
else if (data[3] == prop_atoms.net_wm_bottomleft)
- screen_desktop_layout.start_corner = data[3];
+ corner = OB_CORNER_BOTTOMLEFT;
+ else
+ goto screen_update_layout_bail;
}
/* fill in a zero rows/columns */
- if (!(data[1] == 0 && data[2] == 0)) { /* both 0's is bad data.. */
+ if ((data[1] == 0 && data[2] == 0) || /* both 0's is bad data.. */
+ (data[1] != 0 && data[2] != 0)) { /* no 0's is bad data.. */
+ goto screen_update_layout_bail;
+ } else {
if (data[1] == 0) {
data[1] = (screen_num_desktops +
screen_num_desktops % data[2]) / data[2];
data[2] = (screen_num_desktops +
screen_num_desktops % data[1]) / data[1];
}
- screen_desktop_layout.columns = data[1];
- screen_desktop_layout.rows = data[2];
+ cols = data[1];
+ rows = data[2];
}
/* bounds checking */
- if (screen_desktop_layout.orientation ==
- prop_atoms.net_wm_orientation_horz) {
- if (screen_desktop_layout.rows > screen_num_desktops)
- screen_desktop_layout.rows = screen_num_desktops;
- if (screen_desktop_layout.columns >
- ((screen_num_desktops + screen_num_desktops %
- screen_desktop_layout.rows) /
- screen_desktop_layout.rows))
- screen_desktop_layout.columns =
- (screen_num_desktops + screen_num_desktops %
- screen_desktop_layout.rows) /
- screen_desktop_layout.rows;
+ if (orient == OB_ORIENTATION_HORZ) {
+ rows = MIN(rows, screen_num_desktops);
+ cols = MIN(cols, ((screen_num_desktops +
+ (screen_num_desktops % rows)) / rows));
} else {
- if (screen_desktop_layout.columns > screen_num_desktops)
- screen_desktop_layout.columns = screen_num_desktops;
- if (screen_desktop_layout.rows >
- ((screen_num_desktops + screen_num_desktops %
- screen_desktop_layout.columns) /
- screen_desktop_layout.columns))
- screen_desktop_layout.rows =
- (screen_num_desktops + screen_num_desktops %
- screen_desktop_layout.columns) /
- screen_desktop_layout.columns;
+ cols = MIN(cols, screen_num_desktops);
+ rows = MIN(rows, ((screen_num_desktops +
+ (screen_num_desktops % cols)) / cols));
}
+
+ valid = TRUE;
}
- g_free(data);
+ screen_update_layout_bail:
+ g_free(data);
+ }
+
+ if (!valid) {
+ /* defaults */
+ orient = OB_ORIENTATION_HORZ;
+ corner = OB_CORNER_TOPLEFT;
+ rows = 1;
+ cols = screen_num_desktops;
}
+
+ screen_desktop_layout.orientation = orient;
+ screen_desktop_layout.start_corner = corner;
+ screen_desktop_layout.rows = rows;
+ screen_desktop_layout.columns = cols;
}
void screen_update_desktop_names()
/* bottom to top */
for (it = g_list_last(stacking_list); it != NULL; it = it->prev) {
if (WINDOW_IS_CLIENT(it->data)) {
- Client *client = it->data;
+ ObClient *client = it->data;
if (client->frame->visible && !client_should_show(client))
frame_hide(client->frame);
}
/* top to bottom */
for (it = stacking_list; it != NULL; it = it->next) {
if (WINDOW_IS_CLIENT(it->data)) {
- Client *client = it->data;
+ ObClient *client = it->data;
if (!client->frame->visible && client_should_show(client))
frame_show(client->frame);
}
if (show) {
/* focus desktop */
for (it = focus_order[screen_desktop]; it; it = it->next)
- if (((Client*)it->data)->type == Type_Desktop &&
+ if (((ObClient*)it->data)->type == OB_CLIENT_TYPE_DESKTOP &&
client_focus(it->data))
break;
} else {
- focus_fallback(Fallback_NoFocus);
+ focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
}
show = !!show; /* make it boolean */
dispatch_ob(Event_Ob_ShowDesktop, show, 0);
}
-void screen_install_colormap(Client *client, gboolean install)
+void screen_install_colormap(ObClient *client, gboolean install)
{
XWindowAttributes wa;
/* apply struts */
STRUT_SET(s, 0, 0, 0, 0);
for (it = client_list; it; it = it->next)
- STRUT_ADD(s, ((Client*)it->data)->strut);
+ STRUT_ADD(s, ((ObClient*)it->data)->strut);
STRUT_ADD(s, dock_strut);
if (s.left) {
XXX if gunna test this shit, then gotta worry about when
the client moves between xinerama heads..
- if (RECT_CONTAINS_RECT(((Client*)it->data)->frame->area,
+ if (RECT_CONTAINS_RECT(((ObClient*)it->data)->frame->area,
area[i][x])) {
}
/* the area has changed, adjust all the maximized
windows */
for (it = client_list; it; it = it->next) {
- Client *c = it->data;
+ ObClient *c = it->data;
if (i < screen_num_desktops) {
if (c->desktop == i)
client_reconfigure(c);
{
#ifdef USE_LIBSN
if (sn_busy_cnt)
- XDefineCursor(ob_display, ob_root, ob_cursors.busy);
+ XDefineCursor(ob_display, ob_root, ob_cursor(OB_CURSOR_BUSY));
else
#endif
- XDefineCursor(ob_display, ob_root, ob_cursors.ptr);
+ XDefineCursor(ob_display, ob_root, ob_cursor(OB_CURSOR_POINTER));
}
#ifdef USE_LIBSN
projects / chaz / openbox / blobdiff