nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

back out 6769 on files that werent supposed to commit yet

Browse source
This commit is contained in:
Dana Jansens 2007-05-22 20:53:34 +00:00
parent a16f1374ee
commit 0a2cf076df
2 changed files with 43 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
openbox/client.c
View file

@ -735,13 +735,11 @@ static ObAppSettings *client_get_settings_state(ObClient *self)
if (app->name && if (app->name &&
!g_pattern_match(app->name, strlen(self->name), self->name, NULL)) !g_pattern_match(app->name, strlen(self->name), self->name, NULL))
match = FALSE; match = FALSE;
else if (app->class && if (app->class &&
!g_pattern_match(app->class, !g_pattern_match(app->class, strlen(self->class),self->class,NULL))
strlen(self->class), self->class, NULL))
match = FALSE; match = FALSE;
else if (app->role && if (app->role &&
!g_pattern_match(app->role, !g_pattern_match(app->role, strlen(self->role), self->role, NULL))
strlen(self->role), self->role, NULL))
match = FALSE; match = FALSE;
if (match) { if (match) {
@ -753,44 +751,46 @@ static ObAppSettings *client_get_settings_state(ObClient *self)
} }
} }
if (settings->shade != -1) if (settings) {
self->shaded = !!settings->shade; if (settings->shade != -1)
if (settings->decor != -1) self->shaded = !!settings->shade;
self->undecorated = !settings->decor; if (settings->decor != -1)
if (settings->iconic != -1) self->undecorated = !settings->decor;
self->iconic = !!settings->iconic; if (settings->iconic != -1)
if (settings->skip_pager != -1) self->iconic = !!settings->iconic;
self->skip_pager = !!settings->skip_pager; if (settings->skip_pager != -1)
if (settings->skip_taskbar != -1) self->skip_pager = !!settings->skip_pager;
self->skip_taskbar = !!settings->skip_taskbar; if (settings->skip_taskbar != -1)
self->skip_taskbar = !!settings->skip_taskbar;
if (settings->max_vert != -1) if (settings->max_vert != -1)
self->max_vert = !!settings->max_vert; self->max_vert = !!settings->max_vert;
if (settings->max_horz != -1) if (settings->max_horz != -1)
self->max_horz = !!settings->max_horz; self->max_horz = !!settings->max_horz;
if (settings->fullscreen != -1) if (settings->fullscreen != -1)
self->fullscreen = !!settings->fullscreen; self->fullscreen = !!settings->fullscreen;
if (settings->desktop) { if (settings->desktop) {
if (settings->desktop == DESKTOP_ALL) if (settings->desktop == DESKTOP_ALL)
self->desktop = settings->desktop; self->desktop = settings->desktop;
else if (settings->desktop > 0 && else if (settings->desktop > 0 &&
settings->desktop <= screen_num_desktops) settings->desktop <= screen_num_desktops)
self->desktop = settings->desktop - 1; self->desktop = settings->desktop - 1;
} }
if (settings->layer == -1) { if (settings->layer == -1) {
self->below = TRUE; self->below = TRUE;
self->above = FALSE; self->above = FALSE;
} }
else if (settings->layer == 0) { else if (settings->layer == 0) {
self->below = FALSE; self->below = FALSE;
self->above = FALSE; self->above = FALSE;
} }
else if (settings->layer == 1) { else if (settings->layer == 1) {
self->below = FALSE; self->below = FALSE;
self->above = TRUE; self->above = TRUE;
}
} }
return settings; return settings;
} }
@ -2957,10 +2957,6 @@ void client_iconify(ObClient *self, gboolean iconic, gboolean curdesk,
/* move up the transient chain as far as possible first */ /* move up the transient chain as far as possible first */
self = client_search_top_normal_parent(self); self = client_search_top_normal_parent(self);
client_iconify_recursive(self, iconic, curdesk, hide_animation); client_iconify_recursive(self, iconic, curdesk, hide_animation);
/* try focus the window that was de-iconified if focusNew is on */
if (!iconic && config_focus_new)
client_focus(self);
} }
} }

7
openbox/screen.c
View file

@ -215,6 +215,7 @@ gboolean screen_annex()
(wm_supported_pos - prop_atoms_start) - 1; (wm_supported_pos - prop_atoms_start) - 1;
i = 0; i = 0;
supported = g_new(gulong, num_support); supported = g_new(gulong, num_support);
supported[i++] = prop_atoms.net_supporting_wm_check;
supported[i++] = prop_atoms.net_wm_full_placement; supported[i++] = prop_atoms.net_wm_full_placement;
supported[i++] = prop_atoms.net_current_desktop; supported[i++] = prop_atoms.net_current_desktop;
supported[i++] = prop_atoms.net_number_of_desktops; supported[i++] = prop_atoms.net_number_of_desktops;
@ -256,6 +257,8 @@ gboolean screen_annex()
supported[i++] = prop_atoms.net_wm_action_fullscreen; supported[i++] = prop_atoms.net_wm_action_fullscreen;
supported[i++] = prop_atoms.net_wm_action_change_desktop; supported[i++] = prop_atoms.net_wm_action_change_desktop;
supported[i++] = prop_atoms.net_wm_action_close; 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;
supported[i++] = prop_atoms.net_wm_state_modal; supported[i++] = prop_atoms.net_wm_state_modal;
supported[i++] = prop_atoms.net_wm_state_maximized_vert; supported[i++] = prop_atoms.net_wm_state_maximized_vert;
@ -281,10 +284,6 @@ gboolean screen_annex()
supported[i++] = prop_atoms.net_wm_sync_request_counter; supported[i++] = prop_atoms.net_wm_sync_request_counter;
#endif #endif
supported[i++] = prop_atoms.net_supporting_wm_check;
supported[i++] = prop_atoms.net_wm_action_above;
supported[i++] = prop_atoms.net_wm_action_below;
supported[i++] = prop_atoms.kde_wm_change_state; supported[i++] = prop_atoms.kde_wm_change_state;
supported[i++] = prop_atoms.kde_net_wm_frame_strut; supported[i++] = prop_atoms.kde_net_wm_frame_strut;
supported[i++] = prop_atoms.kde_net_wm_window_type_override; supported[i++] = prop_atoms.kde_net_wm_window_type_override;