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

cleaning up remnants of bad rebase merges and modernizing some sections

Browse source
This commit is contained in:
Dave Foster 2010-10-12 23:59:51 -04:00 committed by Mikael Magnusson
parent 464ee8996e
commit 95ed843702
4 changed files with 6 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
obrender/render.c
View file

@ -231,13 +231,6 @@ void RrAppearanceClearTextures(RrAppearance *a)
memset(a->texture, 0, a->textures * sizeof(RrTexture)); memset(a->texture, 0, a->textures * sizeof(RrTexture));
} }
/* shallow copy means up the ref count and return it */
RrAppearance *RrAppearanceCopyShallow(RrAppearance *orig)
{
orig->ref++;
return orig;
}
/* deep copy of orig, means reset ref to 1 on copy /* deep copy of orig, means reset ref to 1 on copy
* and copy each thing memwise. */ * and copy each thing memwise. */
RrAppearance *RrAppearanceCopy(RrAppearance *orig) RrAppearance *RrAppearanceCopy(RrAppearance *orig)

58
obrender/theme.c
View file

@ -1602,64 +1602,6 @@ void RrThemeFree(RrTheme *theme)
RrFontClose(theme->osd_font_hilite); RrFontClose(theme->osd_font_hilite);
RrFontClose(theme->osd_font_unhilite); RrFontClose(theme->osd_font_unhilite);
RrAppearanceFree(theme->a_disabled_focused_max);
RrAppearanceFree(theme->a_disabled_unfocused_max);
RrAppearanceFree(theme->a_hover_focused_max);
RrAppearanceFree(theme->a_hover_unfocused_max);
RrAppearanceFree(theme->a_toggled_hover_focused_max);
RrAppearanceFree(theme->a_toggled_hover_unfocused_max);
RrAppearanceFree(theme->a_toggled_focused_unpressed_max);
RrAppearanceFree(theme->a_toggled_focused_pressed_max);
RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max);
RrAppearanceFree(theme->a_toggled_unfocused_pressed_max);
RrAppearanceFree(theme->a_focused_unpressed_max);
RrAppearanceFree(theme->a_focused_pressed_max);
RrAppearanceFree(theme->a_unfocused_unpressed_max);
RrAppearanceFree(theme->a_unfocused_pressed_max);
RrAppearanceFree(theme->a_disabled_focused_close);
RrAppearanceFree(theme->a_disabled_unfocused_close);
RrAppearanceFree(theme->a_hover_focused_close);
RrAppearanceFree(theme->a_hover_unfocused_close);
RrAppearanceFree(theme->a_focused_unpressed_close);
RrAppearanceFree(theme->a_focused_pressed_close);
RrAppearanceFree(theme->a_unfocused_unpressed_close);
RrAppearanceFree(theme->a_unfocused_pressed_close);
RrAppearanceFree(theme->a_disabled_focused_desk);
RrAppearanceFree(theme->a_disabled_unfocused_desk);
RrAppearanceFree(theme->a_hover_focused_desk);
RrAppearanceFree(theme->a_hover_unfocused_desk);
RrAppearanceFree(theme->a_toggled_hover_focused_desk);
RrAppearanceFree(theme->a_toggled_hover_unfocused_desk);
RrAppearanceFree(theme->a_toggled_focused_unpressed_desk);
RrAppearanceFree(theme->a_toggled_focused_pressed_desk);
RrAppearanceFree(theme->a_toggled_unfocused_unpressed_desk);
RrAppearanceFree(theme->a_toggled_unfocused_pressed_desk);
RrAppearanceFree(theme->a_focused_unpressed_desk);
RrAppearanceFree(theme->a_focused_pressed_desk);
RrAppearanceFree(theme->a_unfocused_unpressed_desk);
RrAppearanceFree(theme->a_unfocused_pressed_desk);
RrAppearanceFree(theme->a_disabled_focused_shade);
RrAppearanceFree(theme->a_disabled_unfocused_shade);
RrAppearanceFree(theme->a_hover_focused_shade);
RrAppearanceFree(theme->a_hover_unfocused_shade);
RrAppearanceFree(theme->a_toggled_hover_focused_shade);
RrAppearanceFree(theme->a_toggled_hover_unfocused_shade);
RrAppearanceFree(theme->a_toggled_focused_unpressed_shade);
RrAppearanceFree(theme->a_toggled_focused_pressed_shade);
RrAppearanceFree(theme->a_toggled_unfocused_unpressed_shade);
RrAppearanceFree(theme->a_toggled_unfocused_pressed_shade);
RrAppearanceFree(theme->a_focused_unpressed_shade);
RrAppearanceFree(theme->a_focused_pressed_shade);
RrAppearanceFree(theme->a_unfocused_unpressed_shade);
RrAppearanceFree(theme->a_unfocused_pressed_shade);
RrAppearanceFree(theme->a_disabled_focused_iconify);
RrAppearanceFree(theme->a_disabled_unfocused_iconify);
RrAppearanceFree(theme->a_hover_focused_iconify);
RrAppearanceFree(theme->a_hover_unfocused_iconify);
RrAppearanceFree(theme->a_focused_unpressed_iconify);
RrAppearanceFree(theme->a_focused_pressed_iconify);
RrAppearanceFree(theme->a_unfocused_unpressed_iconify);
RrAppearanceFree(theme->a_unfocused_pressed_iconify);
RrAppearanceFree(theme->a_focused_grip); RrAppearanceFree(theme->a_focused_grip);
RrAppearanceFree(theme->a_unfocused_grip); RrAppearanceFree(theme->a_unfocused_grip);
RrAppearanceFree(theme->a_focused_title); RrAppearanceFree(theme->a_focused_title);

