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

settings is never null anymore, so dont bother to check. also use else's because we don't need to set match=false 3 times

Browse source
This commit is contained in:
Dana Jansens 2007-05-22 21:54:33 +00:00
parent 2867aba1ae
commit a6903d9056
1 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
openbox/client.c
View file

@ -735,11 +735,13 @@ static ObAppSettings *client_get_settings_state(ObClient *self)
if (app->name &&
!g_pattern_match(app->name, strlen(self->name), self->name, NULL))
match = FALSE;
if (app->class &&
!g_pattern_match(app->class, strlen(self->class),self->class,NULL))
else if (app->class &&
!g_pattern_match(app->class,
strlen(self->class), self->class, NULL))
match = FALSE;
if (app->role &&
!g_pattern_match(app->role, strlen(self->role), self->role, NULL))
else if (app->role &&
!g_pattern_match(app->role,
strlen(self->role), self->role, NULL))
match = FALSE;
if (match) {
@ -751,46 +753,44 @@ static ObAppSettings *client_get_settings_state(ObClient *self)
}
}
if (settings) {
if (settings->shade != -1)
self->shaded = !!settings->shade;
if (settings->decor != -1)
self->undecorated = !settings->decor;
if (settings->iconic != -1)
self->iconic = !!settings->iconic;
if (settings->skip_pager != -1)
self->skip_pager = !!settings->skip_pager;
if (settings->skip_taskbar != -1)
self->skip_taskbar = !!settings->skip_taskbar;
if (settings->shade != -1)
self->shaded = !!settings->shade;
if (settings->decor != -1)
self->undecorated = !settings->decor;
if (settings->iconic != -1)
self->iconic = !!settings->iconic;
if (settings->skip_pager != -1)
self->skip_pager = !!settings->skip_pager;
if (settings->skip_taskbar != -1)
self->skip_taskbar = !!settings->skip_taskbar;
if (settings->max_vert != -1)
self->max_vert = !!settings->max_vert;
if (settings->max_horz != -1)
self->max_horz = !!settings->max_horz;
if (settings->max_vert != -1)
self->max_vert = !!settings->max_vert;
if (settings->max_horz != -1)
self->max_horz = !!settings->max_horz;
if (settings->fullscreen != -1)
self->fullscreen = !!settings->fullscreen;
if (settings->fullscreen != -1)
self->fullscreen = !!settings->fullscreen;
if (settings->desktop) {
if (settings->desktop == DESKTOP_ALL)
self->desktop = settings->desktop;
else if (settings->desktop > 0 &&
settings->desktop <= screen_num_desktops)
self->desktop = settings->desktop - 1;
}
if (settings->desktop) {
if (settings->desktop == DESKTOP_ALL)
self->desktop = settings->desktop;
else if (settings->desktop > 0 &&
settings->desktop <= screen_num_desktops)
self->desktop = settings->desktop - 1;
}
if (settings->layer == -1) {
self->below = TRUE;
self->above = FALSE;
}
else if (settings->layer == 0) {
self->below = FALSE;
self->above = FALSE;
}
else if (settings->layer == 1) {
self->below = FALSE;
self->above = TRUE;
}
if (settings->layer == -1) {
self->below = TRUE;
self->above = FALSE;
}
else if (settings->layer == 0) {
self->below = FALSE;
self->above = FALSE;
}
else if (settings->layer == 1) {
self->below = FALSE;
self->above = TRUE;
}
return settings;
}