return TRUE;
}
-gboolean screen_annex(const gchar *program_name)
+gboolean screen_annex()
{
XSetWindowAttributes attrib;
pid_t pid;
return FALSE;
}
-
screen_set_root_cursor();
/* set the OPENBOX_PID hint */
net_supporting_wm_check, window, screen_support_win);
/* set properties on the supporting window */
- PROP_SETS(screen_support_win, net_wm_name, program_name);
+ PROP_SETS(screen_support_win, net_wm_name, "Openbox");
PROP_SET32(screen_support_win, net_supporting_wm_check,
window, screen_support_win);
supported[i++] = prop_atoms.net_wm_action_fullscreen;
supported[i++] = prop_atoms.net_wm_action_change_desktop;
supported[i++] = prop_atoms.net_wm_action_close;
+ supported[i++] = prop_atoms.net_wm_action_above;
+ supported[i++] = prop_atoms.net_wm_action_below;
supported[i++] = prop_atoms.net_wm_state;
supported[i++] = prop_atoms.net_wm_state_modal;
supported[i++] = prop_atoms.net_wm_state_maximized_vert;
supported[i++] = prop_atoms.net_wm_user_time_window;
supported[i++] = prop_atoms.net_frame_extents;
supported[i++] = prop_atoms.net_request_frame_extents;
+ supported[i++] = prop_atoms.net_restack_window;
supported[i++] = prop_atoms.net_startup_id;
#ifdef SYNC
supported[i++] = prop_atoms.net_wm_sync_request;
supported[i++] = prop_atoms.kde_net_wm_frame_strut;
supported[i++] = prop_atoms.kde_net_wm_window_type_override;
- supported[i++] = prop_atoms.openbox_wm_state_undecorated;
+ supported[i++] = prop_atoms.ob_wm_action_undecorate;
+ supported[i++] = prop_atoms.ob_wm_state_undecorated;
supported[i++] = prop_atoms.openbox_pid;
- supported[i++] = prop_atoms.openbox_config;
- supported[i++] = prop_atoms.openbox_control;
+ supported[i++] = prop_atoms.ob_config;
+ supported[i++] = prop_atoms.ob_control;
g_assert(i == num_support);
PROP_SETA32(RootWindow(ob_display, ob_screen),
desktop_cycle_popup = pager_popup_new(FALSE);
pager_popup_height(desktop_cycle_popup, POPUP_HEIGHT);
- if (reconfig)
+ if (reconfig) {
+ /* update the pager popup's width */
+ pager_popup_text_width_to_strings(desktop_cycle_popup,
+ screen_desktop_names,
+ screen_num_desktops);
return;
+ }
/* get the initial size */
screen_resize();
do this before hiding the windows so if helper windows are coming
with us, they don't get hidden
*/
- if (dofocus && (c = focus_fallback_target(TRUE, focus_client))) {
+ if (dofocus && (c = focus_fallback(TRUE))) {
/* only do the flicker reducing stuff ahead of time if we are going
to call xsetinputfocus on the window ourselves. otherwise there is
no guarantee the window will actually take focus.. */
if (c->can_focus) {
- /* do this here so that if you switch desktops to a window with
- helper windows then the helper windows won't flash */
- client_bring_helper_windows(c);
/* reduce flicker by hiliting now rather than waiting for the
server FocusIn event */
frame_adjust_focus(c->frame, TRUE);
+ /* do this here so that if you switch desktops to a window with
+ helper windows then the helper windows won't flash */
+ client_bring_helper_windows(c);
}
- client_focus(c);
}
/* hide windows from bottom to top */
}
}
- event_ignore_queued_enters();
+ event_ignore_all_queued_enters();
if (event_curtime != CurrentTime)
screen_desktop_user_time = event_curtime;
a = screen_physical_area_monitor(0);
pager_popup_position(desktop_cycle_popup, CenterGravity,
a->x + a->width / 2, a->y + a->height / 2);
+ pager_popup_icon_size_multiplier(desktop_cycle_popup,
+ (screen_desktop_layout.columns /
+ screen_desktop_layout.rows) / 2,
+ (screen_desktop_layout.rows/
+ screen_desktop_layout.columns) / 2);
pager_popup_max_width(desktop_cycle_popup,
MAX(a->width/3, POPUP_WIDTH));
pager_popup_show(desktop_cycle_popup, screen_desktop_names[d], d);
guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
gboolean dialog, gboolean done, gboolean cancel)
{
- guint d, r, c;
+ guint r, c;
+ static guint d = (guint)-1;
+ guint ret, oldd;
- d = screen_desktop;
+ if (d == (guint)-1)
+ d = screen_desktop;
if ((cancel || done) && dialog)
goto show_cycle_dialog;
+ oldd = d;
get_row_col(d, &r, &c);
if (linear) {
case OB_DIRECTION_EAST:
++c;
if (c >= screen_desktop_layout.columns) {
- if (wrap) {
+ if (wrap)
c = 0;
- } else {
- d = screen_desktop;
+ else
goto show_cycle_dialog;
- }
}
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
if (wrap) {
++c;
} else {
- d = screen_desktop;
+ d = oldd;
goto show_cycle_dialog;
}
}
case OB_DIRECTION_WEST:
--c;
if (c >= screen_desktop_layout.columns) {
- if (wrap) {
+ if (wrap)
c = screen_desktop_layout.columns - 1;
- } else {
- d = screen_desktop;
+ else
goto show_cycle_dialog;
- }
}
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
if (wrap) {
--c;
} else {
- d = screen_desktop;
+ d = oldd;
goto show_cycle_dialog;
}
}
case OB_DIRECTION_SOUTH:
++r;
if (r >= screen_desktop_layout.rows) {
- if (wrap) {
+ if (wrap)
r = 0;
- } else {
- d = screen_desktop;
+ else
goto show_cycle_dialog;
- }
}
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
if (wrap) {
++r;
} else {
- d = screen_desktop;
+ d = oldd;
goto show_cycle_dialog;
}
}
case OB_DIRECTION_NORTH:
--r;
if (r >= screen_desktop_layout.rows) {
- if (wrap) {
+ if (wrap)
r = screen_desktop_layout.rows - 1;
- } else {
- d = screen_desktop;
+ else
goto show_cycle_dialog;
- }
}
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
if (wrap) {
--r;
} else {
- d = screen_desktop;
+ d = oldd;
goto show_cycle_dialog;
}
}
screen_desktop_popup(d, TRUE);
} else
screen_desktop_popup(0, FALSE);
- return d;
+ ret = d;
+
+ if (!dialog || cancel || done)
+ d = (guint)-1;
+
+ return ret;
}
void screen_update_layout()
screen_num_desktops);
}
-void screen_show_desktop(gboolean show, gboolean restore_focus)
+void screen_show_desktop(gboolean show, ObClient *show_only)
{
GList *it;
screen_showing_desktop = show;
if (show) {
- /* bottom to top */
+ /* hide windows bottom to top */
for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *client = it->data;
client_showhide(client);
}
}
- } else {
- /* top to bottom */
+ }
+ else {
+ /* restore windows top to bottom */
for (it = stacking_list; it; it = g_list_next(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *client = it->data;
- client_showhide(client);
+ if (client_should_show(client)) {
+ if (!show_only || client == show_only)
+ client_show(client);
+ else
+ client_iconify(client, TRUE, FALSE, TRUE);
+ }
}
}
}
if (show) {
- /* focus desktop */
+ /* focus the desktop */
for (it = focus_order; it; it = g_list_next(it)) {
ObClient *c = it->data;
if (c->type == OB_CLIENT_TYPE_DESKTOP &&
client_focus(it->data))
break;
}
- } else if (restore_focus) {
+ }
+ else if (!show_only) {
ObClient *c;
- /* use NULL for the "old" argument because the desktop was focused
- and we don't want to fallback to the desktop by default */
- if ((c = focus_fallback_target(TRUE, NULL)))
- client_focus(c);
+ if ((c = focus_fallback(TRUE))) {
+ /* only do the flicker reducing stuff ahead of time if we are going
+ to call xsetinputfocus on the window ourselves. otherwise there
+ is no guarantee the window will actually take focus.. */
+ if (c->can_focus) {
+ /* reduce flicker by hiliting now rather than waiting for the
+ server FocusIn event */
+ frame_adjust_focus(c->frame, TRUE);
+ }
+ }
}
show = !!show; /* make it boolean */
{
if (sn_app_starting())
XDefineCursor(ob_display, RootWindow(ob_display, ob_screen),
- ob_cursor(OB_CURSOR_BUSY));
+ ob_cursor(OB_CURSOR_BUSYPOINTER));
else
XDefineCursor(ob_display, RootWindow(ob_display, ob_screen),
ob_cursor(OB_CURSOR_POINTER));
projects / chaz / openbox / blobdiff