4
openbox/client_menu.c
View file

@ -276,7 +276,7 @@ static gboolean send_to_menu_update(ObMenuFrame *frame, gpointer data)
if ((desk == DESKTOP_ALL && c->desktop != DESKTOP_ALL) || if ((desk == DESKTOP_ALL && c->desktop != DESKTOP_ALL) ||
(c->desktop == DESKTOP_ALL && desk == screen_desktop)) (c->desktop == DESKTOP_ALL && desk == screen_desktop))
{ {
e->data.normal.mask = ob_rr_theme->desk_mask; e->data.normal.mask = ob_rr_theme->btn_desk->mask;
set_icon_color(e); set_icon_color(e);
} else } else
e->data.normal.mask = NULL; e->data.normal.mask = NULL;
@ -392,7 +392,7 @@ void client_menu_startup(void)
menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME); menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME);
e = menu_add_normal(menu, CLIENT_RESTORE, _("R_estore"), NULL, TRUE); e = menu_add_normal(menu, CLIENT_RESTORE, _("R_estore"), NULL, TRUE);
e->data.normal.mask = ob_rr_theme->max_toggled_mask; e->data.normal.mask = ob_rr_theme->btn_max->toggled_mask;
set_icon_color(e); set_icon_color(e);
menu_add_normal(menu, CLIENT_MOVE, _("_Move"), NULL, TRUE); menu_add_normal(menu, CLIENT_MOVE, _("_Move"), NULL, TRUE);

8
openbox/prompt.c
View file

@ -59,10 +59,10 @@ void prompt_startup(gboolean reconfig)
/* note: this is not a copy, don't free it */ /* note: this is not a copy, don't free it */
prompt_a_bg = ob_rr_theme->osd_bg; prompt_a_bg = ob_rr_theme->osd_bg;
prompt_a_button = RrAppearanceCopy(ob_rr_theme->a_focused_unpressed_close); prompt_a_button = RrAppearanceCopy(ob_rr_theme->btn_close->a_focused_unpressed);
prompt_a_focus = RrAppearanceCopy(ob_rr_theme->a_hover_focused_close); prompt_a_focus = RrAppearanceCopy(ob_rr_theme->btn_close->a_hover_focused);
prompt_a_press = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close); prompt_a_press = RrAppearanceCopy(ob_rr_theme->btn_close->a_focused_pressed);
prompt_a_pfocus = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close); prompt_a_pfocus = RrAppearanceCopy(ob_rr_theme->btn_close->a_focused_pressed);
c_button = prompt_a_button->texture[0].data.mask.color; c_button = prompt_a_button->texture[0].data.mask.color;
c_focus = prompt_a_focus->texture[0].data.mask.color; c_focus = prompt_a_focus->texture[0].data.mask.color;