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

Removed trailing spaces and fixed to 80 column width.

Browse source
This commit is contained in:
Dave Foster 2007-09-11 13:53:27 -04:00 committed by Mikael Magnusson
parent c9d74e3da1
commit 0dd91ba0e2
1 changed files with 143 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
obrender/theme.c
View file

@ -211,10 +211,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->osd_font_unhilite = get_font(inactive_osd_font, &default_font,inst);
/* load direct dimensions */
/* TODO: Need fallback for menu.overlap */
READ_INT("menu.overlap.x", theme->menu_overlap_x, -100, 100, 0);
READ_INT("menu.overlap.y", theme->menu_overlap_y, -100, 100, 0);
/*READ_INT("menu.overlap", theme->menu_overlap, -100, 100, 0);*/
READ_INT("window.handle.width", theme->handle_height, 0, 100, 6);
READ_INT("padding.width", theme->paddingx, 0, 100, 3);
READ_INT("padding.height", theme->paddingy, 0, 100, theme->paddingx);
@ -277,6 +277,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color,
RrColorNew(inst, 0xff, 0xff, 0xff));
READ_COLOR("window.inactive.label.text.color",
theme->title_unfocused_color,
RrColorNew(inst, 0xff, 0xff, 0xff));
READ_COLOR("window.active.button.unpressed.image.color",
theme->titlebut_focused_unpressed_color,
RrColorNew(inst, 0, 0, 0));
@ -373,20 +377,27 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data);
}
}
READ_MASK_COPY("max_pressed.xbm", theme->max_pressed_mask, theme->max_mask);
READ_MASK_COPY("max_disabled.xbm", theme->max_disabled_mask, theme->max_mask);
READ_MASK_COPY("max_pressed.xbm", theme->max_pressed_mask,
theme->max_mask);
READ_MASK_COPY("max_disabled.xbm", theme->max_disabled_mask,
theme->max_mask);
READ_MASK_COPY("max_hover.xbm", theme->max_hover_mask, theme->max_mask);
READ_MASK_COPY("max_toggled_pressed.xbm", theme->max_toggled_pressed_mask, theme->max_toggled_mask);
READ_MASK_COPY("max_toggled_hover.xbm", theme->max_toggled_hover_mask, theme->max_toggled_mask);
READ_MASK_COPY("max_toggled_pressed.xbm", theme->max_toggled_pressed_mask,
theme->max_toggled_mask);
READ_MASK_COPY("max_toggled_hover.xbm", theme->max_toggled_hover_mask,
theme->max_toggled_mask);
/* iconify button masks */
if (!read_mask(inst, path, theme, "iconify.xbm", &theme->iconify_mask)) {
guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f };
theme->iconify_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
}
READ_MASK_COPY("iconify_pressed.xbm", theme->iconify_pressed_mask, theme->iconify_mask);
READ_MASK_COPY("iconify_disabled.xbm", theme->iconify_disabled_mask, theme->iconify_mask);
READ_MASK_COPY("iconify_hover.xbm", theme->iconify_hover_mask, theme->iconify_mask);
READ_MASK_COPY("iconify_pressed.xbm", theme->iconify_pressed_mask,
theme->iconify_mask);
READ_MASK_COPY("iconify_disabled.xbm", theme->iconify_disabled_mask,
theme->iconify_mask);
READ_MASK_COPY("iconify_hover.xbm", theme->iconify_hover_mask,
theme->iconify_mask);
/* all desktops button masks */
userdef = TRUE;
@ -405,32 +416,46 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
}
}
READ_MASK_COPY("desk_pressed.xbm", theme->desk_pressed_mask, theme->desk_mask);
READ_MASK_COPY("desk_disabled.xbm", theme->desk_disabled_mask, theme->desk_mask);
READ_MASK_COPY("desk_pressed.xbm", theme->desk_pressed_mask,
theme->desk_mask);
READ_MASK_COPY("desk_disabled.xbm", theme->desk_disabled_mask,
theme->desk_mask);
READ_MASK_COPY("desk_hover.xbm", theme->desk_hover_mask, theme->desk_mask);
READ_MASK_COPY("desk_toggled_pressed.xbm", theme->desk_toggled_pressed_mask, theme->desk_toggled_mask);
READ_MASK_COPY("desk_toggled_hover.xbm", theme->desk_toggled_hover_mask, theme->desk_toggled_mask);
READ_MASK_COPY("desk_toggled_pressed.xbm",
theme->desk_toggled_pressed_mask, theme->desk_toggled_mask);
READ_MASK_COPY("desk_toggled_hover.xbm", theme->desk_toggled_hover_mask,
theme->desk_toggled_mask);
/* shade button masks */
if (!read_mask(inst, path, theme, "shade.xbm", &theme->shade_mask)) {
guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 };
theme->shade_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
}
READ_MASK_COPY("shade_toggled.xbm", theme->shade_toggled_mask, theme->shade_mask);
READ_MASK_COPY("shade_pressed.xbm", theme->shade_pressed_mask, theme->shade_mask);
READ_MASK_COPY("shade_disabled.xbm", theme->shade_disabled_mask, theme->shade_mask);
READ_MASK_COPY("shade_hover.xbm", theme->shade_hover_mask, theme->shade_mask);
READ_MASK_COPY("shade_toggled_pressed.xbm", theme->shade_toggled_pressed_mask, theme->shade_toggled_mask);
READ_MASK_COPY("shade_toggled_hover.xbm", theme->shade_toggled_hover_mask, theme->shade_toggled_mask);
READ_MASK_COPY("shade_toggled.xbm", theme->shade_toggled_mask,
theme->shade_mask);
READ_MASK_COPY("shade_pressed.xbm", theme->shade_pressed_mask,
theme->shade_mask);
READ_MASK_COPY("shade_disabled.xbm", theme->shade_disabled_mask,
theme->shade_mask);
READ_MASK_COPY("shade_hover.xbm", theme->shade_hover_mask,
theme->shade_mask);
READ_MASK_COPY("shade_toggled_pressed.xbm",
theme->shade_toggled_pressed_mask,
theme->shade_toggled_mask);
READ_MASK_COPY("shade_toggled_hover.xbm",
theme->shade_toggled_hover_mask, theme->shade_toggled_mask);
/* close button masks */
if (!read_mask(inst, path, theme, "close.xbm", &theme->close_mask)) {
guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 };
theme->close_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
}
READ_MASK_COPY("close_pressed.xbm", theme->close_pressed_mask, theme->close_mask);
READ_MASK_COPY("close_disabled.xbm", theme->close_disabled_mask, theme->close_mask);
READ_MASK_COPY("close_hover.xbm", theme->close_hover_mask, theme->close_mask);
READ_MASK_COPY("close_pressed.xbm", theme->close_pressed_mask,
theme->close_mask);
READ_MASK_COPY("close_disabled.xbm", theme->close_disabled_mask,
theme->close_mask);
READ_MASK_COPY("close_hover.xbm", theme->close_hover_mask,
theme->close_mask);
/* submenu bullet mask */
if (!read_mask(inst, path, theme, "bullet.xbm", &theme->menu_bullet_mask))