From 5f963a1fbc792700a1f51aa9340464aedf97db97 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 30 Aug 2007 15:46:53 -0400 Subject: READ_INT macro. --- obrender/theme.c | 65 +++++++++++++++++--------------------------------------- 1 file changed, 20 insertions(+), 45 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index dfd79985..8af2fbe6 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -63,6 +63,11 @@ static RrFont *get_font(RrFont *target, RrFont **default_font, } } +#define READ_INT(x_resstr, x_var, x_min, x_max, x_def) \ + if (!read_int(db, x_resstr, & x_var) || \ + x_var < x_min || x_var > x_max) \ + x_var = x_def; + RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, gboolean allow_fallback, RrFont *active_window_font, RrFont *inactive_window_font, @@ -178,51 +183,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_font_unhilite = get_font(inactive_osd_font, &default_font,inst); /* load direct dimensions */ - if ((!read_int(db, "menu.overlap.x", &theme->menu_overlap_x) && - !read_int(db, "menu.overlap", &theme->menu_overlap_x)) || - theme->menu_overlap_x < -100 || theme->menu_overlap_x > 100) - theme->menu_overlap_x = 0; - if ((!read_int(db, "menu.overlap.y", &theme->menu_overlap_y) && - !read_int(db, "menu.overlap", &theme->menu_overlap_y)) || - theme->menu_overlap_y < -100 || theme->menu_overlap_y > 100) - theme->menu_overlap_y = 0; - if (!read_int(db, "window.handle.width", &theme->handle_height) || - theme->handle_height < 0 || theme->handle_height > 100) - theme->handle_height = 6; - if (!read_int(db, "padding.width", &theme->paddingx) || - theme->paddingx < 0 || theme->paddingx > 100) - theme->paddingx = 3; - if (!read_int(db, "padding.height", &theme->paddingy) || - theme->paddingy < 0 || theme->paddingy > 100) - theme->paddingy = theme->paddingx; - if (!read_int(db, "border.width", &theme->fbwidth) || - theme->fbwidth < 0 || theme->fbwidth > 100) - theme->fbwidth = 1; - /* menu border width inherits from the frame border width */ - if (!read_int(db, "menu.border.width", &theme->mbwidth) || - theme->mbwidth < 0 || theme->mbwidth > 100) - theme->mbwidth = theme->fbwidth; - /* osd border width inherits from the frame border width */ - if (!read_int(db, "osd.border.width", &theme->obwidth) || - theme->obwidth < 0 || theme->obwidth > 100) - theme->obwidth = theme->fbwidth; - if (!read_int(db, "window.client.padding.width", &theme->cbwidthx) || - theme->cbwidthx < 0 || theme->cbwidthx > 100) - theme->cbwidthx = theme->paddingx; - if (!read_int(db, "window.client.padding.height", &theme->cbwidthy) || - theme->cbwidthy < 0 || theme->cbwidthy > 100) - theme->cbwidthy = theme->cbwidthx; - if (!read_int(db, "menu.separator.width", &theme->menu_sep_width) || - theme->menu_sep_width < 1 || theme->menu_sep_width > 100) - theme->menu_sep_width = 1; - if (!read_int(db, "menu.separator.padding.width", - &theme->menu_sep_paddingx) || - theme->menu_sep_paddingx < 0 || theme->menu_sep_paddingx > 100) - theme->menu_sep_paddingx = 6; - if (!read_int(db, "menu.separator.padding.height", - &theme->menu_sep_paddingy) || - theme->menu_sep_paddingy < 0 || theme->menu_sep_paddingy > 100) - theme->menu_sep_paddingy = 3; + + /* 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("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); + READ_INT("border.width", theme->fbwidth, 0, 100, 1); + READ_INT("menu.border.width", theme->mbwidth, 0, 100, theme->fbwidth); + READ_INT("osd.border.width", theme->obwidth, 0, 100, theme->fbwidth); + READ_INT("window.client.padding.width", theme->cbwidthx, 0, 100, theme->paddingx); + READ_INT("window.client.padding.height", theme->cbwidthy, 0, 100, theme->cbwidthx); + READ_INT("menu.separator.width", theme->menu_sep_width, 1, 100, 1); + READ_INT("menu.separator.padding.width", theme->menu_sep_paddingx, 0, 100, 6); + READ_INT("menu.separator.padding.height", theme->menu_sep_paddingy, 0, 100, 3); /* load colors */ if (!read_color(db, inst, -- cgit v1.2.3 From 918efe8e49ba95b093ba6ba4f893370669483bcd Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 30 Aug 2007 23:11:38 -0400 Subject: READ_COLOR macros done, RrColorCopy added, indentation fixed. --- obrender/theme.c | 336 +++++++++++++++++++++---------------------------------- 1 file changed, 129 insertions(+), 207 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 8af2fbe6..7bb36f13 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -68,6 +68,15 @@ static RrFont *get_font(RrFont *target, RrFont **default_font, x_var < x_min || x_var > x_max) \ x_var = x_def; +#define READ_COLOR(x_resstr, x_var, x_def) \ + if (!read_color(db, inst, x_resstr, & x_var)) \ + x_var = x_def; + +#define READ_COLOR_(x_res1, x_res2, x_var, x_def) \ + if (!read_color(db, inst, x_res1, & x_var) && \ + !read_color(db, inst, x_res2, & x_var)) \ + x_var = x_def; + RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, gboolean allow_fallback, RrFont *active_window_font, RrFont *inactive_window_font, @@ -198,221 +207,134 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_INT("menu.separator.width", theme->menu_sep_width, 1, 100, 1); READ_INT("menu.separator.padding.width", theme->menu_sep_paddingx, 0, 100, 6); READ_INT("menu.separator.padding.height", theme->menu_sep_paddingy, 0, 100, 3); + READ_INT("window.client.padding.width", theme->cbwidthx, 0, 100, + theme->paddingx); + READ_INT("window.client.padding.height", theme->cbwidthy, 0, 100, + theme->cbwidthx); /* load colors */ - if (!read_color(db, inst, - "window.active.border.color", - &theme->frame_focused_border_color) && - !read_color(db, inst, - "border.color", - &theme->frame_focused_border_color)) - theme->frame_focused_border_color = RrColorNew(inst, 0, 0, 0); + READ_COLOR_("window.active.border.color", "border.color", + theme->frame_focused_border_color, RrColorNew(inst, 0, 0, 0)); + /* title separator focused color inherits from focused border color */ - if (!read_color(db, inst, - "window.active.title.separator.color", - &theme->title_separator_focused_color)) - theme->title_separator_focused_color = - RrColorNew(inst, - theme->frame_focused_border_color->r, - theme->frame_focused_border_color->g, - theme->frame_focused_border_color->b); + READ_COLOR("window.active.title.separator.color", + theme->title_separator_focused_color, + RrColorCopy(theme->frame_focused_border_color)); + /* unfocused border color inherits from frame focused border color */ - if (!read_color(db, inst, - "window.inactive.border.color", - &theme->frame_unfocused_border_color)) - theme->frame_unfocused_border_color = - RrColorNew(inst, theme->frame_focused_border_color->r, - theme->frame_focused_border_color->g, - theme->frame_focused_border_color->b); + READ_COLOR("window.inactive.border.color", + theme->frame_unfocused_border_color, + RrColorCopy(theme->frame_focused_border_color)); + /* title separator unfocused color inherits from unfocused border color */ - if (!read_color(db, inst, - "window.inactive.title.separator.color", - &theme->title_separator_unfocused_color)) - theme->title_separator_unfocused_color = - RrColorNew(inst, - theme->frame_unfocused_border_color->r, - theme->frame_unfocused_border_color->g, - theme->frame_unfocused_border_color->b); + READ_COLOR("window.inactive.title.separator.color", + theme->title_separator_unfocused_color, + RrColorCopy(theme->frame_unfocused_border_color)); /* menu border color inherits from frame focused border color */ - if (!read_color(db, inst, "menu.border.color", &theme->menu_border_color)) - theme->menu_border_color = - RrColorNew(inst, - theme->frame_focused_border_color->r, - theme->frame_focused_border_color->g, - theme->frame_focused_border_color->b); - /* osd border color inherits from frame focused border color */ - if (!read_color(db, inst, "osd.border.color", &theme->osd_border_color)) - theme->osd_border_color = - RrColorNew(inst, - theme->frame_focused_border_color->r, - theme->frame_focused_border_color->g, - theme->frame_focused_border_color->b); - if (!read_color(db, inst, - "window.active.client.color", - &theme->cb_focused_color)) - theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!read_color(db, inst, - "window.inactive.client.color", - &theme->cb_unfocused_color)) - theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!read_color(db, inst, - "window.active.label.text.color", - &theme->title_focused_color)) - theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); - if (!read_color(db, inst, "osd.active.label.text.color", - &theme->osd_text_active_color) && - !read_color(db, inst, "osd.label.text.color", - &theme->osd_text_active_color)) - theme->osd_text_active_color = - RrColorNew(inst, - theme->title_focused_color->r, - theme->title_focused_color->g, - theme->title_focused_color->b); - if (!read_color(db, inst, - "window.inactive.label.text.color", - &theme->title_unfocused_color)) - theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!read_color(db, inst, "osd.inactive.label.text.color", - &theme->osd_text_inactive_color)) - theme->osd_text_inactive_color = - RrColorNew(inst, - theme->title_unfocused_color->r, - theme->title_unfocused_color->g, - theme->title_unfocused_color->b); - if (!read_color(db, inst, - "window.active.button.unpressed.image.color", - &theme->titlebut_focused_unpressed_color)) - theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, - "window.inactive.button.unpressed.image.color", - &theme->titlebut_unfocused_unpressed_color)) - theme->titlebut_unfocused_unpressed_color = - RrColorNew(inst, 0xff, 0xff, 0xff); - if (!read_color(db, inst, - "window.active.button.pressed.image.color", - &theme->titlebut_focused_pressed_color)) - theme->titlebut_focused_pressed_color = - RrColorNew(inst, - theme->titlebut_focused_unpressed_color->r, - theme->titlebut_focused_unpressed_color->g, - theme->titlebut_focused_unpressed_color->b); - if (!read_color(db, inst, - "window.inactive.button.pressed.image.color", - &theme->titlebut_unfocused_pressed_color)) - theme->titlebut_unfocused_pressed_color = - RrColorNew(inst, - theme->titlebut_unfocused_unpressed_color->r, - theme->titlebut_unfocused_unpressed_color->g, - theme->titlebut_unfocused_unpressed_color->b); - if (!read_color(db, inst, - "window.active.button.disabled.image.color", - &theme->titlebut_disabled_focused_color)) - theme->titlebut_disabled_focused_color = - RrColorNew(inst, 0xff, 0xff, 0xff); - if (!read_color(db, inst, - "window.inactive.button.disabled.image.color", - &theme->titlebut_disabled_unfocused_color)) - theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, - "window.active.button.hover.image.color", - &theme->titlebut_hover_focused_color)) - theme->titlebut_hover_focused_color = - RrColorNew(inst, - theme->titlebut_focused_unpressed_color->r, - theme->titlebut_focused_unpressed_color->g, - theme->titlebut_focused_unpressed_color->b); - if (!read_color(db, inst, - "window.inactive.button.hover.image.color", - &theme->titlebut_hover_unfocused_color)) - theme->titlebut_hover_unfocused_color = - RrColorNew(inst, - theme->titlebut_unfocused_unpressed_color->r, - theme->titlebut_unfocused_unpressed_color->g, - theme->titlebut_unfocused_unpressed_color->b); - if (!read_color(db, inst, - "window.active.button.toggled.unpressed.image.color", - &theme->titlebut_toggled_focused_unpressed_color) && - !read_color(db, inst, - "window.active.button.toggled.image.color", - &theme->titlebut_toggled_focused_unpressed_color)) - theme->titlebut_toggled_focused_unpressed_color = - RrColorNew(inst, - theme->titlebut_focused_pressed_color->r, - theme->titlebut_focused_pressed_color->g, - theme->titlebut_focused_pressed_color->b); - if (!read_color(db, inst, - "window.inactive.button.toggled.unpressed.image.color", - &theme->titlebut_toggled_unfocused_unpressed_color) && - !read_color(db, inst, - "window.inactive.button.toggled.image.color", - &theme->titlebut_toggled_unfocused_unpressed_color)) - theme->titlebut_toggled_unfocused_unpressed_color = - RrColorNew(inst, - theme->titlebut_unfocused_pressed_color->r, - theme->titlebut_unfocused_pressed_color->g, - theme->titlebut_unfocused_pressed_color->b); - if (!read_color(db, inst, - "window.active.button.toggled.hover.image.color", - &theme->titlebut_toggled_hover_focused_color)) - theme->titlebut_toggled_hover_focused_color = - RrColorNew(inst, - theme->titlebut_toggled_focused_unpressed_color->r, - theme->titlebut_toggled_focused_unpressed_color->g, - theme->titlebut_toggled_focused_unpressed_color->b); - if (!read_color(db, inst, - "window.inactive.button.toggled.hover.image.color", - &theme->titlebut_toggled_hover_unfocused_color)) - theme->titlebut_toggled_hover_unfocused_color = - RrColorNew(inst, - theme->titlebut_toggled_unfocused_unpressed_color->r, - theme->titlebut_toggled_unfocused_unpressed_color->g, - theme->titlebut_toggled_unfocused_unpressed_color->b); - if (!read_color(db, inst, - "window.active.button.toggled.pressed.image.color", - &theme->titlebut_toggled_focused_pressed_color)) - theme->titlebut_toggled_focused_pressed_color = - RrColorNew(inst, - theme->titlebut_focused_pressed_color->r, - theme->titlebut_focused_pressed_color->g, - theme->titlebut_focused_pressed_color->b); - if (!read_color(db, inst, - "window.inactive.button.toggled.pressed.image.color", - &theme->titlebut_toggled_unfocused_pressed_color)) - theme->titlebut_toggled_unfocused_pressed_color = - RrColorNew(inst, - theme->titlebut_unfocused_pressed_color->r, - theme->titlebut_unfocused_pressed_color->g, - theme->titlebut_unfocused_pressed_color->b); - if (!read_color(db, inst, - "menu.title.text.color", &theme->menu_title_color)) - theme->menu_title_color = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, - "menu.items.text.color", &theme->menu_color)) - theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!read_color(db, inst, - "menu.items.disabled.text.color", - &theme->menu_disabled_color)) - theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, - "menu.items.active.disabled.text.color", - &theme->menu_disabled_selected_color)) - theme->menu_disabled_selected_color = - RrColorNew(inst, - theme->menu_disabled_color->r, - theme->menu_disabled_color->g, - theme->menu_disabled_color->b); - if (!read_color(db, inst, - "menu.items.active.text.color", - &theme->menu_selected_color)) - theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, - "menu.separator.color", &theme->menu_sep_color)) - theme->menu_sep_color = RrColorNew(inst, - theme->menu_color->r, - theme->menu_color->g, - theme->menu_color->b); + READ_COLOR("menu.border.color", theme->menu_border_color, + RrColorCopy(theme->frame_focused_border_color)); + /* osd border color inherits from frame focused border color */ + READ_COLOR("osd.border.color", theme->osd_border_color, + RrColorCopy(theme->frame_focused_border_color)); + + READ_COLOR("window.active.client.color", theme->cb_focused_color, + RrColorNew(inst, 0xff, 0xff, 0xff)); + + READ_COLOR("window.inactive.client.color", theme->cb_unfocused_color, + RrColorNew(inst, 0xff, 0xff, 0xff)); + + READ_COLOR("window.active.label.text.color", theme->title_focused_color, + RrColorNew(inst, 0x0, 0x0, 0x0)); + + READ_COLOR_("osd.active.label.text.color", + "osd.label.text.color", + theme->osd_color, RrColorCopy(theme->title_focused_color)); + + READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color, + RrColorCopy(theme->title_unfocused_color)); + + READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color, + RrColorNew(inst, 0xff, 0xff, 0xff)); + + READ_COLOR("window.active.button.unpressed.image.color", + theme->titlebut_focused_unpressed_color, + RrColorNew(inst, 0, 0, 0)); + + READ_COLOR("window.inactive.button.unpressed.image.color", + theme->titlebut_unfocused_unpressed_color, + RrColorNew(inst, 0xff, 0xff, 0xff)); + + READ_COLOR("window.active.button.pressed.image.color", + theme->titlebut_focused_pressed_color, + RrColorCopy(theme->titlebut_focused_unpressed_color)); + + READ_COLOR("window.inactive.button.pressed.image.color", + theme->titlebut_unfocused_pressed_color, + RrColorCopy(theme->titlebut_unfocused_unpressed_color)); + + READ_COLOR("window.active.button.disabled.image.color", + theme->titlebut_disabled_focused_color, + RrColorNew(inst, 0xff, 0xff, 0xff)); + + READ_COLOR("window.inactive.button.disabled.image.color", + theme->titlebut_disabled_unfocused_color, + RrColorNew(inst, 0, 0, 0)); + + READ_COLOR("window.active.button.hover.image.color", + theme->titlebut_hover_focused_color, + RrColorCopy(theme->titlebut_focused_unpressed_color)); + + READ_COLOR("window.inactive.button.hover.image.color", + theme->titlebut_hover_unfocused_color, + RrColorCopy(theme->titlebut_unfocused_unpressed_color)); + + READ_COLOR_("window.active.button.toggled.unpressed.image.color", + "window.active.button.toggled.image.color", + theme->titlebut_toggled_focused_unpressed_color, + RrColorCopy(theme->titlebut_focused_pressed_color)); + + READ_COLOR_("window.inactive.button.toggled.unpressed.image.color", + "window.inactive.button.toggled.image.color", + theme->titlebut_toggled_unfocused_unpressed_color, + RrColorCopy(theme->titlebut_unfocused_pressed_color)); + + READ_COLOR("window.active.button.toggled.hover.image.color", + theme->titlebut_toggled_hover_focused_color, + RrColorCopy(theme->titlebut_toggled_focused_unpressed_color)); + + READ_COLOR("window.inactive.button.toggled.hover.image.color", + theme->titlebut_toggled_hover_unfocused_color, + RrColorCopy(theme->titlebut_toggled_unfocused_unpressed_color)); + + READ_COLOR("window.active.button.toggled.pressed.image.color", + theme->titlebut_toggled_focused_pressed_color, + RrColorCopy(theme->titlebut_focused_pressed_color)); + + READ_COLOR("window.inactive.button.toggled.pressed.image.color", + theme->titlebut_toggled_unfocused_pressed_color, + RrColorCopy(theme->titlebut_unfocused_pressed_color)); + + READ_COLOR("menu.title.text.color", theme->menu_title_color, + RrColorNew(inst, 0, 0, 0)); + + READ_COLOR("menu.items.text.color", theme->menu_color, + RrColorNew(inst, 0xff, 0xff, 0xff)); + + READ_COLOR("menu.items.disabled.text.color", theme->menu_disabled_color, + RrColorNew(inst, 0, 0, 0)); + + READ_COLOR("menu.items.active.disabled.text.color", + theme->menu_disabled_selected_color, + RrColorCopy(theme->menu_disabled_color)); + + READ_COLOR("menu.items.active.text.color", theme->menu_selected_color, + RrColorNew(inst, 0, 0, 0)); + + READ_COLOR("menu.separator.color", theme->menu_sep_color, + RrColorCopy(inst, theme->menu_color)); + /* load the image masks */ /* maximize button masks */ -- cgit v1.2.3 From c9d74e3da1026debfee9174f4db7d2d16863845b Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Fri, 31 Aug 2007 11:52:55 -0400 Subject: READ_APPEARANCE* macros and code cleanups. --- obrender/theme.c | 332 +++++++++++++++++-------------------------------------- 1 file changed, 103 insertions(+), 229 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 7bb36f13..572f2a2f 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -77,6 +77,25 @@ static RrFont *get_font(RrFont *target, RrFont **default_font, !read_color(db, inst, x_res2, & x_var)) \ x_var = x_def; +#define READ_MASK_COPY(x_file, x_var, x_copysrc) \ + if (!read_mask(inst, path, theme, x_file, & x_var)) \ + x_var = RrPixmapMaskCopy(x_copysrc); + +#define READ_APPEARANCE(x_resstr, x_var, x_parrel) \ + if (!read_appearance(db, inst, x_resstr, x_var, x_parrel)) \ + set_default_appearance(x_var); + +#define READ_APPEARANCE_COPY(x_resstr, x_var, x_parrel, x_defval) \ + if (!read_appearance(db, inst, x_resstr, x_var, x_parrel)) {\ + RrAppearanceFree(x_var); \ + x_var = RrAppearanceCopy(x_defval); } + +#define READ_APPEARANCE_(x_res1, x_res2, x_var, x_parrel, x_defval) \ + if (!read_appearance(db, inst, x_res1, x_var, x_parrel) && \ + !read_appearance(db, inst, x_res2, x_var, x_parrel)) {\ + RrAppearanceFree(x_var); \ + x_var = RrAppearanceCopy(x_defval); } + RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, gboolean allow_fallback, RrFont *active_window_font, RrFont *inactive_window_font, @@ -354,38 +373,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data); } } - if (!read_mask(inst, path, theme, "max_pressed.xbm", - &theme->max_pressed_mask)) - theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); - if (!read_mask(inst,path,theme,"max_disabled.xbm", - &theme->max_disabled_mask)) - theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); - if (!read_mask(inst, path, theme, "max_hover.xbm", &theme->max_hover_mask)) - theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); - if (!read_mask(inst, path, theme, "max_toggled_pressed.xbm", - &theme->max_toggled_pressed_mask)) - theme->max_toggled_pressed_mask = - RrPixmapMaskCopy(theme->max_toggled_mask); - if (!read_mask(inst, path, theme, "max_toggled_hover.xbm", - &theme->max_toggled_hover_mask)) - theme->max_toggled_hover_mask = - RrPixmapMaskCopy(theme->max_toggled_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); + /* 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); } - if (!read_mask(inst, path, theme, "iconify_pressed.xbm", - &theme->iconify_pressed_mask)) - theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask); - if (!read_mask(inst, path, theme, "iconify_disabled.xbm", - &theme->iconify_disabled_mask)) - theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask); - if (!read_mask(inst, path, theme, "iconify_hover.xbm", - &theme->iconify_hover_mask)) - theme->iconify_hover_mask = RrPixmapMaskCopy(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; if (!read_mask(inst, path, theme, "desk.xbm", &theme->desk_mask)) { @@ -403,64 +405,32 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } } - if (!read_mask(inst, path, theme, "desk_pressed.xbm", - &theme->desk_pressed_mask)) - theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); - if (!read_mask(inst, path, theme, "desk_disabled.xbm", - &theme->desk_disabled_mask)) - theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); - if (!read_mask(inst, path, theme, "desk_hover.xbm", - &theme->desk_hover_mask)) - theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); - if (!read_mask(inst, path, theme, "desk_toggled_pressed.xbm", - &theme->desk_toggled_pressed_mask)) - theme->desk_toggled_pressed_mask = - RrPixmapMaskCopy(theme->desk_toggled_mask); - if (!read_mask(inst, path, theme, "desk_toggled_hover.xbm", - &theme->desk_toggled_hover_mask)) - theme->desk_toggled_hover_mask = - RrPixmapMaskCopy(theme->desk_toggled_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); + /* 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); } - if (!read_mask(inst, path, theme, "shade_toggled.xbm", - &theme->shade_toggled_mask)) - theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_mask); - if (!read_mask(inst, path, theme, "shade_pressed.xbm", - &theme->shade_pressed_mask)) - theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); - if (!read_mask(inst, path, theme, "shade_disabled.xbm", - &theme->shade_disabled_mask)) - theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); - if (!read_mask(inst, path, theme, "shade_hover.xbm", - &theme->shade_hover_mask)) - theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); - if (!read_mask(inst, path, theme, "shade_toggled_pressed.xbm", - &theme->shade_toggled_pressed_mask)) - theme->shade_toggled_pressed_mask = - RrPixmapMaskCopy(theme->shade_toggled_mask); - if (!read_mask(inst, path, theme, "shade_toggled_hover.xbm", - &theme->shade_toggled_hover_mask)) - theme->shade_toggled_hover_mask = - RrPixmapMaskCopy(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); } - if (!read_mask(inst, path, theme, "close_pressed.xbm", - &theme->close_pressed_mask)) - theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); - if (!read_mask(inst, path, theme, "close_disabled.xbm", - &theme->close_disabled_mask)) - theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); - if (!read_mask(inst, path, theme, "close_hover.xbm", - &theme->close_hover_mask)) - theme->close_hover_mask = RrPixmapMaskCopy(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)) @@ -487,50 +457,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT; /* read the decoration textures */ - if (!read_appearance(db, inst, - "window.active.title.bg", theme->a_focused_title, - FALSE)) - set_default_appearance(theme->a_focused_title); - if (!read_appearance(db, inst, - "window.inactive.title.bg", theme->a_unfocused_title, - FALSE)) - set_default_appearance(theme->a_unfocused_title); - if (!read_appearance(db, inst, - "window.active.label.bg", theme->a_focused_label, - TRUE)) - set_default_appearance(theme->a_focused_label); - if (!read_appearance(db, inst, - "window.inactive.label.bg", theme->a_unfocused_label, - TRUE)) - set_default_appearance(theme->a_unfocused_label); - if (!read_appearance(db, inst, - "window.active.handle.bg", theme->a_focused_handle, - FALSE)) - set_default_appearance(theme->a_focused_handle); - if (!read_appearance(db, inst, - "window.inactive.handle.bg",theme->a_unfocused_handle, - FALSE)) - set_default_appearance(theme->a_unfocused_handle); - if (!read_appearance(db, inst, - "window.active.grip.bg", theme->a_focused_grip, - TRUE)) - set_default_appearance(theme->a_focused_grip); - if (!read_appearance(db, inst, - "window.inactive.grip.bg", theme->a_unfocused_grip, - TRUE)) - set_default_appearance(theme->a_unfocused_grip); - if (!read_appearance(db, inst, - "menu.items.bg", theme->a_menu, - FALSE)) - set_default_appearance(theme->a_menu); - if (!read_appearance(db, inst, - "menu.title.bg", theme->a_menu_title, - TRUE)) - set_default_appearance(theme->a_menu_title); - if (!read_appearance(db, inst, - "menu.items.active.bg", theme->a_menu_selected, - TRUE)) - set_default_appearance(theme->a_menu_selected); + READ_APPEARANCE("window.active.title.bg", theme->a_focused_title, FALSE); + READ_APPEARANCE("window.inactive.title.bg", theme->a_unfocused_title, + FALSE); + READ_APPEARANCE("window.active.label.bg", theme->a_focused_label, TRUE); + READ_APPEARANCE("window.inactive.label.bg", theme->a_unfocused_label, + TRUE); + READ_APPEARANCE("window.active.handle.bg", theme->a_focused_handle, FALSE); + READ_APPEARANCE("window.inactive.handle.bg",theme->a_unfocused_handle, + FALSE); + READ_APPEARANCE("window.active.grip.bg", theme->a_focused_grip, TRUE); + READ_APPEARANCE("window.inactive.grip.bg", theme->a_unfocused_grip, TRUE); + READ_APPEARANCE("menu.items.bg", theme->a_menu, FALSE); + READ_APPEARANCE("menu.title.bg", theme->a_menu_title, TRUE); + READ_APPEARANCE("menu.items.active.bg", theme->a_menu_selected, TRUE); + theme->a_menu_disabled_selected = RrAppearanceCopy(theme->a_menu_selected); @@ -571,117 +512,50 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, } /* read buttons textures */ - if (!read_appearance(db, inst, - "window.active.button.disabled.bg", - theme->a_disabled_focused_max, - TRUE)) - set_default_appearance(theme->a_disabled_focused_max); - if (!read_appearance(db, inst, - "window.inactive.button.disabled.bg", - theme->a_disabled_unfocused_max, - TRUE)) - set_default_appearance(theme->a_disabled_unfocused_max); - if (!read_appearance(db, inst, - "window.active.button.pressed.bg", - theme->a_focused_pressed_max, - TRUE)) - set_default_appearance(theme->a_focused_pressed_max); - if (!read_appearance(db, inst, - "window.inactive.button.pressed.bg", - theme->a_unfocused_pressed_max, - TRUE)) - set_default_appearance(theme->a_unfocused_pressed_max); - if (!read_appearance(db, inst, - "window.active.button.toggled.unpressed.bg", - theme->a_toggled_focused_unpressed_max, - TRUE) && - !read_appearance(db, inst, - "window.active.button.toggled.bg", - theme->a_toggled_focused_unpressed_max, - TRUE)) - { - RrAppearanceFree(theme->a_toggled_focused_unpressed_max); - theme->a_toggled_focused_unpressed_max = - RrAppearanceCopy(theme->a_focused_pressed_max); - } - if (!read_appearance(db, inst, - "window.inactive.button.toggled.unpressed.bg", - theme->a_toggled_unfocused_unpressed_max, - TRUE) && - !read_appearance(db, inst, - "window.inactive.button.toggled.bg", - theme->a_toggled_unfocused_unpressed_max, - TRUE)) - { - RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max); - theme->a_toggled_unfocused_unpressed_max = - RrAppearanceCopy(theme->a_unfocused_pressed_max); - } - if (!read_appearance(db, inst, - "window.active.button.toggled.hover.bg", - theme->a_toggled_hover_focused_max, - TRUE)) - { - RrAppearanceFree(theme->a_toggled_hover_focused_max); - theme->a_toggled_hover_focused_max = - RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); - } - if (!read_appearance(db, inst, - "window.inactive.button.toggled.hover.bg", - theme->a_toggled_hover_unfocused_max, - TRUE)) - { - RrAppearanceFree(theme->a_toggled_hover_unfocused_max); - theme->a_toggled_hover_unfocused_max = - RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); - } - if (!read_appearance(db, inst, - "window.active.button.toggled.pressed.bg", - theme->a_toggled_focused_pressed_max, - TRUE)) - { - RrAppearanceFree(theme->a_toggled_focused_pressed_max); - theme->a_toggled_focused_pressed_max = - RrAppearanceCopy(theme->a_focused_pressed_max); - } - if (!read_appearance(db, inst, - "window.inactive.button.toggled.pressed.bg", - theme->a_toggled_unfocused_pressed_max, - TRUE)) - { - RrAppearanceFree(theme->a_toggled_unfocused_pressed_max); - theme->a_toggled_unfocused_pressed_max = - RrAppearanceCopy(theme->a_unfocused_pressed_max); - } - if (!read_appearance(db, inst, - "window.active.button.unpressed.bg", - theme->a_focused_unpressed_max, - TRUE)) - set_default_appearance(theme->a_focused_unpressed_max); - if (!read_appearance(db, inst, - "window.inactive.button.unpressed.bg", - theme->a_unfocused_unpressed_max, - TRUE)) - set_default_appearance(theme->a_unfocused_unpressed_max); - if (!read_appearance(db, inst, - "window.active.button.hover.bg", - theme->a_hover_focused_max, - TRUE)) - { - RrAppearanceFree(theme->a_hover_focused_max); - theme->a_hover_focused_max = - RrAppearanceCopy(theme->a_focused_unpressed_max); - } - if (!read_appearance(db, inst, - "window.inactive.button.hover.bg", - theme->a_hover_unfocused_max, - TRUE)) - { - RrAppearanceFree(theme->a_hover_unfocused_max); - theme->a_hover_unfocused_max = - RrAppearanceCopy(theme->a_unfocused_unpressed_max); - } - + READ_APPEARANCE("window.active.button.disabled.bg", + theme->a_disabled_focused_max, TRUE); + READ_APPEARANCE("window.inactive.button.disabled.bg", + theme->a_disabled_unfocused_max, TRUE); + READ_APPEARANCE("window.active.button.pressed.bg", + theme->a_focused_pressed_max, TRUE); + READ_APPEARANCE("window.inactive.button.pressed.bg", + theme->a_unfocused_pressed_max, TRUE); + + READ_APPEARANCE_("window.active.button.toggled.unpressed.bg", + "window.active.button.toggled.bg", + theme->a_toggled_focused_unpressed_max, TRUE, + theme->a_focused_pressed_max); + READ_APPEARANCE_("window.inactive.button.toggled.unpressed.bg", + "window.inactive.button.toggled.bg", + theme->a_toggled_unfocused_unpressed_max, TRUE, + theme->a_unfocused_pressed_max); + + READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg", + theme->a_toggled_hover_focused_max, TRUE, + theme->a_toggled_focused_unpressed_max); + READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg", + theme->a_toggled_hover_unfocused_max, TRUE, + theme->a_toggled_unfocused_unpressed_max); + + READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg", + theme->a_toggled_focused_pressed_max, TRUE, + theme->a_focused_pressed_max); + READ_APPEARANCE_COPY("window.inactive.button.toggled.pressed.bg", + theme->a_toggled_unfocused_pressed_max, TRUE, + theme->a_unfocused_pressed_max); + + READ_APPEARANCE("window.active.button.unpressed.bg", + theme->a_focused_unpressed_max, TRUE); + READ_APPEARANCE("window.inactive.button.unpressed.bg", + theme->a_unfocused_unpressed_max, TRUE); + + READ_APPEARANCE_COPY("window.active.button.hover.bg", + theme->a_hover_focused_max, TRUE, + theme->a_focused_unpressed_max); + READ_APPEARANCE_COPY("window.inactive.button.hover.bg", + theme->a_hover_unfocused_max, TRUE, + theme->a_unfocused_unpressed_max); + theme->a_disabled_focused_close = RrAppearanceCopy(theme->a_disabled_focused_max); theme->a_disabled_unfocused_close = -- cgit v1.2.3 From 0dd91ba0e2382a8f6177f501f8a0b26e0daf26a8 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Tue, 11 Sep 2007 13:53:27 -0400 Subject: Removed trailing spaces and fixed to 80 column width. --- obrender/theme.c | 241 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 133 insertions(+), 108 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 572f2a2f..11b77228 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -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.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); @@ -226,129 +226,133 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_INT("menu.separator.width", theme->menu_sep_width, 1, 100, 1); READ_INT("menu.separator.padding.width", theme->menu_sep_paddingx, 0, 100, 6); READ_INT("menu.separator.padding.height", theme->menu_sep_paddingy, 0, 100, 3); - READ_INT("window.client.padding.width", theme->cbwidthx, 0, 100, + READ_INT("window.client.padding.width", theme->cbwidthx, 0, 100, theme->paddingx); - READ_INT("window.client.padding.height", theme->cbwidthy, 0, 100, + READ_INT("window.client.padding.height", theme->cbwidthy, 0, 100, theme->cbwidthx); /* load colors */ - READ_COLOR_("window.active.border.color", "border.color", + READ_COLOR_("window.active.border.color", "border.color", theme->frame_focused_border_color, RrColorNew(inst, 0, 0, 0)); /* title separator focused color inherits from focused border color */ - READ_COLOR("window.active.title.separator.color", + READ_COLOR("window.active.title.separator.color", theme->title_separator_focused_color, RrColorCopy(theme->frame_focused_border_color)); /* unfocused border color inherits from frame focused border color */ - READ_COLOR("window.inactive.border.color", - theme->frame_unfocused_border_color, + READ_COLOR("window.inactive.border.color", + theme->frame_unfocused_border_color, RrColorCopy(theme->frame_focused_border_color)); /* title separator unfocused color inherits from unfocused border color */ - READ_COLOR("window.inactive.title.separator.color", + READ_COLOR("window.inactive.title.separator.color", theme->title_separator_unfocused_color, RrColorCopy(theme->frame_unfocused_border_color)); /* menu border color inherits from frame focused border color */ - READ_COLOR("menu.border.color", theme->menu_border_color, + READ_COLOR("menu.border.color", theme->menu_border_color, RrColorCopy(theme->frame_focused_border_color)); /* osd border color inherits from frame focused border color */ - READ_COLOR("osd.border.color", theme->osd_border_color, + READ_COLOR("osd.border.color", theme->osd_border_color, RrColorCopy(theme->frame_focused_border_color)); - READ_COLOR("window.active.client.color", theme->cb_focused_color, + READ_COLOR("window.active.client.color", theme->cb_focused_color, RrColorNew(inst, 0xff, 0xff, 0xff)); - READ_COLOR("window.inactive.client.color", theme->cb_unfocused_color, + READ_COLOR("window.inactive.client.color", theme->cb_unfocused_color, RrColorNew(inst, 0xff, 0xff, 0xff)); - READ_COLOR("window.active.label.text.color", theme->title_focused_color, + READ_COLOR("window.active.label.text.color", theme->title_focused_color, RrColorNew(inst, 0x0, 0x0, 0x0)); READ_COLOR_("osd.active.label.text.color", "osd.label.text.color", theme->osd_color, RrColorCopy(theme->title_focused_color)); - READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color, + READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color, RrColorCopy(theme->title_unfocused_color)); READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color, RrColorNew(inst, 0xff, 0xff, 0xff)); - READ_COLOR("window.active.button.unpressed.image.color", - theme->titlebut_focused_unpressed_color, + 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)); - READ_COLOR("window.inactive.button.unpressed.image.color", - theme->titlebut_unfocused_unpressed_color, + READ_COLOR("window.inactive.button.unpressed.image.color", + theme->titlebut_unfocused_unpressed_color, RrColorNew(inst, 0xff, 0xff, 0xff)); - READ_COLOR("window.active.button.pressed.image.color", - theme->titlebut_focused_pressed_color, + READ_COLOR("window.active.button.pressed.image.color", + theme->titlebut_focused_pressed_color, RrColorCopy(theme->titlebut_focused_unpressed_color)); - READ_COLOR("window.inactive.button.pressed.image.color", - theme->titlebut_unfocused_pressed_color, + READ_COLOR("window.inactive.button.pressed.image.color", + theme->titlebut_unfocused_pressed_color, RrColorCopy(theme->titlebut_unfocused_unpressed_color)); - READ_COLOR("window.active.button.disabled.image.color", - theme->titlebut_disabled_focused_color, + READ_COLOR("window.active.button.disabled.image.color", + theme->titlebut_disabled_focused_color, RrColorNew(inst, 0xff, 0xff, 0xff)); - READ_COLOR("window.inactive.button.disabled.image.color", - theme->titlebut_disabled_unfocused_color, + READ_COLOR("window.inactive.button.disabled.image.color", + theme->titlebut_disabled_unfocused_color, RrColorNew(inst, 0, 0, 0)); - READ_COLOR("window.active.button.hover.image.color", - theme->titlebut_hover_focused_color, + READ_COLOR("window.active.button.hover.image.color", + theme->titlebut_hover_focused_color, RrColorCopy(theme->titlebut_focused_unpressed_color)); - READ_COLOR("window.inactive.button.hover.image.color", - theme->titlebut_hover_unfocused_color, + READ_COLOR("window.inactive.button.hover.image.color", + theme->titlebut_hover_unfocused_color, RrColorCopy(theme->titlebut_unfocused_unpressed_color)); - READ_COLOR_("window.active.button.toggled.unpressed.image.color", - "window.active.button.toggled.image.color", - theme->titlebut_toggled_focused_unpressed_color, + READ_COLOR_("window.active.button.toggled.unpressed.image.color", + "window.active.button.toggled.image.color", + theme->titlebut_toggled_focused_unpressed_color, RrColorCopy(theme->titlebut_focused_pressed_color)); - READ_COLOR_("window.inactive.button.toggled.unpressed.image.color", - "window.inactive.button.toggled.image.color", - theme->titlebut_toggled_unfocused_unpressed_color, + READ_COLOR_("window.inactive.button.toggled.unpressed.image.color", + "window.inactive.button.toggled.image.color", + theme->titlebut_toggled_unfocused_unpressed_color, RrColorCopy(theme->titlebut_unfocused_pressed_color)); - READ_COLOR("window.active.button.toggled.hover.image.color", - theme->titlebut_toggled_hover_focused_color, + READ_COLOR("window.active.button.toggled.hover.image.color", + theme->titlebut_toggled_hover_focused_color, RrColorCopy(theme->titlebut_toggled_focused_unpressed_color)); - - READ_COLOR("window.inactive.button.toggled.hover.image.color", - theme->titlebut_toggled_hover_unfocused_color, + + READ_COLOR("window.inactive.button.toggled.hover.image.color", + theme->titlebut_toggled_hover_unfocused_color, RrColorCopy(theme->titlebut_toggled_unfocused_unpressed_color)); - - READ_COLOR("window.active.button.toggled.pressed.image.color", - theme->titlebut_toggled_focused_pressed_color, + + READ_COLOR("window.active.button.toggled.pressed.image.color", + theme->titlebut_toggled_focused_pressed_color, RrColorCopy(theme->titlebut_focused_pressed_color)); - READ_COLOR("window.inactive.button.toggled.pressed.image.color", - theme->titlebut_toggled_unfocused_pressed_color, + READ_COLOR("window.inactive.button.toggled.pressed.image.color", + theme->titlebut_toggled_unfocused_pressed_color, RrColorCopy(theme->titlebut_unfocused_pressed_color)); - READ_COLOR("menu.title.text.color", theme->menu_title_color, + READ_COLOR("menu.title.text.color", theme->menu_title_color, RrColorNew(inst, 0, 0, 0)); - - READ_COLOR("menu.items.text.color", theme->menu_color, + + READ_COLOR("menu.items.text.color", theme->menu_color, RrColorNew(inst, 0xff, 0xff, 0xff)); - - READ_COLOR("menu.items.disabled.text.color", theme->menu_disabled_color, + + READ_COLOR("menu.items.disabled.text.color", theme->menu_disabled_color, RrColorNew(inst, 0, 0, 0)); - READ_COLOR("menu.items.active.disabled.text.color", - theme->menu_disabled_selected_color, + READ_COLOR("menu.items.active.disabled.text.color", + theme->menu_disabled_selected_color, RrColorCopy(theme->menu_disabled_color)); - READ_COLOR("menu.items.active.text.color", theme->menu_selected_color, + READ_COLOR("menu.items.active.text.color", theme->menu_selected_color, RrColorNew(inst, 0, 0, 0)); READ_COLOR("menu.separator.color", theme->menu_sep_color, @@ -373,21 +377,28 @@ 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; if (!read_mask(inst, path, theme, "desk.xbm", &theme->desk_mask)) { @@ -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)) @@ -458,20 +483,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* read the decoration textures */ READ_APPEARANCE("window.active.title.bg", theme->a_focused_title, FALSE); - READ_APPEARANCE("window.inactive.title.bg", theme->a_unfocused_title, + READ_APPEARANCE("window.inactive.title.bg", theme->a_unfocused_title, FALSE); READ_APPEARANCE("window.active.label.bg", theme->a_focused_label, TRUE); - READ_APPEARANCE("window.inactive.label.bg", theme->a_unfocused_label, + READ_APPEARANCE("window.inactive.label.bg", theme->a_unfocused_label, TRUE); READ_APPEARANCE("window.active.handle.bg", theme->a_focused_handle, FALSE); - READ_APPEARANCE("window.inactive.handle.bg",theme->a_unfocused_handle, + READ_APPEARANCE("window.inactive.handle.bg",theme->a_unfocused_handle, FALSE); READ_APPEARANCE("window.active.grip.bg", theme->a_focused_grip, TRUE); READ_APPEARANCE("window.inactive.grip.bg", theme->a_unfocused_grip, TRUE); READ_APPEARANCE("menu.items.bg", theme->a_menu, FALSE); READ_APPEARANCE("menu.title.bg", theme->a_menu_title, TRUE); READ_APPEARANCE("menu.items.active.bg", theme->a_menu_selected, TRUE); - + theme->a_menu_disabled_selected = RrAppearanceCopy(theme->a_menu_selected); @@ -512,50 +537,50 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, } /* read buttons textures */ - READ_APPEARANCE("window.active.button.disabled.bg", + READ_APPEARANCE("window.active.button.disabled.bg", theme->a_disabled_focused_max, TRUE); - READ_APPEARANCE("window.inactive.button.disabled.bg", + READ_APPEARANCE("window.inactive.button.disabled.bg", theme->a_disabled_unfocused_max, TRUE); - READ_APPEARANCE("window.active.button.pressed.bg", + READ_APPEARANCE("window.active.button.pressed.bg", theme->a_focused_pressed_max, TRUE); - READ_APPEARANCE("window.inactive.button.pressed.bg", + READ_APPEARANCE("window.inactive.button.pressed.bg", theme->a_unfocused_pressed_max, TRUE); - READ_APPEARANCE_("window.active.button.toggled.unpressed.bg", - "window.active.button.toggled.bg", - theme->a_toggled_focused_unpressed_max, TRUE, + READ_APPEARANCE_("window.active.button.toggled.unpressed.bg", + "window.active.button.toggled.bg", + theme->a_toggled_focused_unpressed_max, TRUE, theme->a_focused_pressed_max); - READ_APPEARANCE_("window.inactive.button.toggled.unpressed.bg", - "window.inactive.button.toggled.bg", - theme->a_toggled_unfocused_unpressed_max, TRUE, + READ_APPEARANCE_("window.inactive.button.toggled.unpressed.bg", + "window.inactive.button.toggled.bg", + theme->a_toggled_unfocused_unpressed_max, TRUE, theme->a_unfocused_pressed_max); - READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg", - theme->a_toggled_hover_focused_max, TRUE, + READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg", + theme->a_toggled_hover_focused_max, TRUE, theme->a_toggled_focused_unpressed_max); - READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg", - theme->a_toggled_hover_unfocused_max, TRUE, + READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg", + theme->a_toggled_hover_unfocused_max, TRUE, theme->a_toggled_unfocused_unpressed_max); - READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg", - theme->a_toggled_focused_pressed_max, TRUE, + READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg", + theme->a_toggled_focused_pressed_max, TRUE, theme->a_focused_pressed_max); - READ_APPEARANCE_COPY("window.inactive.button.toggled.pressed.bg", - theme->a_toggled_unfocused_pressed_max, TRUE, + READ_APPEARANCE_COPY("window.inactive.button.toggled.pressed.bg", + theme->a_toggled_unfocused_pressed_max, TRUE, theme->a_unfocused_pressed_max); - READ_APPEARANCE("window.active.button.unpressed.bg", + READ_APPEARANCE("window.active.button.unpressed.bg", theme->a_focused_unpressed_max, TRUE); - READ_APPEARANCE("window.inactive.button.unpressed.bg", + READ_APPEARANCE("window.inactive.button.unpressed.bg", theme->a_unfocused_unpressed_max, TRUE); - READ_APPEARANCE_COPY("window.active.button.hover.bg", - theme->a_hover_focused_max, TRUE, + READ_APPEARANCE_COPY("window.active.button.hover.bg", + theme->a_hover_focused_max, TRUE, theme->a_focused_unpressed_max); - READ_APPEARANCE_COPY("window.inactive.button.hover.bg", - theme->a_hover_unfocused_max, TRUE, + READ_APPEARANCE_COPY("window.inactive.button.hover.bg", + theme->a_hover_unfocused_max, TRUE, theme->a_unfocused_unpressed_max); - + theme->a_disabled_focused_close = RrAppearanceCopy(theme->a_disabled_focused_max); theme->a_disabled_unfocused_close = -- cgit v1.2.3 From 2338bf0aa35df0ed33e52a2b2eb9ef52ccd19a2c Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Tue, 12 Oct 2010 20:44:43 -0400 Subject: default for menu overlap --- obrender/theme.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 11b77228..07c99677 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -109,6 +109,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, RrFont *default_font = NULL; gchar *path; gboolean userdef; + gint menu_overlap = 0; if (name) { db = loaddb(name, &path); @@ -211,10 +212,9 @@ 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("menu.overlap", menu_overlap, -100, 100, 0); + READ_INT("menu.overlap.x", theme->menu_overlap_x, -100, 100, menu_overlap); + READ_INT("menu.overlap.y", theme->menu_overlap_y, -100, 100, menu_overlap); 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); @@ -356,7 +356,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, RrColorNew(inst, 0, 0, 0)); READ_COLOR("menu.separator.color", theme->menu_sep_color, - RrColorCopy(inst, theme->menu_color)); + RrColorCopy(theme->menu_color)); /* load the image masks */ -- cgit v1.2.3 From 01506d6a74b97d78748b0a5958959f459d44c656 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 30 Aug 2007 23:11:38 -0400 Subject: READ_COLOR macros done, RrColorCopy added, indentation fixed. --- obrender/theme.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 07c99677..b7ebbb0c 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -221,8 +221,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_INT("border.width", theme->fbwidth, 0, 100, 1); READ_INT("menu.border.width", theme->mbwidth, 0, 100, theme->fbwidth); READ_INT("osd.border.width", theme->obwidth, 0, 100, theme->fbwidth); - READ_INT("window.client.padding.width", theme->cbwidthx, 0, 100, theme->paddingx); - READ_INT("window.client.padding.height", theme->cbwidthy, 0, 100, theme->cbwidthx); READ_INT("menu.separator.width", theme->menu_sep_width, 1, 100, 1); READ_INT("menu.separator.padding.width", theme->menu_sep_paddingx, 0, 100, 6); READ_INT("menu.separator.padding.height", theme->menu_sep_paddingy, 0, 100, 3); @@ -357,7 +355,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_COLOR("menu.separator.color", theme->menu_sep_color, RrColorCopy(theme->menu_color)); - + /* load the image masks */ /* maximize button masks */ -- cgit v1.2.3 From b7350d3ebd40753efde31bb4fe4272a435cef7d7 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 13 Sep 2007 09:47:20 -0400 Subject: Temporary storage locations for texture reads. --- obrender/theme.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index b7ebbb0c..fcdab972 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -110,6 +110,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, gchar *path; gboolean userdef; gint menu_overlap = 0; + RrAppearance *a_disabled_focused_tmp; + RrAppearance *a_disabled_unfocused_tmp; + RrAppearance *a_hover_focused_tmp; + RrAppearance *a_hover_unfocused_tmp; + RrAppearance *a_focused_unpressed_tmp; + RrAppearance *a_focused_pressed_tmp; + RrAppearance *a_unfocused_unpressed_tmp; + RrAppearance *a_unfocused_pressed_tmp; + RrAppearance *a_toggled_hover_focused_tmp; + RrAppearance *a_toggled_hover_unfocused_tmp; + RrAppearance *a_toggled_focused_unpressed_tmp; + RrAppearance *a_toggled_focused_pressed_tmp; + RrAppearance *a_toggled_unfocused_unpressed_tmp; + RrAppearance *a_toggled_unfocused_pressed_tmp; if (name) { db = loaddb(name, &path); @@ -133,7 +147,24 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, return NULL; } - theme = g_slice_new0(RrTheme); + /* initialize temp reading textures */ + a_disabled_focused_tmp = RrAppearanceNew(inst, 1); + a_disabled_unfocused_tmp = RrAppearanceNew(inst, 1); + a_hover_focused_tmp = RrAppearanceNew(inst, 1); + a_hover_unfocused_tmp = RrAppearanceNew(inst, 1); + a_toggled_focused_unpressed_tmp = RrAppearanceNew(inst, 1); + a_toggled_unfocused_unpressed_tmp = RrAppearanceNew(inst, 1); + a_toggled_hover_focused_tmp = RrAppearanceNew(inst, 1); + a_toggled_hover_unfocused_tmp = RrAppearanceNew(inst, 1); + a_toggled_focused_pressed_tmp = RrAppearanceNew(inst, 1); + a_toggled_unfocused_pressed_tmp = RrAppearanceNew(inst, 1); + a_focused_unpressed_tmp = RrAppearanceNew(inst, 1); + a_focused_pressed_tmp = RrAppearanceNew(inst, 1); + a_unfocused_unpressed_tmp = RrAppearanceNew(inst, 1); + a_unfocused_pressed_tmp = RrAppearanceNew(inst, 1); + + /* initialize theme */ + theme = g_slice_new0(RrTheme, 1); theme->inst = inst; theme->name = g_strdup(name ? name : DEFAULT_THEME); @@ -1272,6 +1303,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->button_size = theme->label_height - 2; theme->grip_width = 25; + RrAppearanceFree(a_disabled_focused_tmp); + RrAppearanceFree(a_disabled_unfocused_tmp); + RrAppearanceFree(a_hover_focused_tmp); + RrAppearanceFree(a_hover_unfocused_tmp); + RrAppearanceFree(a_focused_unpressed_tmp); + RrAppearanceFree(a_focused_pressed_tmp); + RrAppearanceFree(a_unfocused_unpressed_tmp); + RrAppearanceFree(a_unfocused_pressed_tmp); + RrAppearanceFree(a_toggled_hover_focused_tmp); + RrAppearanceFree(a_toggled_hover_unfocused_tmp); + RrAppearanceFree(a_toggled_focused_unpressed_tmp); + RrAppearanceFree(a_toggled_focused_pressed_tmp); + RrAppearanceFree(a_toggled_unfocused_unpressed_tmp); + RrAppearanceFree(a_toggled_unfocused_pressed_tmp); + return theme; } -- cgit v1.2.3 From 2593c32930a36fe9a861cf309fc8484c0f9d38ff Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 13 Sep 2007 10:24:12 -0400 Subject: Read into _tmp RrAppearance, not theme->a_*_max --- obrender/theme.c | 150 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 83 insertions(+), 67 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index fcdab972..e927b82c 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -567,137 +567,153 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* read buttons textures */ READ_APPEARANCE("window.active.button.disabled.bg", - theme->a_disabled_focused_max, TRUE); + a_disabled_focused_tmp, TRUE); READ_APPEARANCE("window.inactive.button.disabled.bg", - theme->a_disabled_unfocused_max, TRUE); + a_disabled_unfocused_tmp, TRUE); READ_APPEARANCE("window.active.button.pressed.bg", - theme->a_focused_pressed_max, TRUE); + a_focused_pressed_tmp, TRUE); READ_APPEARANCE("window.inactive.button.pressed.bg", - theme->a_unfocused_pressed_max, TRUE); + a_unfocused_pressed_tmp, TRUE); READ_APPEARANCE_("window.active.button.toggled.unpressed.bg", "window.active.button.toggled.bg", - theme->a_toggled_focused_unpressed_max, TRUE, - theme->a_focused_pressed_max); + a_toggled_focused_unpressed_tmp, TRUE, + a_focused_pressed_tmp); READ_APPEARANCE_("window.inactive.button.toggled.unpressed.bg", "window.inactive.button.toggled.bg", - theme->a_toggled_unfocused_unpressed_max, TRUE, - theme->a_unfocused_pressed_max); + a_toggled_unfocused_unpressed_tmp, TRUE, + a_unfocused_pressed_tmp); READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg", - theme->a_toggled_hover_focused_max, TRUE, - theme->a_toggled_focused_unpressed_max); + a_toggled_hover_focused_tmp, TRUE, + a_toggled_focused_unpressed_tmp); READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg", - theme->a_toggled_hover_unfocused_max, TRUE, - theme->a_toggled_unfocused_unpressed_max); + a_toggled_hover_unfocused_tmp, TRUE, + a_toggled_unfocused_unpressed_tmp); READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg", - theme->a_toggled_focused_pressed_max, TRUE, - theme->a_focused_pressed_max); + a_toggled_focused_pressed_tmp, TRUE, + a_focused_pressed_tmp); READ_APPEARANCE_COPY("window.inactive.button.toggled.pressed.bg", - theme->a_toggled_unfocused_pressed_max, TRUE, - theme->a_unfocused_pressed_max); + a_toggled_unfocused_pressed_tmp, TRUE, + a_unfocused_pressed_tmp); READ_APPEARANCE("window.active.button.unpressed.bg", - theme->a_focused_unpressed_max, TRUE); + a_focused_unpressed_tmp, TRUE); READ_APPEARANCE("window.inactive.button.unpressed.bg", - theme->a_unfocused_unpressed_max, TRUE); + a_unfocused_unpressed_tmp, TRUE); READ_APPEARANCE_COPY("window.active.button.hover.bg", - theme->a_hover_focused_max, TRUE, - theme->a_focused_unpressed_max); + a_hover_focused_tmp, TRUE, + a_focused_unpressed_tmp); READ_APPEARANCE_COPY("window.inactive.button.hover.bg", - theme->a_hover_unfocused_max, TRUE, - theme->a_unfocused_unpressed_max); - + a_hover_unfocused_tmp, TRUE, + a_unfocused_unpressed_tmp); + + theme->a_disabled_focused_max = + RrAppearanceCopy(a_disabled_focused_tmp); + theme->a_disabled_unfocused_max = + RrAppearanceCopy(a_disabled_unfocused_tmp); + theme->a_hover_focused_max = + RrAppearanceCopy(a_hover_focused_tmp); + theme->a_hover_unfocused_max = + RrAppearanceCopy(a_hover_unfocused_tmp); + theme->a_unfocused_unpressed_max = + RrAppearanceCopy(a_unfocused_unpressed_tmp); + theme->a_unfocused_pressed_max = + RrAppearanceCopy(a_unfocused_pressed_tmp); + theme->a_focused_unpressed_max = + RrAppearanceCopy(a_focused_unpressed_tmp); + theme->a_focused_pressed_max = + RrAppearanceCopy(a_focused_pressed_tmp); theme->a_disabled_focused_close = - RrAppearanceCopy(theme->a_disabled_focused_max); + RrAppearanceCopy(a_disabled_focused_tmp); theme->a_disabled_unfocused_close = - RrAppearanceCopy(theme->a_disabled_unfocused_max); + RrAppearanceCopy(a_disabled_unfocused_tmp); theme->a_hover_focused_close = - RrAppearanceCopy(theme->a_hover_focused_max); + RrAppearanceCopy(a_hover_focused_tmp); theme->a_hover_unfocused_close = - RrAppearanceCopy(theme->a_hover_unfocused_max); + RrAppearanceCopy(a_hover_unfocused_tmp); theme->a_unfocused_unpressed_close = - RrAppearanceCopy(theme->a_unfocused_unpressed_max); + RrAppearanceCopy(a_unfocused_unpressed_tmp); theme->a_unfocused_pressed_close = - RrAppearanceCopy(theme->a_unfocused_pressed_max); + RrAppearanceCopy(a_unfocused_pressed_tmp); theme->a_focused_unpressed_close = - RrAppearanceCopy(theme->a_focused_unpressed_max); + RrAppearanceCopy(a_focused_unpressed_tmp); theme->a_focused_pressed_close = - RrAppearanceCopy(theme->a_focused_pressed_max); + RrAppearanceCopy(a_focused_pressed_tmp); theme->a_disabled_focused_desk = - RrAppearanceCopy(theme->a_disabled_focused_max); + RrAppearanceCopy(a_disabled_focused_tmp); theme->a_disabled_unfocused_desk = - RrAppearanceCopy(theme->a_disabled_unfocused_max); + RrAppearanceCopy(a_disabled_unfocused_tmp); theme->a_hover_focused_desk = - RrAppearanceCopy(theme->a_hover_focused_max); + RrAppearanceCopy(a_hover_focused_tmp); theme->a_hover_unfocused_desk = - RrAppearanceCopy(theme->a_hover_unfocused_max); + RrAppearanceCopy(a_hover_unfocused_tmp); theme->a_toggled_hover_focused_desk = - RrAppearanceCopy(theme->a_toggled_hover_focused_max); + RrAppearanceCopy(a_toggled_hover_focused_tmp); theme->a_toggled_hover_unfocused_desk = - RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); + RrAppearanceCopy(a_toggled_hover_unfocused_tmp); theme->a_toggled_focused_unpressed_desk = - RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + RrAppearanceCopy(a_toggled_focused_unpressed_tmp); theme->a_toggled_unfocused_unpressed_desk = - RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + RrAppearanceCopy(a_toggled_unfocused_unpressed_tmp); theme->a_toggled_focused_pressed_desk = - RrAppearanceCopy(theme->a_toggled_focused_pressed_max); + RrAppearanceCopy(a_toggled_focused_pressed_tmp); theme->a_toggled_unfocused_pressed_desk = - RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); + RrAppearanceCopy(a_toggled_unfocused_pressed_tmp); theme->a_unfocused_unpressed_desk = - RrAppearanceCopy(theme->a_unfocused_unpressed_max); + RrAppearanceCopy(a_unfocused_unpressed_tmp); theme->a_unfocused_pressed_desk = - RrAppearanceCopy(theme->a_unfocused_pressed_max); + RrAppearanceCopy(a_unfocused_pressed_tmp); theme->a_focused_unpressed_desk = - RrAppearanceCopy(theme->a_focused_unpressed_max); + RrAppearanceCopy(a_focused_unpressed_tmp); theme->a_focused_pressed_desk = - RrAppearanceCopy(theme->a_focused_pressed_max); + RrAppearanceCopy(a_focused_pressed_tmp); theme->a_disabled_focused_shade = - RrAppearanceCopy(theme->a_disabled_focused_max); + RrAppearanceCopy(a_disabled_focused_tmp); theme->a_disabled_unfocused_shade = - RrAppearanceCopy(theme->a_disabled_unfocused_max); + RrAppearanceCopy(a_disabled_unfocused_tmp); theme->a_hover_focused_shade = - RrAppearanceCopy(theme->a_hover_focused_max); + RrAppearanceCopy(a_hover_focused_tmp); theme->a_hover_unfocused_shade = - RrAppearanceCopy(theme->a_hover_unfocused_max); + RrAppearanceCopy(a_hover_unfocused_tmp); theme->a_toggled_hover_focused_shade = - RrAppearanceCopy(theme->a_toggled_hover_focused_max); + RrAppearanceCopy(a_toggled_hover_focused_tmp); theme->a_toggled_hover_unfocused_shade = - RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); + RrAppearanceCopy(a_toggled_hover_unfocused_tmp); theme->a_toggled_focused_unpressed_shade = - RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + RrAppearanceCopy(a_toggled_focused_unpressed_tmp); theme->a_toggled_unfocused_unpressed_shade = - RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + RrAppearanceCopy(a_toggled_unfocused_unpressed_tmp); theme->a_toggled_focused_pressed_shade = - RrAppearanceCopy(theme->a_toggled_focused_pressed_max); + RrAppearanceCopy(a_toggled_focused_pressed_tmp); theme->a_toggled_unfocused_pressed_shade = - RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); + RrAppearanceCopy(a_toggled_unfocused_pressed_tmp); theme->a_unfocused_unpressed_shade = - RrAppearanceCopy(theme->a_unfocused_unpressed_max); + RrAppearanceCopy(a_unfocused_unpressed_tmp); theme->a_unfocused_pressed_shade = - RrAppearanceCopy(theme->a_unfocused_pressed_max); + RrAppearanceCopy(a_unfocused_pressed_tmp); theme->a_focused_unpressed_shade = - RrAppearanceCopy(theme->a_focused_unpressed_max); + RrAppearanceCopy(a_focused_unpressed_tmp); theme->a_focused_pressed_shade = - RrAppearanceCopy(theme->a_focused_pressed_max); + RrAppearanceCopy(a_focused_pressed_tmp); theme->a_disabled_focused_iconify = - RrAppearanceCopy(theme->a_disabled_focused_max); + RrAppearanceCopy(a_disabled_focused_tmp); theme->a_disabled_unfocused_iconify = - RrAppearanceCopy(theme->a_disabled_focused_max); + RrAppearanceCopy(a_disabled_focused_tmp); theme->a_hover_focused_iconify = - RrAppearanceCopy(theme->a_hover_focused_max); + RrAppearanceCopy(a_hover_focused_tmp); theme->a_hover_unfocused_iconify = - RrAppearanceCopy(theme->a_hover_unfocused_max); + RrAppearanceCopy(a_hover_unfocused_tmp); theme->a_unfocused_unpressed_iconify = - RrAppearanceCopy(theme->a_unfocused_unpressed_max); + RrAppearanceCopy(a_unfocused_unpressed_tmp); theme->a_unfocused_pressed_iconify = - RrAppearanceCopy(theme->a_unfocused_pressed_max); + RrAppearanceCopy(a_unfocused_pressed_tmp); theme->a_focused_unpressed_iconify = - RrAppearanceCopy(theme->a_focused_unpressed_max); + RrAppearanceCopy(a_focused_unpressed_tmp); theme->a_focused_pressed_iconify = - RrAppearanceCopy(theme->a_focused_pressed_max); + RrAppearanceCopy(a_focused_pressed_tmp); theme->a_icon->surface.grad = theme->a_clear->surface.grad = -- cgit v1.2.3 From b80a7fa01582371ba98d879b40f8d60edf925119 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 13 Sep 2007 13:03:25 -0400 Subject: Individual button appearances from the theme. --- obrender/theme.c | 289 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 185 insertions(+), 104 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index e927b82c..ca74a92d 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -610,110 +610,191 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, a_hover_unfocused_tmp, TRUE, a_unfocused_unpressed_tmp); - theme->a_disabled_focused_max = - RrAppearanceCopy(a_disabled_focused_tmp); - theme->a_disabled_unfocused_max = - RrAppearanceCopy(a_disabled_unfocused_tmp); - theme->a_hover_focused_max = - RrAppearanceCopy(a_hover_focused_tmp); - theme->a_hover_unfocused_max = - RrAppearanceCopy(a_hover_unfocused_tmp); - theme->a_unfocused_unpressed_max = - RrAppearanceCopy(a_unfocused_unpressed_tmp); - theme->a_unfocused_pressed_max = - RrAppearanceCopy(a_unfocused_pressed_tmp); - theme->a_focused_unpressed_max = - RrAppearanceCopy(a_focused_unpressed_tmp); - theme->a_focused_pressed_max = - RrAppearanceCopy(a_focused_pressed_tmp); - theme->a_disabled_focused_close = - RrAppearanceCopy(a_disabled_focused_tmp); - theme->a_disabled_unfocused_close = - RrAppearanceCopy(a_disabled_unfocused_tmp); - theme->a_hover_focused_close = - RrAppearanceCopy(a_hover_focused_tmp); - theme->a_hover_unfocused_close = - RrAppearanceCopy(a_hover_unfocused_tmp); - theme->a_unfocused_unpressed_close = - RrAppearanceCopy(a_unfocused_unpressed_tmp); - theme->a_unfocused_pressed_close = - RrAppearanceCopy(a_unfocused_pressed_tmp); - theme->a_focused_unpressed_close = - RrAppearanceCopy(a_focused_unpressed_tmp); - theme->a_focused_pressed_close = - RrAppearanceCopy(a_focused_pressed_tmp); - theme->a_disabled_focused_desk = - RrAppearanceCopy(a_disabled_focused_tmp); - theme->a_disabled_unfocused_desk = - RrAppearanceCopy(a_disabled_unfocused_tmp); - theme->a_hover_focused_desk = - RrAppearanceCopy(a_hover_focused_tmp); - theme->a_hover_unfocused_desk = - RrAppearanceCopy(a_hover_unfocused_tmp); - theme->a_toggled_hover_focused_desk = - RrAppearanceCopy(a_toggled_hover_focused_tmp); - theme->a_toggled_hover_unfocused_desk = - RrAppearanceCopy(a_toggled_hover_unfocused_tmp); - theme->a_toggled_focused_unpressed_desk = - RrAppearanceCopy(a_toggled_focused_unpressed_tmp); - theme->a_toggled_unfocused_unpressed_desk = - RrAppearanceCopy(a_toggled_unfocused_unpressed_tmp); - theme->a_toggled_focused_pressed_desk = - RrAppearanceCopy(a_toggled_focused_pressed_tmp); - theme->a_toggled_unfocused_pressed_desk = - RrAppearanceCopy(a_toggled_unfocused_pressed_tmp); - theme->a_unfocused_unpressed_desk = - RrAppearanceCopy(a_unfocused_unpressed_tmp); - theme->a_unfocused_pressed_desk = - RrAppearanceCopy(a_unfocused_pressed_tmp); - theme->a_focused_unpressed_desk = - RrAppearanceCopy(a_focused_unpressed_tmp); - theme->a_focused_pressed_desk = - RrAppearanceCopy(a_focused_pressed_tmp); - theme->a_disabled_focused_shade = - RrAppearanceCopy(a_disabled_focused_tmp); - theme->a_disabled_unfocused_shade = - RrAppearanceCopy(a_disabled_unfocused_tmp); - theme->a_hover_focused_shade = - RrAppearanceCopy(a_hover_focused_tmp); - theme->a_hover_unfocused_shade = - RrAppearanceCopy(a_hover_unfocused_tmp); - theme->a_toggled_hover_focused_shade = - RrAppearanceCopy(a_toggled_hover_focused_tmp); - theme->a_toggled_hover_unfocused_shade = - RrAppearanceCopy(a_toggled_hover_unfocused_tmp); - theme->a_toggled_focused_unpressed_shade = - RrAppearanceCopy(a_toggled_focused_unpressed_tmp); - theme->a_toggled_unfocused_unpressed_shade = - RrAppearanceCopy(a_toggled_unfocused_unpressed_tmp); - theme->a_toggled_focused_pressed_shade = - RrAppearanceCopy(a_toggled_focused_pressed_tmp); - theme->a_toggled_unfocused_pressed_shade = - RrAppearanceCopy(a_toggled_unfocused_pressed_tmp); - theme->a_unfocused_unpressed_shade = - RrAppearanceCopy(a_unfocused_unpressed_tmp); - theme->a_unfocused_pressed_shade = - RrAppearanceCopy(a_unfocused_pressed_tmp); - theme->a_focused_unpressed_shade = - RrAppearanceCopy(a_focused_unpressed_tmp); - theme->a_focused_pressed_shade = - RrAppearanceCopy(a_focused_pressed_tmp); - theme->a_disabled_focused_iconify = - RrAppearanceCopy(a_disabled_focused_tmp); - theme->a_disabled_unfocused_iconify = - RrAppearanceCopy(a_disabled_focused_tmp); - theme->a_hover_focused_iconify = - RrAppearanceCopy(a_hover_focused_tmp); - theme->a_hover_unfocused_iconify = - RrAppearanceCopy(a_hover_unfocused_tmp); - theme->a_unfocused_unpressed_iconify = - RrAppearanceCopy(a_unfocused_unpressed_tmp); - theme->a_unfocused_pressed_iconify = - RrAppearanceCopy(a_unfocused_pressed_tmp); - theme->a_focused_unpressed_iconify = - RrAppearanceCopy(a_focused_unpressed_tmp); - theme->a_focused_pressed_iconify = - RrAppearanceCopy(a_focused_pressed_tmp); + /* now do individual buttons, if specified */ + + /* max button */ + READ_APPEARANCE_COPY("window.active.button.max.disabled.bg", + theme->a_disabled_focused_max, TRUE, + a_disabled_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.max.disabled.bg", + theme->a_disabled_unfocused_max, TRUE, + a_disabled_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.max.pressed.bg", + theme->a_hover_focused_max, TRUE, + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.max.pressed.bg", + theme->a_hover_unfocused_max, TRUE, + a_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.max.unpressed.bg", + theme->a_focused_unpressed_max, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button.max.pressed.bg", + theme->a_focused_pressed_max, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.max.unpressed.bg", + theme->a_unfocused_unpressed_max, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.max.pressed.bg", + theme->a_unfocused_pressed_max, TRUE, + a_unfocused_pressed_tmp); + READ_APPEARANCE_COPY("window.active.button.max.toggled.hover.bg", + theme->a_toggled_hover_focused_max, TRUE, + a_toggled_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.max.toggled.hover.bg", + theme->a_toggled_hover_unfocused_max, TRUE, + a_toggled_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.max.toggled.unpressed.bg", + theme->a_toggled_focused_unpressed_max, TRUE, + a_toggled_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button.max.toggled.pressed.bg", + theme->a_toggled_focused_pressed_max, TRUE, + a_toggled_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.max.toggled.unpressed.bg", + theme->a_toggled_unfocused_unpressed_max, TRUE, + a_toggled_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.max.toggled.pressed.bg", + theme->a_toggled_unfocused_pressed_max, TRUE, + a_toggled_unfocused_pressed_tmp); + + /* close button */ + READ_APPEARANCE_COPY("window.active.button.close.disabled.bg", + theme->a_disabled_focused_close, TRUE, + a_disabled_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.close.disabled.bg", + theme->a_disabled_unfocused_close, TRUE, + a_disabled_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.close.hover.bg", + theme->a_hover_focused_close, TRUE, + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.close.hover.bg", + theme->a_hover_unfocused_close, TRUE, + a_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.close.unpressed.bg", + theme->a_focused_unpressed_close, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button.close.pressed.bg", + theme->a_focused_pressed_close, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.close.unpressed.bg", + theme->a_unfocused_unpressed_close, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.close.pressed.bg", + theme->a_unfocused_pressed_close, TRUE, + a_unfocused_pressed_tmp); + + /* desk button */ + READ_APPEARANCE_COPY("window.active.button.desk.disabled.bg", + theme->a_disabled_focused_desk, TRUE, + a_disabled_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.desk.disabled.bg", + theme->a_disabled_unfocused_desk, TRUE, + a_disabled_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.desk.pressed.bg", + theme->a_hover_focused_desk, TRUE, + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.desk.pressed.bg", + theme->a_hover_unfocused_desk, TRUE, + a_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.desk.unpressed.bg", + theme->a_focused_unpressed_desk, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button.desk.pressed.bg", + theme->a_focused_pressed_desk, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.desk.unpressed.bg", + theme->a_unfocused_unpressed_desk, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.desk.pressed.bg", + theme->a_unfocused_pressed_desk, TRUE, + a_unfocused_pressed_tmp); + READ_APPEARANCE_COPY("window.active.button.desk.toggled.hover.bg", + theme->a_toggled_hover_focused_desk, TRUE, + a_toggled_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.hover.bg", + theme->a_toggled_hover_unfocused_desk, TRUE, + a_toggled_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.desk.toggled.unpressed.bg", + theme->a_toggled_focused_unpressed_desk, TRUE, + a_toggled_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button.desk.toggled.pressed.bg", + theme->a_toggled_focused_pressed_desk, TRUE, + a_toggled_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.unpressed.bg", + theme->a_toggled_unfocused_unpressed_desk, TRUE, + a_toggled_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.pressed.bg", + theme->a_toggled_unfocused_pressed_desk, TRUE, + a_toggled_unfocused_pressed_tmp); + + /* shade button */ + READ_APPEARANCE_COPY("window.active.button.shade.disabled.bg", + theme->a_disabled_focused_shade, TRUE, + a_disabled_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.shade.disabled.bg", + theme->a_disabled_unfocused_shade, TRUE, + a_disabled_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.shade.pressed.bg", + theme->a_hover_focused_shade, TRUE, + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.shade.pressed.bg", + theme->a_hover_unfocused_shade, TRUE, + a_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.shade.unpressed.bg", + theme->a_focused_unpressed_shade, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button.shade.pressed.bg", + theme->a_focused_pressed_shade, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.shade.unpressed.bg", + theme->a_unfocused_unpressed_shade, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.shade.pressed.bg", + theme->a_unfocused_pressed_shade, TRUE, + a_unfocused_pressed_tmp); + READ_APPEARANCE_COPY("window.active.button.shade.toggled.hover.bg", + theme->a_toggled_hover_focused_shade, TRUE, + a_toggled_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.hover.bg", + theme->a_toggled_hover_unfocused_shade, TRUE, + a_toggled_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.shade.toggled.unpressed.bg", + theme->a_toggled_focused_unpressed_shade, TRUE, + a_toggled_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button.shade.toggled.pressed.bg", + theme->a_toggled_focused_pressed_shade, TRUE, + a_toggled_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.unpressed.bg", + theme->a_toggled_unfocused_unpressed_shade, TRUE, + a_toggled_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.pressed.bg", + theme->a_toggled_unfocused_pressed_shade, TRUE, + a_toggled_unfocused_pressed_tmp); + + /* iconify button */ + READ_APPEARANCE_COPY("window.active.button.iconify.disabled.bg", + theme->a_disabled_focused_iconify, TRUE, + a_disabled_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.iconify.disabled.bg", + theme->a_disabled_unfocused_iconify, TRUE, + a_disabled_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.iconify.hover.bg", + theme->a_hover_focused_iconify, TRUE, + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.iconify.hover.bg", + theme->a_hover_unfocused_iconify, TRUE, + a_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button.iconify.unpressed.bg", + theme->a_focused_unpressed_iconify, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button.iconify.pressed.bg", + theme->a_focused_pressed_iconify, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.iconify.unpressed.bg", + theme->a_unfocused_unpressed_iconify, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.iconify.pressed.bg", + theme->a_unfocused_pressed_iconify, TRUE, + a_unfocused_pressed_tmp); theme->a_icon->surface.grad = theme->a_clear->surface.grad = -- cgit v1.2.3 From cc0b1f756937bda7c7785b60b60ed61d08cf67e1 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 13 Sep 2007 14:43:02 -0400 Subject: Made specific buttons be button- instead of button. --- obrender/theme.c | 116 +++++++++++++++++++++++++++---------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index ca74a92d..03372f7d 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -613,186 +613,186 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* now do individual buttons, if specified */ /* max button */ - READ_APPEARANCE_COPY("window.active.button.max.disabled.bg", + READ_APPEARANCE_COPY("window.active.button-max.disabled.bg", theme->a_disabled_focused_max, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.disabled.bg", theme->a_disabled_unfocused_max, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.max.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-max.pressed.bg", theme->a_hover_focused_max, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg", theme->a_hover_unfocused_max, TRUE, a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.max.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg", theme->a_focused_unpressed_max, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.max.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-max.pressed.bg", theme->a_focused_pressed_max, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.unpressed.bg", theme->a_unfocused_unpressed_max, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg", theme->a_unfocused_pressed_max, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.max.toggled.hover.bg", + READ_APPEARANCE_COPY("window.active.button-max.toggled.hover.bg", theme->a_toggled_hover_focused_max, TRUE, a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.toggled.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.toggled.hover.bg", theme->a_toggled_hover_unfocused_max, TRUE, a_toggled_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.max.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-max.toggled.unpressed.bg", theme->a_toggled_focused_unpressed_max, TRUE, a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.max.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-max.toggled.pressed.bg", theme->a_toggled_focused_pressed_max, TRUE, a_toggled_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.toggled.unpressed.bg", theme->a_toggled_unfocused_unpressed_max, TRUE, a_toggled_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.toggled.pressed.bg", theme->a_toggled_unfocused_pressed_max, TRUE, a_toggled_unfocused_pressed_tmp); /* close button */ - READ_APPEARANCE_COPY("window.active.button.close.disabled.bg", + READ_APPEARANCE_COPY("window.active.button-close.disabled.bg", theme->a_disabled_focused_close, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button-close.disabled.bg", theme->a_disabled_unfocused_close, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.close.hover.bg", + READ_APPEARANCE_COPY("window.active.button-close.hover.bg", theme->a_hover_focused_close, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button-close.hover.bg", theme->a_hover_unfocused_close, TRUE, a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.close.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg", theme->a_focused_unpressed_close, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.close.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-close.pressed.bg", theme->a_focused_pressed_close, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-close.unpressed.bg", theme->a_unfocused_unpressed_close, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-close.pressed.bg", theme->a_unfocused_pressed_close, TRUE, a_unfocused_pressed_tmp); /* desk button */ - READ_APPEARANCE_COPY("window.active.button.desk.disabled.bg", + READ_APPEARANCE_COPY("window.active.button-desk.disabled.bg", theme->a_disabled_focused_desk, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.disabled.bg", theme->a_disabled_unfocused_desk, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg", theme->a_hover_focused_desk, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg", theme->a_hover_unfocused_desk, TRUE, a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg", theme->a_focused_unpressed_desk, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg", theme->a_focused_pressed_desk, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.unpressed.bg", theme->a_unfocused_unpressed_desk, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg", theme->a_unfocused_pressed_desk, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.toggled.hover.bg", + READ_APPEARANCE_COPY("window.active.button-desk.toggled.hover.bg", theme->a_toggled_hover_focused_desk, TRUE, a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.hover.bg", theme->a_toggled_hover_unfocused_desk, TRUE, a_toggled_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-desk.toggled.unpressed.bg", theme->a_toggled_focused_unpressed_desk, TRUE, a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-desk.toggled.pressed.bg", theme->a_toggled_focused_pressed_desk, TRUE, a_toggled_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.unpressed.bg", theme->a_toggled_unfocused_unpressed_desk, TRUE, a_toggled_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.pressed.bg", theme->a_toggled_unfocused_pressed_desk, TRUE, a_toggled_unfocused_pressed_tmp); /* shade button */ - READ_APPEARANCE_COPY("window.active.button.shade.disabled.bg", + READ_APPEARANCE_COPY("window.active.button-shade.disabled.bg", theme->a_disabled_focused_shade, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.disabled.bg", theme->a_disabled_unfocused_shade, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg", theme->a_hover_focused_shade, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg", theme->a_hover_unfocused_shade, TRUE, a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg", theme->a_focused_unpressed_shade, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg", theme->a_focused_pressed_shade, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.unpressed.bg", theme->a_unfocused_unpressed_shade, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg", theme->a_unfocused_pressed_shade, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.toggled.hover.bg", + READ_APPEARANCE_COPY("window.active.button-shade.toggled.hover.bg", theme->a_toggled_hover_focused_shade, TRUE, a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.hover.bg", theme->a_toggled_hover_unfocused_shade, TRUE, a_toggled_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-shade.toggled.unpressed.bg", theme->a_toggled_focused_unpressed_shade, TRUE, a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-shade.toggled.pressed.bg", theme->a_toggled_focused_pressed_shade, TRUE, a_toggled_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.unpressed.bg", theme->a_toggled_unfocused_unpressed_shade, TRUE, a_toggled_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.pressed.bg", theme->a_toggled_unfocused_pressed_shade, TRUE, a_toggled_unfocused_pressed_tmp); /* iconify button */ - READ_APPEARANCE_COPY("window.active.button.iconify.disabled.bg", + READ_APPEARANCE_COPY("window.active.button-iconify.disabled.bg", theme->a_disabled_focused_iconify, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button-iconify.disabled.bg", theme->a_disabled_unfocused_iconify, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.iconify.hover.bg", + READ_APPEARANCE_COPY("window.active.button-iconify.hover.bg", theme->a_hover_focused_iconify, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button-iconify.hover.bg", theme->a_hover_unfocused_iconify, TRUE, a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.iconify.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg", theme->a_focused_unpressed_iconify, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.iconify.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-iconify.pressed.bg", theme->a_focused_pressed_iconify, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-iconify.unpressed.bg", theme->a_unfocused_unpressed_iconify, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-iconify.pressed.bg", theme->a_unfocused_pressed_iconify, TRUE, a_unfocused_pressed_tmp); -- cgit v1.2.3 From ccd4d460e528b4d07b3f47640870382da69f41db Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 13 Sep 2007 16:09:43 -0400 Subject: Need to allocate appearances! --- obrender/theme.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 03372f7d..8481eee3 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -183,6 +183,50 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1); + theme->a_disabled_focused_desk = RrAppearanceNew(inst, 1); + theme->a_disabled_unfocused_desk = RrAppearanceNew(inst, 1); + theme->a_hover_focused_desk = RrAppearanceNew(inst, 1); + theme->a_hover_unfocused_desk = RrAppearanceNew(inst, 1); + theme->a_toggled_focused_unpressed_desk = RrAppearanceNew(inst, 1); + theme->a_toggled_unfocused_unpressed_desk = RrAppearanceNew(inst, 1); + theme->a_toggled_hover_focused_desk = RrAppearanceNew(inst, 1); + theme->a_toggled_hover_unfocused_desk = RrAppearanceNew(inst, 1); + theme->a_toggled_focused_pressed_desk = RrAppearanceNew(inst, 1); + theme->a_toggled_unfocused_pressed_desk = RrAppearanceNew(inst, 1); + theme->a_focused_unpressed_desk = RrAppearanceNew(inst, 1); + theme->a_focused_pressed_desk = RrAppearanceNew(inst, 1); + theme->a_unfocused_unpressed_desk = RrAppearanceNew(inst, 1); + theme->a_unfocused_pressed_desk = RrAppearanceNew(inst, 1); + theme->a_disabled_focused_shade = RrAppearanceNew(inst, 1); + theme->a_disabled_unfocused_shade = RrAppearanceNew(inst, 1); + theme->a_hover_focused_shade = RrAppearanceNew(inst, 1); + theme->a_hover_unfocused_shade = RrAppearanceNew(inst, 1); + theme->a_toggled_focused_unpressed_shade = RrAppearanceNew(inst, 1); + theme->a_toggled_unfocused_unpressed_shade = RrAppearanceNew(inst, 1); + theme->a_toggled_hover_focused_shade = RrAppearanceNew(inst, 1); + theme->a_toggled_hover_unfocused_shade = RrAppearanceNew(inst, 1); + theme->a_toggled_focused_pressed_shade = RrAppearanceNew(inst, 1); + theme->a_toggled_unfocused_pressed_shade = RrAppearanceNew(inst, 1); + theme->a_focused_unpressed_shade = RrAppearanceNew(inst, 1); + theme->a_focused_pressed_shade = RrAppearanceNew(inst, 1); + theme->a_unfocused_unpressed_shade = RrAppearanceNew(inst, 1); + theme->a_unfocused_pressed_shade = RrAppearanceNew(inst, 1); + theme->a_disabled_focused_close = RrAppearanceNew(inst, 1); + theme->a_disabled_unfocused_close = RrAppearanceNew(inst, 1); + theme->a_hover_focused_close = RrAppearanceNew(inst, 1); + theme->a_hover_unfocused_close = RrAppearanceNew(inst, 1); + theme->a_focused_unpressed_close = RrAppearanceNew(inst, 1); + theme->a_focused_pressed_close = RrAppearanceNew(inst, 1); + theme->a_unfocused_unpressed_close = RrAppearanceNew(inst, 1); + theme->a_unfocused_pressed_close = RrAppearanceNew(inst, 1); + theme->a_disabled_focused_iconify = RrAppearanceNew(inst, 1); + theme->a_disabled_unfocused_iconify = RrAppearanceNew(inst, 1); + theme->a_hover_focused_iconify = RrAppearanceNew(inst, 1); + theme->a_hover_unfocused_iconify = RrAppearanceNew(inst, 1); + theme->a_focused_unpressed_iconify = RrAppearanceNew(inst, 1); + theme->a_focused_pressed_iconify = RrAppearanceNew(inst, 1); + theme->a_unfocused_unpressed_iconify = RrAppearanceNew(inst, 1); + theme->a_unfocused_pressed_iconify = RrAppearanceNew(inst, 1); theme->a_focused_grip = RrAppearanceNew(inst, 0); theme->a_unfocused_grip = RrAppearanceNew(inst, 0); theme->a_focused_title = RrAppearanceNew(inst, 0); -- cgit v1.2.3 From ef8108695f2b205ecfaaa777f2605f108b93c8b4 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 13 Sep 2007 18:00:24 -0400 Subject: Found a bug in one of the specialized button textures. --- obrender/theme.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 8481eee3..2df78d50 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -663,10 +663,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_APPEARANCE_COPY("window.inactive.button-max.disabled.bg", theme->a_disabled_unfocused_max, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button-max.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-max.hover.bg", theme->a_hover_focused_max, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.hover.bg", theme->a_hover_unfocused_max, TRUE, a_hover_unfocused_tmp); READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg", @@ -733,10 +733,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_APPEARANCE_COPY("window.inactive.button-desk.disabled.bg", theme->a_disabled_unfocused_desk, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-desk.hover.bg", theme->a_hover_focused_desk, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.hover.bg", theme->a_hover_unfocused_desk, TRUE, a_hover_unfocused_tmp); READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg", @@ -777,10 +777,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_APPEARANCE_COPY("window.inactive.button-shade.disabled.bg", theme->a_disabled_unfocused_shade, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-shade.hover.bg", theme->a_hover_focused_shade, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.hover.bg", theme->a_hover_unfocused_shade, TRUE, a_hover_unfocused_tmp); READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg", -- cgit v1.2.3 From 9bc70d9373a5f5f467d4aa285c0233af949ebcd4 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 13 Sep 2007 22:25:24 -0400 Subject: Rearranged all button appearance reading for logical purposes, better defaults. --- obrender/theme.c | 288 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 162 insertions(+), 126 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 2df78d50..de33f1b3 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -610,15 +610,30 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, } /* read buttons textures */ - READ_APPEARANCE("window.active.button.disabled.bg", - a_disabled_focused_tmp, TRUE); - READ_APPEARANCE("window.inactive.button.disabled.bg", - a_disabled_unfocused_tmp, TRUE); + + /* bases: unpressed, pressed, disabled */ + READ_APPEARANCE("window.active.button.unpressed.bg", + a_focused_unpressed_tmp, TRUE); + READ_APPEARANCE("window.inactive.button.unpressed.bg", + a_unfocused_unpressed_tmp, TRUE); READ_APPEARANCE("window.active.button.pressed.bg", a_focused_pressed_tmp, TRUE); READ_APPEARANCE("window.inactive.button.pressed.bg", a_unfocused_pressed_tmp, TRUE); + READ_APPEARANCE("window.active.button.disabled.bg", + a_disabled_focused_tmp, TRUE); + READ_APPEARANCE("window.inactive.button.disabled.bg", + a_disabled_unfocused_tmp, TRUE); + + /* hover */ + READ_APPEARANCE_COPY("window.active.button.hover.bg", + a_hover_focused_tmp, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.hover.bg", + a_hover_unfocused_tmp, TRUE, + a_unfocused_unpressed_tmp); + /* toggled unpressed */ READ_APPEARANCE_("window.active.button.toggled.unpressed.bg", "window.active.button.toggled.bg", a_toggled_focused_unpressed_tmp, TRUE, @@ -628,13 +643,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, a_toggled_unfocused_unpressed_tmp, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg", - a_toggled_hover_focused_tmp, TRUE, - a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg", - a_toggled_hover_unfocused_tmp, TRUE, - a_toggled_unfocused_unpressed_tmp); - + /* toggled pressed */ READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg", a_toggled_focused_pressed_tmp, TRUE, a_focused_pressed_tmp); @@ -642,65 +651,84 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, a_toggled_unfocused_pressed_tmp, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE("window.active.button.unpressed.bg", - a_focused_unpressed_tmp, TRUE); - READ_APPEARANCE("window.inactive.button.unpressed.bg", - a_unfocused_unpressed_tmp, TRUE); + /* toggled hover */ + READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg", + a_toggled_hover_focused_tmp, TRUE, + a_toggled_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg", + a_toggled_hover_unfocused_tmp, TRUE, + a_toggled_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.hover.bg", - a_hover_focused_tmp, TRUE, - a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.hover.bg", - a_hover_unfocused_tmp, TRUE, - a_unfocused_unpressed_tmp); /* now do individual buttons, if specified */ /* max button */ + + /* bases: unpressed, pressed, disabled */ + READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg", + theme->a_focused_unpressed_max, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-max.unpressed.bg", + theme->a_unfocused_unpressed_max, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-max.pressed.bg", + theme->a_focused_pressed_max, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg", + theme->a_unfocused_pressed_max, TRUE, + a_unfocused_pressed_tmp); READ_APPEARANCE_COPY("window.active.button-max.disabled.bg", theme->a_disabled_focused_max, TRUE, a_disabled_focused_tmp); READ_APPEARANCE_COPY("window.inactive.button-max.disabled.bg", theme->a_disabled_unfocused_max, TRUE, a_disabled_unfocused_tmp); + + /* hover */ READ_APPEARANCE_COPY("window.active.button-max.hover.bg", theme->a_hover_focused_max, TRUE, - a_hover_focused_tmp); + theme->a_focused_unpressed_max); READ_APPEARANCE_COPY("window.inactive.button-max.hover.bg", theme->a_hover_unfocused_max, TRUE, - a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg", - theme->a_focused_unpressed_max, TRUE, - a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-max.pressed.bg", - theme->a_focused_pressed_max, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-max.unpressed.bg", - theme->a_unfocused_unpressed_max, TRUE, - a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg", - theme->a_unfocused_pressed_max, TRUE, - a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button-max.toggled.hover.bg", - theme->a_toggled_hover_focused_max, TRUE, - a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button-max.toggled.hover.bg", - theme->a_toggled_hover_unfocused_max, TRUE, - a_toggled_hover_unfocused_tmp); + theme->a_unfocused_unpressed_max); + + /* toggled unpressed */ READ_APPEARANCE_COPY("window.active.button-max.toggled.unpressed.bg", theme->a_toggled_focused_unpressed_max, TRUE, - a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-max.toggled.pressed.bg", - theme->a_toggled_focused_pressed_max, TRUE, - a_toggled_focused_pressed_tmp); + theme->a_focused_pressed_max); READ_APPEARANCE_COPY("window.inactive.button-max.toggled.unpressed.bg", theme->a_toggled_unfocused_unpressed_max, TRUE, - a_toggled_unfocused_unpressed_tmp); + theme->a_unfocused_pressed_max); + + /* toggled pressed */ + READ_APPEARANCE_COPY("window.active.button-max.toggled.pressed.bg", + theme->a_toggled_focused_pressed_max, TRUE, + theme->a_focused_pressed_max); READ_APPEARANCE_COPY("window.inactive.button-max.toggled.pressed.bg", theme->a_toggled_unfocused_pressed_max, TRUE, - a_toggled_unfocused_pressed_tmp); + theme->a_unfocused_pressed_max); + + /* toggled hover */ + READ_APPEARANCE_COPY("window.active.button-max.toggled.hover.bg", + theme->a_toggled_hover_focused_max, TRUE, + theme->a_toggled_focused_unpressed_max); + READ_APPEARANCE_COPY("window.inactive.button-max.toggled.hover.bg", + theme->a_toggled_hover_unfocused_max, TRUE, + theme->a_toggled_unfocused_unpressed_max); /* close button */ + READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg", + theme->a_focused_unpressed_close, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-close.unpressed.bg", + theme->a_unfocused_unpressed_close, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-close.pressed.bg", + theme->a_focused_pressed_close, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-close.pressed.bg", + theme->a_unfocused_pressed_close, TRUE, + a_unfocused_pressed_tmp); READ_APPEARANCE_COPY("window.active.button-close.disabled.bg", theme->a_disabled_focused_close, TRUE, a_disabled_focused_tmp); @@ -709,112 +737,132 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, a_disabled_unfocused_tmp); READ_APPEARANCE_COPY("window.active.button-close.hover.bg", theme->a_hover_focused_close, TRUE, - a_hover_focused_tmp); + theme->a_focused_unpressed_close); READ_APPEARANCE_COPY("window.inactive.button-close.hover.bg", theme->a_hover_unfocused_close, TRUE, - a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg", - theme->a_focused_unpressed_close, TRUE, + theme->a_unfocused_unpressed_close); + + /* desk button */ + + /* bases: unpressed, pressed, disabled */ + READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg", + theme->a_focused_unpressed_desk, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-close.pressed.bg", - theme->a_focused_pressed_close, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-close.unpressed.bg", - theme->a_unfocused_unpressed_close, TRUE, + READ_APPEARANCE_COPY("window.inactive.button-desk.unpressed.bg", + theme->a_unfocused_unpressed_desk, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-close.pressed.bg", - theme->a_unfocused_pressed_close, TRUE, + READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg", + theme->a_focused_pressed_desk, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg", + theme->a_unfocused_pressed_desk, TRUE, a_unfocused_pressed_tmp); - - /* desk button */ READ_APPEARANCE_COPY("window.active.button-desk.disabled.bg", theme->a_disabled_focused_desk, TRUE, a_disabled_focused_tmp); READ_APPEARANCE_COPY("window.inactive.button-desk.disabled.bg", theme->a_disabled_unfocused_desk, TRUE, a_disabled_unfocused_tmp); + + /* hover */ READ_APPEARANCE_COPY("window.active.button-desk.hover.bg", theme->a_hover_focused_desk, TRUE, - a_hover_focused_tmp); + theme->a_focused_unpressed_desk); READ_APPEARANCE_COPY("window.inactive.button-desk.hover.bg", theme->a_hover_unfocused_desk, TRUE, - a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg", - theme->a_focused_unpressed_desk, TRUE, - a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg", - theme->a_focused_pressed_desk, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-desk.unpressed.bg", - theme->a_unfocused_unpressed_desk, TRUE, - a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg", - theme->a_unfocused_pressed_desk, TRUE, - a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button-desk.toggled.hover.bg", - theme->a_toggled_hover_focused_desk, TRUE, - a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.hover.bg", - theme->a_toggled_hover_unfocused_desk, TRUE, - a_toggled_hover_unfocused_tmp); + theme->a_unfocused_unpressed_desk); + + /* toggled unpressed */ READ_APPEARANCE_COPY("window.active.button-desk.toggled.unpressed.bg", theme->a_toggled_focused_unpressed_desk, TRUE, - a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-desk.toggled.pressed.bg", - theme->a_toggled_focused_pressed_desk, TRUE, - a_toggled_focused_pressed_tmp); + theme->a_focused_pressed_desk); READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.unpressed.bg", theme->a_toggled_unfocused_unpressed_desk, TRUE, - a_toggled_unfocused_unpressed_tmp); + theme->a_unfocused_pressed_desk); + + /* toggled pressed */ + READ_APPEARANCE_COPY("window.active.button-desk.toggled.pressed.bg", + theme->a_toggled_focused_pressed_desk, TRUE, + theme->a_focused_pressed_desk); READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.pressed.bg", theme->a_toggled_unfocused_pressed_desk, TRUE, - a_toggled_unfocused_pressed_tmp); + theme->a_unfocused_pressed_desk); + + /* toggled hover */ + READ_APPEARANCE_COPY("window.active.button-desk.toggled.hover.bg", + theme->a_toggled_hover_focused_desk, TRUE, + theme->a_toggled_focused_unpressed_desk); + READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.hover.bg", + theme->a_toggled_hover_unfocused_desk, TRUE, + theme->a_toggled_unfocused_unpressed_desk); /* shade button */ + + /* bases: unpressed, pressed, disabled */ + READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg", + theme->a_focused_unpressed_shade, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-shade.unpressed.bg", + theme->a_unfocused_unpressed_shade, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg", + theme->a_focused_pressed_shade, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg", + theme->a_unfocused_pressed_shade, TRUE, + a_unfocused_pressed_tmp); READ_APPEARANCE_COPY("window.active.button-shade.disabled.bg", theme->a_disabled_focused_shade, TRUE, a_disabled_focused_tmp); READ_APPEARANCE_COPY("window.inactive.button-shade.disabled.bg", theme->a_disabled_unfocused_shade, TRUE, a_disabled_unfocused_tmp); + + /* hover */ READ_APPEARANCE_COPY("window.active.button-shade.hover.bg", theme->a_hover_focused_shade, TRUE, - a_hover_focused_tmp); + theme->a_focused_unpressed_shade); READ_APPEARANCE_COPY("window.inactive.button-shade.hover.bg", theme->a_hover_unfocused_shade, TRUE, - a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg", - theme->a_focused_unpressed_shade, TRUE, - a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg", - theme->a_focused_pressed_shade, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-shade.unpressed.bg", - theme->a_unfocused_unpressed_shade, TRUE, - a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg", - theme->a_unfocused_pressed_shade, TRUE, - a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button-shade.toggled.hover.bg", - theme->a_toggled_hover_focused_shade, TRUE, - a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.hover.bg", - theme->a_toggled_hover_unfocused_shade, TRUE, - a_toggled_hover_unfocused_tmp); + theme->a_unfocused_unpressed_shade); + + /* toggled unpressed */ READ_APPEARANCE_COPY("window.active.button-shade.toggled.unpressed.bg", theme->a_toggled_focused_unpressed_shade, TRUE, - a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-shade.toggled.pressed.bg", - theme->a_toggled_focused_pressed_shade, TRUE, - a_toggled_focused_pressed_tmp); + theme->a_focused_pressed_shade); READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.unpressed.bg", theme->a_toggled_unfocused_unpressed_shade, TRUE, - a_toggled_unfocused_unpressed_tmp); + theme->a_unfocused_pressed_shade); + + /* toggled pressed */ + READ_APPEARANCE_COPY("window.active.button-shade.toggled.pressed.bg", + theme->a_toggled_focused_pressed_shade, TRUE, + theme->a_focused_pressed_shade); READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.pressed.bg", theme->a_toggled_unfocused_pressed_shade, TRUE, - a_toggled_unfocused_pressed_tmp); + theme->a_unfocused_pressed_shade); + + /* toggled hover */ + READ_APPEARANCE_COPY("window.active.button-shade.toggled.hover.bg", + theme->a_toggled_hover_focused_shade, TRUE, + theme->a_toggled_focused_unpressed_shade); + READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.hover.bg", + theme->a_toggled_hover_unfocused_shade, TRUE, + theme->a_toggled_unfocused_unpressed_shade); /* iconify button */ + READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg", + theme->a_focused_unpressed_iconify, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-iconify.unpressed.bg", + theme->a_unfocused_unpressed_iconify, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-iconify.pressed.bg", + theme->a_focused_pressed_iconify, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-iconify.pressed.bg", + theme->a_unfocused_pressed_iconify, TRUE, + a_unfocused_pressed_tmp); READ_APPEARANCE_COPY("window.active.button-iconify.disabled.bg", theme->a_disabled_focused_iconify, TRUE, a_disabled_focused_tmp); @@ -823,22 +871,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, a_disabled_unfocused_tmp); READ_APPEARANCE_COPY("window.active.button-iconify.hover.bg", theme->a_hover_focused_iconify, TRUE, - a_hover_focused_tmp); + theme->a_focused_unpressed_iconify); READ_APPEARANCE_COPY("window.inactive.button-iconify.hover.bg", theme->a_hover_unfocused_iconify, TRUE, - a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg", - theme->a_focused_unpressed_iconify, TRUE, - a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-iconify.pressed.bg", - theme->a_focused_pressed_iconify, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-iconify.unpressed.bg", - theme->a_unfocused_unpressed_iconify, TRUE, - a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-iconify.pressed.bg", - theme->a_unfocused_pressed_iconify, TRUE, - a_unfocused_pressed_tmp); + theme->a_unfocused_unpressed_iconify); theme->a_icon->surface.grad = theme->a_clear->surface.grad = -- cgit v1.2.3 From b566d3fcfe7a23b0616d776fd2db17ef7461185e Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 13 Sep 2007 23:13:56 -0400 Subject: Another way of getting at button-*.toggled.unpressed (no unpressed needed). --- obrender/theme.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index de33f1b3..4b099890 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -693,12 +693,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_unfocused_unpressed_max); /* toggled unpressed */ - READ_APPEARANCE_COPY("window.active.button-max.toggled.unpressed.bg", - theme->a_toggled_focused_unpressed_max, TRUE, - theme->a_focused_pressed_max); - READ_APPEARANCE_COPY("window.inactive.button-max.toggled.unpressed.bg", - theme->a_toggled_unfocused_unpressed_max, TRUE, - theme->a_unfocused_pressed_max); + READ_APPEARANCE_("window.active.button-max.toggled.unpressed.bg", + "window.active.button-max.toggled.bg", + theme->a_toggled_focused_unpressed_max, TRUE, + theme->a_focused_pressed_max); + READ_APPEARANCE_("window.inactive.button-max.toggled.unpressed.bg", + "window.inactive.button-max.toggled.bg", + theme->a_toggled_unfocused_unpressed_max, TRUE, + theme->a_unfocused_pressed_max); /* toggled pressed */ READ_APPEARANCE_COPY("window.active.button-max.toggled.pressed.bg", @@ -773,12 +775,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_unfocused_unpressed_desk); /* toggled unpressed */ - READ_APPEARANCE_COPY("window.active.button-desk.toggled.unpressed.bg", - theme->a_toggled_focused_unpressed_desk, TRUE, - theme->a_focused_pressed_desk); - READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.unpressed.bg", - theme->a_toggled_unfocused_unpressed_desk, TRUE, - theme->a_unfocused_pressed_desk); + READ_APPEARANCE_("window.active.button-desk.toggled.unpressed.bg", + "window.active.button-desk.toggled.bg", + theme->a_toggled_focused_unpressed_desk, TRUE, + theme->a_focused_pressed_desk); + READ_APPEARANCE_("window.inactive.button-desk.toggled.unpressed.bg", + "window.inactive.button-desk.toggled.bg", + theme->a_toggled_unfocused_unpressed_desk, TRUE, + theme->a_unfocused_pressed_desk); /* toggled pressed */ READ_APPEARANCE_COPY("window.active.button-desk.toggled.pressed.bg", @@ -827,12 +831,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_unfocused_unpressed_shade); /* toggled unpressed */ - READ_APPEARANCE_COPY("window.active.button-shade.toggled.unpressed.bg", - theme->a_toggled_focused_unpressed_shade, TRUE, - theme->a_focused_pressed_shade); - READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.unpressed.bg", - theme->a_toggled_unfocused_unpressed_shade, TRUE, - theme->a_unfocused_pressed_shade); + READ_APPEARANCE_("window.active.button-shade.toggled.unpressed.bg", + "window.active.button-shade.toggled.bg", + theme->a_toggled_focused_unpressed_shade, TRUE, + theme->a_focused_pressed_shade); + READ_APPEARANCE_("window.inactive.button-shade.toggled.unpressed.bg", + "window.inactive.button-shade.toggled.bg", + theme->a_toggled_unfocused_unpressed_shade, TRUE, + theme->a_unfocused_pressed_shade); /* toggled pressed */ READ_APPEARANCE_COPY("window.active.button-shade.toggled.pressed.bg", -- cgit v1.2.3 From 5d7c022bb49c0e1825c1d573e5fb0925b36b9ae4 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Fri, 7 Dec 2007 16:43:12 -0500 Subject: (non-working) Getting theme started. Button textures read to the right place. --- obrender/theme.c | 369 +++++++++++++++++++++++++------------------------------ 1 file changed, 169 insertions(+), 200 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 4b099890..a2b45e60 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -169,64 +169,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->inst = inst; theme->name = g_strdup(name ? name : DEFAULT_THEME); - theme->a_disabled_focused_max = RrAppearanceNew(inst, 1); - theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1); - theme->a_hover_focused_max = RrAppearanceNew(inst, 1); - theme->a_hover_unfocused_max = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_unpressed_max = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_unpressed_max = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_focused_max = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_unfocused_max = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_disabled_focused_desk = RrAppearanceNew(inst, 1); - theme->a_disabled_unfocused_desk = RrAppearanceNew(inst, 1); - theme->a_hover_focused_desk = RrAppearanceNew(inst, 1); - theme->a_hover_unfocused_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_unpressed_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_unpressed_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_focused_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_unfocused_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_pressed_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_pressed_desk = RrAppearanceNew(inst, 1); - theme->a_focused_unpressed_desk = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_desk = RrAppearanceNew(inst, 1); - theme->a_unfocused_unpressed_desk = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_desk = RrAppearanceNew(inst, 1); - theme->a_disabled_focused_shade = RrAppearanceNew(inst, 1); - theme->a_disabled_unfocused_shade = RrAppearanceNew(inst, 1); - theme->a_hover_focused_shade = RrAppearanceNew(inst, 1); - theme->a_hover_unfocused_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_unpressed_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_unpressed_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_focused_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_unfocused_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_pressed_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_pressed_shade = RrAppearanceNew(inst, 1); - theme->a_focused_unpressed_shade = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_shade = RrAppearanceNew(inst, 1); - theme->a_unfocused_unpressed_shade = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_shade = RrAppearanceNew(inst, 1); - theme->a_disabled_focused_close = RrAppearanceNew(inst, 1); - theme->a_disabled_unfocused_close = RrAppearanceNew(inst, 1); - theme->a_hover_focused_close = RrAppearanceNew(inst, 1); - theme->a_hover_unfocused_close = RrAppearanceNew(inst, 1); - theme->a_focused_unpressed_close = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_close = RrAppearanceNew(inst, 1); - theme->a_unfocused_unpressed_close = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_close = RrAppearanceNew(inst, 1); - theme->a_disabled_focused_iconify = RrAppearanceNew(inst, 1); - theme->a_disabled_unfocused_iconify = RrAppearanceNew(inst, 1); - theme->a_hover_focused_iconify = RrAppearanceNew(inst, 1); - theme->a_hover_unfocused_iconify = RrAppearanceNew(inst, 1); - theme->a_focused_unpressed_iconify = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_iconify = RrAppearanceNew(inst, 1); - theme->a_unfocused_unpressed_iconify = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_iconify = RrAppearanceNew(inst, 1); + /* init buttons */ + theme->btn_max = RrButtonNew(inst); + theme->btn_close = RrButtonNew(inst); + theme->btn_desk = RrButtonNew(inst); + theme->btn_shade = RrButtonNew(inst); + theme->btn_iconify = RrButtonNew(inst); + + /* init appearances */ theme->a_focused_grip = RrAppearanceNew(inst, 0); theme->a_unfocused_grip = RrAppearanceNew(inst, 0); theme->a_focused_title = RrAppearanceNew(inst, 0); @@ -435,100 +385,104 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* maximize button masks */ userdef = TRUE; - if (!read_mask(inst, path, theme, "max.xbm", &theme->max_mask)) { + if (!read_mask(inst, path, theme, "max.xbm", &theme->btn_max->mask)) { guchar data[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; - theme->max_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme->btn_max->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); userdef = FALSE; } if (!read_mask(inst, path, theme, "max_toggled.xbm", - &theme->max_toggled_mask)) + &theme->btn_max->toggled_mask)) { if (userdef) - theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_mask); + theme->btn_max->toggled_mask = RrPixmapMaskCopy(theme->btn_max->mask); else { guchar data[] = { 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; - theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data); + theme->btn_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_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_pressed.xbm", theme->btn_max->pressed_mask, + theme->btn_max->mask); + READ_MASK_COPY("max_disabled.xbm", theme->btn_max->disabled_mask, + theme->btn_max->mask); + READ_MASK_COPY("max_hover.xbm", theme->btn_max->hover_mask, + theme->btn_max->mask); + READ_MASK_COPY("max_toggled_pressed.xbm", + theme->btn_max->toggled_pressed_mask, + theme->btn_max->toggled_mask); + READ_MASK_COPY("max_toggled_hover.xbm", + theme->btn_max->toggled_hover_mask, + theme->btn_max->toggled_mask); /* iconify button masks */ - if (!read_mask(inst, path, theme, "iconify.xbm", &theme->iconify_mask)) { + if (!read_mask(inst, path, theme, "iconify.xbm", &theme->btn_iconify->mask)) { guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; - theme->iconify_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme->btn_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->btn_iconify->pressed_mask, + theme->btn_iconify->mask); + READ_MASK_COPY("iconify_disabled.xbm", theme->btn_iconify->disabled_mask, + theme->btn_iconify->mask); + READ_MASK_COPY("iconify_hover.xbm", theme->btn_iconify->hover_mask, + theme->btn_iconify->mask); /* all desktops button masks */ userdef = TRUE; - if (!read_mask(inst, path, theme, "desk.xbm", &theme->desk_mask)) { + if (!read_mask(inst, path, theme, "desk.xbm", &theme->btn_desk->mask)) { guchar data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; - theme->desk_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme->btn_desk->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); userdef = FALSE; } if (!read_mask(inst, path, theme, "desk_toggled.xbm", - &theme->desk_toggled_mask)) { + &theme->btn_desk->toggled_mask)) { if (userdef) - theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_mask); + theme->btn_desk->toggled_mask = RrPixmapMaskCopy(theme->btn_desk->mask); else { guchar data[] = { 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 }; - theme->desk_toggled_mask = + theme->btn_desk->toggled_mask = 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_hover.xbm", theme->desk_hover_mask, theme->desk_mask); + READ_MASK_COPY("desk_pressed.xbm", theme->btn_desk->pressed_mask, + theme->btn_desk->mask); + READ_MASK_COPY("desk_disabled.xbm", theme->btn_desk->disabled_mask, + theme->btn_desk->mask); + READ_MASK_COPY("desk_hover.xbm", theme->btn_desk->hover_mask, theme->btn_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); + theme->btn_desk->toggled_pressed_mask, theme->btn_desk->toggled_mask); + READ_MASK_COPY("desk_toggled_hover.xbm", theme->btn_desk->toggled_hover_mask, + theme->btn_desk->toggled_mask); /* shade button masks */ - if (!read_mask(inst, path, theme, "shade.xbm", &theme->shade_mask)) { + if (!read_mask(inst, path, theme, "shade.xbm", &theme->btn_shade->mask)) { guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; - theme->shade_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme->btn_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.xbm", theme->btn_shade->toggled_mask, + theme->btn_shade->mask); + READ_MASK_COPY("shade_pressed.xbm", theme->btn_shade->pressed_mask, + theme->btn_shade->mask); + READ_MASK_COPY("shade_disabled.xbm", theme->btn_shade->disabled_mask, + theme->btn_shade->mask); + READ_MASK_COPY("shade_hover.xbm", theme->btn_shade->hover_mask, + theme->btn_shade->mask); READ_MASK_COPY("shade_toggled_pressed.xbm", - theme->shade_toggled_pressed_mask, - theme->shade_toggled_mask); + theme->btn_shade->toggled_pressed_mask, + theme->btn_shade->toggled_mask); READ_MASK_COPY("shade_toggled_hover.xbm", - theme->shade_toggled_hover_mask, theme->shade_toggled_mask); + theme->btn_shade->toggled_hover_mask, + theme->btn_shade->toggled_mask); /* close button masks */ - if (!read_mask(inst, path, theme, "close.xbm", &theme->close_mask)) { + if (!read_mask(inst, path, theme, "close.xbm", &theme->btn_close->mask)) { guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; - theme->close_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme->btn_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->btn_close->pressed_mask, + theme->btn_close->mask); + READ_MASK_COPY("close_disabled.xbm", theme->btn_close->disabled_mask, + theme->btn_close->mask); + READ_MASK_COPY("close_hover.xbm", theme->btn_close->hover_mask, + theme->btn_close->mask); /* submenu bullet mask */ if (!read_mask(inst, path, theme, "bullet.xbm", &theme->menu_bullet_mask)) @@ -554,6 +508,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH; theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT; + /* the toggled hover mask = the toggled unpressed mask (i.e. no change) */ + theme->btn_max->toggled_hover_mask = + RrPixmapMaskCopy(theme->btn_max->toggled_mask); + theme->btn_desk->toggled_hover_mask = + RrPixmapMaskCopy(theme->btn_desk->toggled_mask); + theme->btn_shade->toggled_hover_mask = + RrPixmapMaskCopy(theme->btn_shade->toggled_mask); + /* the toggled pressed mask = the toggled unpressed mask (i.e. no change)*/ + theme->btn_max->toggled_pressed_mask = + RrPixmapMaskCopy(theme->btn_max->toggled_mask); + theme->btn_desk->toggled_pressed_mask = + RrPixmapMaskCopy(theme->btn_desk->toggled_mask); + theme->btn_shade->toggled_pressed_mask = + RrPixmapMaskCopy(theme->btn_shade->toggled_mask); + /* read the decoration textures */ READ_APPEARANCE("window.active.title.bg", theme->a_focused_title, FALSE); READ_APPEARANCE("window.inactive.title.bg", theme->a_unfocused_title, @@ -666,221 +635,221 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* bases: unpressed, pressed, disabled */ READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg", - theme->a_focused_unpressed_max, TRUE, + theme->btn_max->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); READ_APPEARANCE_COPY("window.inactive.button-max.unpressed.bg", - theme->a_unfocused_unpressed_max, TRUE, + theme->btn_max->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); READ_APPEARANCE_COPY("window.active.button-max.pressed.bg", - theme->a_focused_pressed_max, TRUE, + theme->btn_max->a_focused_pressed, TRUE, a_focused_pressed_tmp); READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg", - theme->a_unfocused_pressed_max, TRUE, + theme->btn_max->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); READ_APPEARANCE_COPY("window.active.button-max.disabled.bg", - theme->a_disabled_focused_max, TRUE, + theme->btn_max->a_disabled_focused, TRUE, a_disabled_focused_tmp); READ_APPEARANCE_COPY("window.inactive.button-max.disabled.bg", - theme->a_disabled_unfocused_max, TRUE, + theme->btn_max->a_disabled_unfocused, TRUE, a_disabled_unfocused_tmp); /* hover */ READ_APPEARANCE_COPY("window.active.button-max.hover.bg", - theme->a_hover_focused_max, TRUE, - theme->a_focused_unpressed_max); + theme->btn_max->a_hover_focused, TRUE, + theme->btn_max->a_focused_unpressed); READ_APPEARANCE_COPY("window.inactive.button-max.hover.bg", - theme->a_hover_unfocused_max, TRUE, - theme->a_unfocused_unpressed_max); + theme->btn_max->a_hover_unfocused, TRUE, + theme->btn_max->a_unfocused_unpressed); /* toggled unpressed */ READ_APPEARANCE_("window.active.button-max.toggled.unpressed.bg", "window.active.button-max.toggled.bg", - theme->a_toggled_focused_unpressed_max, TRUE, - theme->a_focused_pressed_max); + theme->btn_max->a_toggled_focused_unpressed, TRUE, + theme->btn_max->a_focused_pressed); READ_APPEARANCE_("window.inactive.button-max.toggled.unpressed.bg", "window.inactive.button-max.toggled.bg", - theme->a_toggled_unfocused_unpressed_max, TRUE, - theme->a_unfocused_pressed_max); + theme->btn_max->a_toggled_unfocused_unpressed, TRUE, + theme->btn_max->a_unfocused_pressed); /* toggled pressed */ READ_APPEARANCE_COPY("window.active.button-max.toggled.pressed.bg", - theme->a_toggled_focused_pressed_max, TRUE, - theme->a_focused_pressed_max); + theme->btn_max->a_toggled_focused_pressed, TRUE, + theme->btn_max->a_focused_pressed); READ_APPEARANCE_COPY("window.inactive.button-max.toggled.pressed.bg", - theme->a_toggled_unfocused_pressed_max, TRUE, - theme->a_unfocused_pressed_max); + theme->btn_max->a_toggled_unfocused_pressed, TRUE, + theme->btn_max->a_unfocused_pressed); /* toggled hover */ READ_APPEARANCE_COPY("window.active.button-max.toggled.hover.bg", - theme->a_toggled_hover_focused_max, TRUE, - theme->a_toggled_focused_unpressed_max); + theme->btn_max->a_toggled_hover_focused, TRUE, + theme->btn_max->a_toggled_focused_unpressed); READ_APPEARANCE_COPY("window.inactive.button-max.toggled.hover.bg", - theme->a_toggled_hover_unfocused_max, TRUE, - theme->a_toggled_unfocused_unpressed_max); + theme->btn_max->a_toggled_hover_unfocused, TRUE, + theme->btn_max->a_toggled_unfocused_unpressed); /* close button */ READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg", - theme->a_focused_unpressed_close, TRUE, + theme->btn_close->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); READ_APPEARANCE_COPY("window.inactive.button-close.unpressed.bg", - theme->a_unfocused_unpressed_close, TRUE, + theme->btn_close->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); READ_APPEARANCE_COPY("window.active.button-close.pressed.bg", - theme->a_focused_pressed_close, TRUE, + theme->btn_close->a_focused_pressed, TRUE, a_focused_pressed_tmp); READ_APPEARANCE_COPY("window.inactive.button-close.pressed.bg", - theme->a_unfocused_pressed_close, TRUE, + theme->btn_close->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); READ_APPEARANCE_COPY("window.active.button-close.disabled.bg", - theme->a_disabled_focused_close, TRUE, + theme->btn_close->a_disabled_focused, TRUE, a_disabled_focused_tmp); READ_APPEARANCE_COPY("window.inactive.button-close.disabled.bg", - theme->a_disabled_unfocused_close, TRUE, + theme->btn_close->a_disabled_unfocused, TRUE, a_disabled_unfocused_tmp); READ_APPEARANCE_COPY("window.active.button-close.hover.bg", - theme->a_hover_focused_close, TRUE, - theme->a_focused_unpressed_close); + theme->btn_close->a_hover_focused, TRUE, + theme->btn_close->a_focused_unpressed); READ_APPEARANCE_COPY("window.inactive.button-close.hover.bg", - theme->a_hover_unfocused_close, TRUE, - theme->a_unfocused_unpressed_close); + theme->btn_close->a_hover_unfocused, TRUE, + theme->btn_close->a_unfocused_unpressed); /* desk button */ /* bases: unpressed, pressed, disabled */ READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg", - theme->a_focused_unpressed_desk, TRUE, + theme->btn_desk->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); READ_APPEARANCE_COPY("window.inactive.button-desk.unpressed.bg", - theme->a_unfocused_unpressed_desk, TRUE, + theme->btn_desk->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg", - theme->a_focused_pressed_desk, TRUE, + theme->btn_desk->a_focused_pressed, TRUE, a_focused_pressed_tmp); READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg", - theme->a_unfocused_pressed_desk, TRUE, + theme->btn_desk->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); READ_APPEARANCE_COPY("window.active.button-desk.disabled.bg", - theme->a_disabled_focused_desk, TRUE, + theme->btn_desk->a_disabled_focused, TRUE, a_disabled_focused_tmp); READ_APPEARANCE_COPY("window.inactive.button-desk.disabled.bg", - theme->a_disabled_unfocused_desk, TRUE, + theme->btn_desk->a_disabled_unfocused, TRUE, a_disabled_unfocused_tmp); /* hover */ READ_APPEARANCE_COPY("window.active.button-desk.hover.bg", - theme->a_hover_focused_desk, TRUE, - theme->a_focused_unpressed_desk); + theme->btn_desk->a_hover_focused, TRUE, + theme->a_focused_unpressed); READ_APPEARANCE_COPY("window.inactive.button-desk.hover.bg", - theme->a_hover_unfocused_desk, TRUE, - theme->a_unfocused_unpressed_desk); + theme->btn_desk->a_hover_unfocused, TRUE, + theme->btn_desk->a_unfocused_unpressed); /* toggled unpressed */ READ_APPEARANCE_("window.active.button-desk.toggled.unpressed.bg", "window.active.button-desk.toggled.bg", - theme->a_toggled_focused_unpressed_desk, TRUE, - theme->a_focused_pressed_desk); + theme->btn_desk->a_toggled_focused_unpressed, TRUE, + theme->btn_desk->a_focused_pressed); READ_APPEARANCE_("window.inactive.button-desk.toggled.unpressed.bg", "window.inactive.button-desk.toggled.bg", - theme->a_toggled_unfocused_unpressed_desk, TRUE, - theme->a_unfocused_pressed_desk); + theme->btn_desk->a_toggled_unfocused_unpressed, TRUE, + theme->btn_desk->a_unfocused_pressed); /* toggled pressed */ READ_APPEARANCE_COPY("window.active.button-desk.toggled.pressed.bg", - theme->a_toggled_focused_pressed_desk, TRUE, - theme->a_focused_pressed_desk); + theme->btn_desk->a_toggled_focused_pressed, TRUE, + theme->btn_desk->a_focused_pressed); READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.pressed.bg", - theme->a_toggled_unfocused_pressed_desk, TRUE, - theme->a_unfocused_pressed_desk); + theme->btn_desk->a_toggled_unfocused_pressed, TRUE, + theme->btn_desk->a_unfocused_pressed); /* toggled hover */ READ_APPEARANCE_COPY("window.active.button-desk.toggled.hover.bg", - theme->a_toggled_hover_focused_desk, TRUE, - theme->a_toggled_focused_unpressed_desk); + theme->btn_desk->a_toggled_hover_focused, TRUE, + theme->btn_desk->a_toggled_focused_unpressed); READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.hover.bg", - theme->a_toggled_hover_unfocused_desk, TRUE, - theme->a_toggled_unfocused_unpressed_desk); + theme->btn_desk->a_toggled_hover_unfocused, TRUE, + theme->btn_desk->a_toggled_unfocused_unpressed); /* shade button */ /* bases: unpressed, pressed, disabled */ READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg", - theme->a_focused_unpressed_shade, TRUE, + theme->btn_shade->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); READ_APPEARANCE_COPY("window.inactive.button-shade.unpressed.bg", - theme->a_unfocused_unpressed_shade, TRUE, + theme->btn_shade->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg", - theme->a_focused_pressed_shade, TRUE, + theme->btn_shade->a_focused_pressed, TRUE, a_focused_pressed_tmp); READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg", - theme->a_unfocused_pressed_shade, TRUE, + theme->btn_shade->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); READ_APPEARANCE_COPY("window.active.button-shade.disabled.bg", - theme->a_disabled_focused_shade, TRUE, + theme->btn_shade->a_disabled_focused, TRUE, a_disabled_focused_tmp); READ_APPEARANCE_COPY("window.inactive.button-shade.disabled.bg", - theme->a_disabled_unfocused_shade, TRUE, + theme->btn_shade->a_disabled_unfocused, TRUE, a_disabled_unfocused_tmp); /* hover */ READ_APPEARANCE_COPY("window.active.button-shade.hover.bg", - theme->a_hover_focused_shade, TRUE, - theme->a_focused_unpressed_shade); + theme->btn_shade->a_hover_focused, TRUE, + theme->btn_shade->a_focused_unpressed); READ_APPEARANCE_COPY("window.inactive.button-shade.hover.bg", - theme->a_hover_unfocused_shade, TRUE, - theme->a_unfocused_unpressed_shade); + theme->btn_shade->a_hover_unfocused, TRUE, + theme->btn_shade->a_unfocused_unpressed); /* toggled unpressed */ READ_APPEARANCE_("window.active.button-shade.toggled.unpressed.bg", "window.active.button-shade.toggled.bg", - theme->a_toggled_focused_unpressed_shade, TRUE, - theme->a_focused_pressed_shade); + theme->btn_shade->a_toggled_focused_unpressed, TRUE, + theme->btn_shade->a_focused_pressed); READ_APPEARANCE_("window.inactive.button-shade.toggled.unpressed.bg", "window.inactive.button-shade.toggled.bg", - theme->a_toggled_unfocused_unpressed_shade, TRUE, - theme->a_unfocused_pressed_shade); + theme->btn_shade->a_toggled_unfocused_unpressed, TRUE, + theme->btn_shade->a_unfocused_pressed); /* toggled pressed */ READ_APPEARANCE_COPY("window.active.button-shade.toggled.pressed.bg", - theme->a_toggled_focused_pressed_shade, TRUE, - theme->a_focused_pressed_shade); + theme->btn_shade->a_toggled_focused_pressed, TRUE, + theme->btn_shade->a_focused_pressed); READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.pressed.bg", - theme->a_toggled_unfocused_pressed_shade, TRUE, - theme->a_unfocused_pressed_shade); + theme->btn_shade->a_toggled_unfocused_pressed, TRUE, + theme->btn_shade->a_unfocused_pressed); /* toggled hover */ READ_APPEARANCE_COPY("window.active.button-shade.toggled.hover.bg", - theme->a_toggled_hover_focused_shade, TRUE, - theme->a_toggled_focused_unpressed_shade); + theme->btn_shade->a_toggled_hover_focused, TRUE, + theme->btn_shade->a_toggled_focused_unpressed); READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.hover.bg", - theme->a_toggled_hover_unfocused_shade, TRUE, - theme->a_toggled_unfocused_unpressed_shade); + theme->btn_shade->a_toggled_hover_unfocused, TRUE, + theme->btn_shade->a_toggled_unfocused_unpressed); /* iconify button */ READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg", - theme->a_focused_unpressed_iconify, TRUE, + theme->btn_iconify->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); READ_APPEARANCE_COPY("window.inactive.button-iconify.unpressed.bg", - theme->a_unfocused_unpressed_iconify, TRUE, + theme->btn_iconify->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); READ_APPEARANCE_COPY("window.active.button-iconify.pressed.bg", - theme->a_focused_pressed_iconify, TRUE, + theme->btn_iconify->a_focused_pressed, TRUE, a_focused_pressed_tmp); READ_APPEARANCE_COPY("window.inactive.button-iconify.pressed.bg", - theme->a_unfocused_pressed_iconify, TRUE, + theme->btn_iconify->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); READ_APPEARANCE_COPY("window.active.button-iconify.disabled.bg", - theme->a_disabled_focused_iconify, TRUE, + theme->btn_iconify->a_disabled_focused, TRUE, a_disabled_focused_tmp); READ_APPEARANCE_COPY("window.inactive.button-iconify.disabled.bg", - theme->a_disabled_unfocused_iconify, TRUE, + theme->btn_iconify->a_disabled_unfocused, TRUE, a_disabled_unfocused_tmp); READ_APPEARANCE_COPY("window.active.button-iconify.hover.bg", - theme->a_hover_focused_iconify, TRUE, - theme->a_focused_unpressed_iconify); + theme->btn_iconify->a_hover_focused, TRUE, + theme->btn_iconify->a_focused_unpressed); READ_APPEARANCE_COPY("window.inactive.button-iconify.hover.bg", - theme->a_hover_unfocused_iconify, TRUE, - theme->a_unfocused_unpressed_iconify); + theme->btn_iconify->a_hover_unfocused, TRUE, + theme->btn_iconify->a_unfocused_unpressed); theme->a_icon->surface.grad = theme->a_clear->surface.grad = -- cgit v1.2.3 From 8058df3f7ce153e31cfebaa696a7e892999acb2b Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Wed, 12 Dec 2007 18:02:38 -0500 Subject: Buttons seem to work! --- obrender/theme.c | 445 ++++++++++++++++++++++++++----------------------------- 1 file changed, 211 insertions(+), 234 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index a2b45e60..fe43c1cf 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -738,7 +738,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* hover */ READ_APPEARANCE_COPY("window.active.button-desk.hover.bg", theme->btn_desk->a_hover_focused, TRUE, - theme->a_focused_unpressed); + theme->btn_desk->a_focused_unpressed); READ_APPEARANCE_COPY("window.inactive.button-desk.hover.bg", theme->btn_desk->a_hover_unfocused, TRUE, theme->btn_desk->a_unfocused_unpressed); @@ -1178,228 +1178,228 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_alpha = theme->menu_text_disabled_shadow_alpha; - theme->a_disabled_focused_max->texture[0].type = - theme->a_disabled_unfocused_max->texture[0].type = - theme->a_hover_focused_max->texture[0].type = - theme->a_hover_unfocused_max->texture[0].type = - theme->a_toggled_hover_focused_max->texture[0].type = - theme->a_toggled_hover_unfocused_max->texture[0].type = - theme->a_toggled_focused_unpressed_max->texture[0].type = - theme->a_toggled_unfocused_unpressed_max->texture[0].type = - theme->a_toggled_focused_pressed_max->texture[0].type = - theme->a_toggled_unfocused_pressed_max->texture[0].type = - theme->a_focused_unpressed_max->texture[0].type = - theme->a_focused_pressed_max->texture[0].type = - theme->a_unfocused_unpressed_max->texture[0].type = - theme->a_unfocused_pressed_max->texture[0].type = - theme->a_disabled_focused_close->texture[0].type = - theme->a_disabled_unfocused_close->texture[0].type = - theme->a_hover_focused_close->texture[0].type = - theme->a_hover_unfocused_close->texture[0].type = - theme->a_focused_unpressed_close->texture[0].type = - theme->a_focused_pressed_close->texture[0].type = - theme->a_unfocused_unpressed_close->texture[0].type = - theme->a_unfocused_pressed_close->texture[0].type = - theme->a_disabled_focused_desk->texture[0].type = - theme->a_disabled_unfocused_desk->texture[0].type = - theme->a_hover_focused_desk->texture[0].type = - theme->a_hover_unfocused_desk->texture[0].type = - theme->a_toggled_hover_focused_desk->texture[0].type = - theme->a_toggled_hover_unfocused_desk->texture[0].type = - theme->a_toggled_focused_unpressed_desk->texture[0].type = - theme->a_toggled_unfocused_unpressed_desk->texture[0].type = - theme->a_toggled_focused_pressed_desk->texture[0].type = - theme->a_toggled_unfocused_pressed_desk->texture[0].type = - theme->a_focused_unpressed_desk->texture[0].type = - theme->a_focused_pressed_desk->texture[0].type = - theme->a_unfocused_unpressed_desk->texture[0].type = - theme->a_unfocused_pressed_desk->texture[0].type = - theme->a_disabled_focused_shade->texture[0].type = - theme->a_disabled_unfocused_shade->texture[0].type = - theme->a_hover_focused_shade->texture[0].type = - theme->a_hover_unfocused_shade->texture[0].type = - theme->a_toggled_hover_focused_shade->texture[0].type = - theme->a_toggled_hover_unfocused_shade->texture[0].type = - theme->a_toggled_focused_unpressed_shade->texture[0].type = - theme->a_toggled_unfocused_unpressed_shade->texture[0].type = - theme->a_toggled_focused_pressed_shade->texture[0].type = - theme->a_toggled_unfocused_pressed_shade->texture[0].type = - theme->a_focused_unpressed_shade->texture[0].type = - theme->a_focused_pressed_shade->texture[0].type = - theme->a_unfocused_unpressed_shade->texture[0].type = - theme->a_unfocused_pressed_shade->texture[0].type = - theme->a_disabled_focused_iconify->texture[0].type = - theme->a_disabled_unfocused_iconify->texture[0].type = - theme->a_hover_focused_iconify->texture[0].type = - theme->a_hover_unfocused_iconify->texture[0].type = - theme->a_focused_unpressed_iconify->texture[0].type = - theme->a_focused_pressed_iconify->texture[0].type = - theme->a_unfocused_unpressed_iconify->texture[0].type = - theme->a_unfocused_pressed_iconify->texture[0].type = + theme->btn_max->a_disabled_focused->texture[0].type = + theme->btn_max->a_disabled_unfocused->texture[0].type = + theme->btn_max->a_hover_focused->texture[0].type = + theme->btn_max->a_hover_unfocused->texture[0].type = + theme->btn_max->a_toggled_hover_focused->texture[0].type = + theme->btn_max->a_toggled_hover_unfocused->texture[0].type = + theme->btn_max->a_toggled_focused_unpressed->texture[0].type = + theme->btn_max->a_toggled_unfocused_unpressed->texture[0].type = + theme->btn_max->a_toggled_focused_pressed->texture[0].type = + theme->btn_max->a_toggled_unfocused_pressed->texture[0].type = + theme->btn_max->a_focused_unpressed->texture[0].type = + theme->btn_max->a_focused_pressed->texture[0].type = + theme->btn_max->a_unfocused_unpressed->texture[0].type = + theme->btn_max->a_unfocused_pressed->texture[0].type = + theme->btn_close->a_disabled_focused->texture[0].type = + theme->btn_close->a_disabled_unfocused->texture[0].type = + theme->btn_close->a_hover_focused->texture[0].type = + theme->btn_close->a_hover_unfocused->texture[0].type = + theme->btn_close->a_focused_unpressed->texture[0].type = + theme->btn_close->a_focused_pressed->texture[0].type = + theme->btn_close->a_unfocused_unpressed->texture[0].type = + theme->btn_close->a_unfocused_pressed->texture[0].type = + theme->btn_desk->a_disabled_focused->texture[0].type = + theme->btn_desk->a_disabled_unfocused->texture[0].type = + theme->btn_desk->a_hover_focused->texture[0].type = + theme->btn_desk->a_hover_unfocused->texture[0].type = + theme->btn_desk->a_toggled_hover_focused->texture[0].type = + theme->btn_desk->a_toggled_hover_unfocused->texture[0].type = + theme->btn_desk->a_toggled_focused_unpressed->texture[0].type = + theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].type = + theme->btn_desk->a_toggled_focused_pressed->texture[0].type = + theme->btn_desk->a_toggled_unfocused_pressed->texture[0].type = + theme->btn_desk->a_focused_unpressed->texture[0].type = + theme->btn_desk->a_focused_pressed->texture[0].type = + theme->btn_desk->a_unfocused_unpressed->texture[0].type = + theme->btn_desk->a_unfocused_pressed->texture[0].type = + theme->btn_shade->a_disabled_focused->texture[0].type = + theme->btn_shade->a_disabled_unfocused->texture[0].type = + theme->btn_shade->a_hover_focused->texture[0].type = + theme->btn_shade->a_hover_unfocused->texture[0].type = + theme->btn_shade->a_toggled_hover_focused->texture[0].type = + theme->btn_shade->a_toggled_hover_unfocused->texture[0].type = + theme->btn_shade->a_toggled_focused_unpressed->texture[0].type = + theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].type = + theme->btn_shade->a_toggled_focused_pressed->texture[0].type = + theme->btn_shade->a_toggled_unfocused_pressed->texture[0].type = + theme->btn_shade->a_focused_unpressed->texture[0].type = + theme->btn_shade->a_focused_pressed->texture[0].type = + theme->btn_shade->a_unfocused_unpressed->texture[0].type = + theme->btn_shade->a_unfocused_pressed->texture[0].type = + theme->btn_iconify->a_disabled_focused->texture[0].type = + theme->btn_iconify->a_disabled_unfocused->texture[0].type = + theme->btn_iconify->a_hover_focused->texture[0].type = + theme->btn_iconify->a_hover_unfocused->texture[0].type = + theme->btn_iconify->a_focused_unpressed->texture[0].type = + theme->btn_iconify->a_focused_pressed->texture[0].type = + theme->btn_iconify->a_unfocused_unpressed->texture[0].type = + theme->btn_iconify->a_unfocused_pressed->texture[0].type = theme->a_menu_bullet_normal->texture[0].type = theme->a_menu_bullet_selected->texture[0].type = RR_TEXTURE_MASK; - theme->a_disabled_focused_max->texture[0].data.mask.mask = - theme->a_disabled_unfocused_max->texture[0].data.mask.mask = - theme->max_disabled_mask; - theme->a_hover_focused_max->texture[0].data.mask.mask = - theme->a_hover_unfocused_max->texture[0].data.mask.mask = - theme->max_hover_mask; - theme->a_focused_pressed_max->texture[0].data.mask.mask = - theme->a_unfocused_pressed_max->texture[0].data.mask.mask = - theme->max_pressed_mask; - theme->a_focused_unpressed_max->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = - theme->max_mask; - theme->a_toggled_hover_focused_max->texture[0].data.mask.mask = - theme->a_toggled_hover_unfocused_max->texture[0].data.mask.mask = - theme->max_toggled_hover_mask; - theme->a_toggled_focused_unpressed_max->texture[0].data.mask.mask = - theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.mask = - theme->max_toggled_mask; - theme->a_toggled_focused_pressed_max->texture[0].data.mask.mask = - theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.mask = - theme->max_toggled_pressed_mask; - theme->a_disabled_focused_close->texture[0].data.mask.mask = - theme->a_disabled_unfocused_close->texture[0].data.mask.mask = - theme->close_disabled_mask; - theme->a_hover_focused_close->texture[0].data.mask.mask = - theme->a_hover_unfocused_close->texture[0].data.mask.mask = - theme->close_hover_mask; - theme->a_focused_pressed_close->texture[0].data.mask.mask = - theme->a_unfocused_pressed_close->texture[0].data.mask.mask = - theme->close_pressed_mask; - theme->a_focused_unpressed_close->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_close->texture[0].data.mask.mask = - theme->close_mask; - theme->a_disabled_focused_desk->texture[0].data.mask.mask = - theme->a_disabled_unfocused_desk->texture[0].data.mask.mask = - theme->desk_disabled_mask; - theme->a_hover_focused_desk->texture[0].data.mask.mask = - theme->a_hover_unfocused_desk->texture[0].data.mask.mask = - theme->desk_hover_mask; - theme->a_focused_pressed_desk->texture[0].data.mask.mask = - theme->a_unfocused_pressed_desk->texture[0].data.mask.mask = - theme->desk_pressed_mask; - theme->a_focused_unpressed_desk->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = - theme->desk_mask; - theme->a_toggled_hover_focused_desk->texture[0].data.mask.mask = - theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.mask = - theme->desk_toggled_hover_mask; - theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.mask = - theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.mask = - theme->desk_toggled_mask; - theme->a_toggled_focused_pressed_desk->texture[0].data.mask.mask = - theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.mask = - theme->desk_toggled_pressed_mask; - theme->a_disabled_focused_shade->texture[0].data.mask.mask = - theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = - theme->shade_disabled_mask; - theme->a_hover_focused_shade->texture[0].data.mask.mask = - theme->a_hover_unfocused_shade->texture[0].data.mask.mask = - theme->shade_hover_mask; - theme->a_focused_pressed_shade->texture[0].data.mask.mask = - theme->a_unfocused_pressed_shade->texture[0].data.mask.mask = - theme->shade_pressed_mask; - theme->a_focused_unpressed_shade->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = - theme->shade_mask; - theme->a_toggled_hover_focused_shade->texture[0].data.mask.mask = - theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.mask = - theme->shade_toggled_hover_mask; - theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.mask = - theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.mask = - theme->shade_toggled_mask; - theme->a_toggled_focused_pressed_shade->texture[0].data.mask.mask = - theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.mask = - theme->shade_toggled_pressed_mask; - theme->a_disabled_focused_iconify->texture[0].data.mask.mask = - theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = - theme->iconify_disabled_mask; - theme->a_hover_focused_iconify->texture[0].data.mask.mask = - theme->a_hover_unfocused_iconify->texture[0].data.mask.mask = - theme->iconify_hover_mask; - theme->a_focused_pressed_iconify->texture[0].data.mask.mask = - theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask = - theme->iconify_pressed_mask; - theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = - theme->iconify_mask; + theme->btn_max->a_disabled_focused->texture[0].data.mask.mask = + theme->btn_max->a_disabled_unfocused->texture[0].data.mask.mask = + theme->btn_max->disabled_mask; + theme->btn_max->a_hover_focused->texture[0].data.mask.mask = + theme->btn_max->a_hover_unfocused->texture[0].data.mask.mask = + theme->btn_max->hover_mask; + theme->btn_max->a_focused_pressed->texture[0].data.mask.mask = + theme->btn_max->a_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_max->pressed_mask; + theme->btn_max->a_focused_unpressed->texture[0].data.mask.mask = + theme->btn_max->a_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_max->mask; + theme->btn_max->a_toggled_hover_focused->texture[0].data.mask.mask = + theme->btn_max->a_toggled_hover_unfocused->texture[0].data.mask.mask = + theme->btn_max->toggled_hover_mask; + theme->btn_max->a_toggled_focused_unpressed->texture[0].data.mask.mask = + theme->btn_max->a_toggled_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_max->toggled_mask; + theme->btn_max->a_toggled_focused_pressed->texture[0].data.mask.mask = + theme->btn_max->a_toggled_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_max->toggled_pressed_mask; + theme->btn_close->a_disabled_focused->texture[0].data.mask.mask = + theme->btn_close->a_disabled_unfocused->texture[0].data.mask.mask = + theme->btn_close->disabled_mask; + theme->btn_close->a_hover_focused->texture[0].data.mask.mask = + theme->btn_close->a_hover_unfocused->texture[0].data.mask.mask = + theme->btn_close->hover_mask; + theme->btn_close->a_focused_pressed->texture[0].data.mask.mask = + theme->btn_close->a_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_close->pressed_mask; + theme->btn_close->a_focused_unpressed->texture[0].data.mask.mask = + theme->btn_close->a_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_close->mask; + theme->btn_desk->a_disabled_focused->texture[0].data.mask.mask = + theme->btn_desk->a_disabled_unfocused->texture[0].data.mask.mask = + theme->btn_desk->disabled_mask; + theme->btn_desk->a_hover_focused->texture[0].data.mask.mask = + theme->btn_desk->a_hover_unfocused->texture[0].data.mask.mask = + theme->btn_desk->hover_mask; + theme->btn_desk->a_focused_pressed->texture[0].data.mask.mask = + theme->btn_desk->a_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_desk->pressed_mask; + theme->btn_desk->a_focused_unpressed->texture[0].data.mask.mask = + theme->btn_desk->a_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_desk->mask; + theme->btn_desk->a_toggled_hover_focused->texture[0].data.mask.mask = + theme->btn_desk->a_toggled_hover_unfocused->texture[0].data.mask.mask = + theme->btn_desk->toggled_hover_mask; + theme->btn_desk->a_toggled_focused_unpressed->texture[0].data.mask.mask = + theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_desk->toggled_mask; + theme->btn_desk->a_toggled_focused_pressed->texture[0].data.mask.mask = + theme->btn_desk->a_toggled_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_desk->toggled_pressed_mask; + theme->btn_shade->a_disabled_focused->texture[0].data.mask.mask = + theme->btn_shade->a_disabled_unfocused->texture[0].data.mask.mask = + theme->btn_shade->disabled_mask; + theme->btn_shade->a_hover_focused->texture[0].data.mask.mask = + theme->btn_shade->a_hover_unfocused->texture[0].data.mask.mask = + theme->btn_shade->hover_mask; + theme->btn_shade->a_focused_pressed->texture[0].data.mask.mask = + theme->btn_shade->a_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_shade->pressed_mask; + theme->btn_shade->a_focused_unpressed->texture[0].data.mask.mask = + theme->btn_shade->a_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_shade->mask; + theme->btn_shade->a_toggled_hover_focused->texture[0].data.mask.mask = + theme->btn_shade->a_toggled_hover_unfocused->texture[0].data.mask.mask = + theme->btn_shade->toggled_hover_mask; + theme->btn_shade->a_toggled_focused_unpressed->texture[0].data.mask.mask = + theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_shade->toggled_mask; + theme->btn_shade->a_toggled_focused_pressed->texture[0].data.mask.mask = + theme->btn_shade->a_toggled_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_shade->toggled_pressed_mask; + theme->btn_iconify->a_disabled_focused->texture[0].data.mask.mask = + theme->btn_iconify->a_disabled_unfocused->texture[0].data.mask.mask = + theme->btn_iconify->disabled_mask; + theme->btn_iconify->a_hover_focused->texture[0].data.mask.mask = + theme->btn_iconify->a_hover_unfocused->texture[0].data.mask.mask = + theme->btn_iconify->hover_mask; + theme->btn_iconify->a_focused_pressed->texture[0].data.mask.mask = + theme->btn_iconify->a_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_iconify->pressed_mask; + theme->btn_iconify->a_focused_unpressed->texture[0].data.mask.mask = + theme->btn_iconify->a_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_iconify->mask; theme->a_menu_bullet_normal->texture[0].data.mask.mask = theme->a_menu_bullet_selected->texture[0].data.mask.mask = theme->menu_bullet_mask; - theme->a_disabled_focused_max->texture[0].data.mask.color = - theme->a_disabled_focused_close->texture[0].data.mask.color = - theme->a_disabled_focused_desk->texture[0].data.mask.color = - theme->a_disabled_focused_shade->texture[0].data.mask.color = - theme->a_disabled_focused_iconify->texture[0].data.mask.color = + theme->btn_max->a_disabled_focused->texture[0].data.mask.color = + theme->btn_close->a_disabled_focused->texture[0].data.mask.color = + theme->btn_desk->a_disabled_focused->texture[0].data.mask.color = + theme->btn_shade->a_disabled_focused->texture[0].data.mask.color = + theme->btn_iconify->a_disabled_focused->texture[0].data.mask.color = theme->titlebut_disabled_focused_color; - theme->a_disabled_unfocused_max->texture[0].data.mask.color = - theme->a_disabled_unfocused_close->texture[0].data.mask.color = - theme->a_disabled_unfocused_desk->texture[0].data.mask.color = - theme->a_disabled_unfocused_shade->texture[0].data.mask.color = - theme->a_disabled_unfocused_iconify->texture[0].data.mask.color = + theme->btn_max->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_close->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_desk->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_shade->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_iconify->a_disabled_unfocused->texture[0].data.mask.color = theme->titlebut_disabled_unfocused_color; - theme->a_hover_focused_max->texture[0].data.mask.color = - theme->a_hover_focused_close->texture[0].data.mask.color = - theme->a_hover_focused_desk->texture[0].data.mask.color = - theme->a_hover_focused_shade->texture[0].data.mask.color = - theme->a_hover_focused_iconify->texture[0].data.mask.color = + theme->btn_max->a_hover_focused->texture[0].data.mask.color = + theme->btn_close->a_hover_focused->texture[0].data.mask.color = + theme->btn_desk->a_hover_focused->texture[0].data.mask.color = + theme->btn_shade->a_hover_focused->texture[0].data.mask.color = + theme->btn_iconify->a_hover_focused->texture[0].data.mask.color = theme->titlebut_hover_focused_color; - theme->a_hover_unfocused_max->texture[0].data.mask.color = - theme->a_hover_unfocused_close->texture[0].data.mask.color = - theme->a_hover_unfocused_desk->texture[0].data.mask.color = - theme->a_hover_unfocused_shade->texture[0].data.mask.color = - theme->a_hover_unfocused_iconify->texture[0].data.mask.color = + theme->btn_max->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_close->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_desk->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_shade->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_iconify->a_hover_unfocused->texture[0].data.mask.color = theme->titlebut_hover_unfocused_color; - theme->a_toggled_hover_focused_max->texture[0].data.mask.color = - theme->a_toggled_hover_focused_desk->texture[0].data.mask.color = - theme->a_toggled_hover_focused_shade->texture[0].data.mask.color = + theme->btn_max->a_toggled_hover_focused->texture[0].data.mask.color = + theme->btn_desk->a_toggled_hover_focused->texture[0].data.mask.color = + theme->btn_shade->a_toggled_hover_focused->texture[0].data.mask.color = theme->titlebut_toggled_hover_focused_color; - theme->a_toggled_hover_unfocused_max->texture[0].data.mask.color = - theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.color = - theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.color = + theme->btn_max->a_toggled_hover_unfocused->texture[0].data.mask.color = + theme->btn_desk->a_toggled_hover_unfocused->texture[0].data.mask.color = + theme->btn_shade->a_toggled_hover_unfocused->texture[0].data.mask.color = theme->titlebut_toggled_hover_unfocused_color; - theme->a_toggled_focused_unpressed_max->texture[0].data.mask.color = - theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.color = - theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.color = + theme->btn_max->a_toggled_focused_unpressed->texture[0].data.mask.color = + theme->btn_desk->a_toggled_focused_unpressed->texture[0].data.mask.color = + theme->btn_shade->a_toggled_focused_unpressed->texture[0].data.mask.color = theme->titlebut_toggled_focused_unpressed_color; - theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.color = - theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.color = - theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.color= + theme->btn_max->a_toggled_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].data.mask.color= theme->titlebut_toggled_unfocused_unpressed_color; - theme->a_toggled_focused_pressed_max->texture[0].data.mask.color = - theme->a_toggled_focused_pressed_desk->texture[0].data.mask.color = - theme->a_toggled_focused_pressed_shade->texture[0].data.mask.color = + theme->btn_max->a_toggled_focused_pressed->texture[0].data.mask.color = + theme->btn_desk->a_toggled_focused_pressed->texture[0].data.mask.color = + theme->btn_shade->a_toggled_focused_pressed->texture[0].data.mask.color = theme->titlebut_toggled_focused_pressed_color; - theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.color = - theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.color = - theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.color = + theme->btn_max->a_toggled_unfocused_pressed->texture[0].data.mask.color = + theme->btn_desk->a_toggled_unfocused_pressed->texture[0].data.mask.color = + theme->btn_shade->a_toggled_unfocused_pressed->texture[0].data.mask.color = theme->titlebut_toggled_unfocused_pressed_color; - theme->a_focused_unpressed_max->texture[0].data.mask.color = - theme->a_focused_unpressed_close->texture[0].data.mask.color = - theme->a_focused_unpressed_desk->texture[0].data.mask.color = - theme->a_focused_unpressed_shade->texture[0].data.mask.color = - theme->a_focused_unpressed_iconify->texture[0].data.mask.color = + theme->btn_max->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_close->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_desk->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_shade->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_iconify->a_focused_unpressed->texture[0].data.mask.color = theme->titlebut_focused_unpressed_color; - theme->a_focused_pressed_max->texture[0].data.mask.color = - theme->a_focused_pressed_close->texture[0].data.mask.color = - theme->a_focused_pressed_desk->texture[0].data.mask.color = - theme->a_focused_pressed_shade->texture[0].data.mask.color = - theme->a_focused_pressed_iconify->texture[0].data.mask.color = + theme->btn_max->a_focused_pressed->texture[0].data.mask.color = + theme->btn_close->a_focused_pressed->texture[0].data.mask.color = + theme->btn_desk->a_focused_pressed->texture[0].data.mask.color = + theme->btn_shade->a_focused_pressed->texture[0].data.mask.color = + theme->btn_iconify->a_focused_pressed->texture[0].data.mask.color = theme->titlebut_focused_pressed_color; - theme->a_unfocused_unpressed_max->texture[0].data.mask.color = - theme->a_unfocused_unpressed_close->texture[0].data.mask.color = - theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = - theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = - theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = + theme->btn_max->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_close->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_desk->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_shade->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_iconify->a_unfocused_unpressed->texture[0].data.mask.color = theme->titlebut_unfocused_unpressed_color; - theme->a_unfocused_pressed_max->texture[0].data.mask.color = - theme->a_unfocused_pressed_close->texture[0].data.mask.color = - theme->a_unfocused_pressed_desk->texture[0].data.mask.color = - theme->a_unfocused_pressed_shade->texture[0].data.mask.color = - theme->a_unfocused_pressed_iconify->texture[0].data.mask.color = + theme->btn_max->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_close->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_desk->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_shade->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_iconify->a_unfocused_pressed->texture[0].data.mask.color = theme->titlebut_unfocused_pressed_color; theme->a_menu_bullet_normal->texture[0].data.mask.color = theme->menu_color; @@ -1478,6 +1478,12 @@ void RrThemeFree(RrTheme *theme) if (theme) { g_free(theme->name); + RrButtonFree(theme->btn_max); + RrButtonFree(theme->btn_close); + RrButtonFree(theme->btn_desk); + RrButtonFree(theme->btn_shade); + RrButtonFree(theme->btn_iconify); + RrColorFree(theme->menu_border_color); RrColorFree(theme->osd_border_color); RrColorFree(theme->frame_focused_border_color); @@ -1521,36 +1527,7 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->menu_text_disabled_selected_shadow_color); g_free(theme->def_win_icon); - - RrPixmapMaskFree(theme->max_mask); - RrPixmapMaskFree(theme->max_toggled_mask); - RrPixmapMaskFree(theme->max_toggled_hover_mask); - RrPixmapMaskFree(theme->max_toggled_pressed_mask); - RrPixmapMaskFree(theme->max_disabled_mask); - RrPixmapMaskFree(theme->max_hover_mask); - RrPixmapMaskFree(theme->max_pressed_mask); - RrPixmapMaskFree(theme->desk_mask); - RrPixmapMaskFree(theme->desk_toggled_mask); - RrPixmapMaskFree(theme->desk_toggled_hover_mask); - RrPixmapMaskFree(theme->desk_toggled_pressed_mask); - RrPixmapMaskFree(theme->desk_disabled_mask); - RrPixmapMaskFree(theme->desk_hover_mask); - RrPixmapMaskFree(theme->desk_pressed_mask); - RrPixmapMaskFree(theme->shade_mask); - RrPixmapMaskFree(theme->shade_toggled_mask); - RrPixmapMaskFree(theme->shade_toggled_hover_mask); - RrPixmapMaskFree(theme->shade_toggled_pressed_mask); - RrPixmapMaskFree(theme->shade_disabled_mask); - RrPixmapMaskFree(theme->shade_hover_mask); - RrPixmapMaskFree(theme->shade_pressed_mask); - RrPixmapMaskFree(theme->iconify_mask); - RrPixmapMaskFree(theme->iconify_disabled_mask); - RrPixmapMaskFree(theme->iconify_hover_mask); - RrPixmapMaskFree(theme->iconify_pressed_mask); - RrPixmapMaskFree(theme->close_mask); - RrPixmapMaskFree(theme->close_disabled_mask); - RrPixmapMaskFree(theme->close_hover_mask); - RrPixmapMaskFree(theme->close_pressed_mask); + RrPixmapMaskFree(theme->menu_bullet_mask); RrPixmapMaskFree(theme->down_arrow_mask); RrPixmapMaskFree(theme->up_arrow_mask); -- cgit v1.2.3 From 3c8840a6ccd37d14ec0c1b25caa750b868240205 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 13 Dec 2007 09:12:15 -0500 Subject: Make the btn textures use their own image color. --- obrender/theme.c | 357 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 285 insertions(+), 72 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index fe43c1cf..442c8b89 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -45,6 +45,9 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, static int parse_inline_number(const char *p); static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static void set_default_appearance(RrAppearance *a); +static void read_button_colors(XrmDatabase db, const RrInstance *inst, + const RrTheme *theme, RrButton *btn, + const gchar *btnname); static RrFont *get_font(RrFont *target, RrFont **default_font, const RrInstance *inst) @@ -632,6 +635,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* now do individual buttons, if specified */ /* max button */ + read_button_colors(db, inst, theme, theme->btn_max, "max"); /* bases: unpressed, pressed, disabled */ READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg", @@ -688,6 +692,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->btn_max->a_toggled_unfocused_unpressed); /* close button */ + read_button_colors(db, inst, theme, theme->btn_close, "close"); + READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg", theme->btn_close->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); @@ -714,6 +720,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->btn_close->a_unfocused_unpressed); /* desk button */ + read_button_colors(db, inst, theme, theme->btn_desk, "desk"); /* bases: unpressed, pressed, disabled */ READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg", @@ -770,6 +777,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->btn_desk->a_toggled_unfocused_unpressed); /* shade button */ + read_button_colors(db, inst, theme, theme->btn_shade, "shade"); /* bases: unpressed, pressed, disabled */ READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg", @@ -826,6 +834,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->btn_shade->a_toggled_unfocused_unpressed); /* iconify button */ + read_button_colors(db, inst, theme, theme->btn_iconify, "iconify"); + READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg", theme->btn_iconify->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); @@ -1329,78 +1339,122 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_menu_bullet_normal->texture[0].data.mask.mask = theme->a_menu_bullet_selected->texture[0].data.mask.mask = theme->menu_bullet_mask; - theme->btn_max->a_disabled_focused->texture[0].data.mask.color = - theme->btn_close->a_disabled_focused->texture[0].data.mask.color = - theme->btn_desk->a_disabled_focused->texture[0].data.mask.color = - theme->btn_shade->a_disabled_focused->texture[0].data.mask.color = - theme->btn_iconify->a_disabled_focused->texture[0].data.mask.color = - theme->titlebut_disabled_focused_color; - theme->btn_max->a_disabled_unfocused->texture[0].data.mask.color = - theme->btn_close->a_disabled_unfocused->texture[0].data.mask.color = - theme->btn_desk->a_disabled_unfocused->texture[0].data.mask.color = - theme->btn_shade->a_disabled_unfocused->texture[0].data.mask.color = - theme->btn_iconify->a_disabled_unfocused->texture[0].data.mask.color = - theme->titlebut_disabled_unfocused_color; - theme->btn_max->a_hover_focused->texture[0].data.mask.color = - theme->btn_close->a_hover_focused->texture[0].data.mask.color = - theme->btn_desk->a_hover_focused->texture[0].data.mask.color = - theme->btn_shade->a_hover_focused->texture[0].data.mask.color = - theme->btn_iconify->a_hover_focused->texture[0].data.mask.color = - theme->titlebut_hover_focused_color; - theme->btn_max->a_hover_unfocused->texture[0].data.mask.color = - theme->btn_close->a_hover_unfocused->texture[0].data.mask.color = - theme->btn_desk->a_hover_unfocused->texture[0].data.mask.color = - theme->btn_shade->a_hover_unfocused->texture[0].data.mask.color = - theme->btn_iconify->a_hover_unfocused->texture[0].data.mask.color = - theme->titlebut_hover_unfocused_color; - theme->btn_max->a_toggled_hover_focused->texture[0].data.mask.color = - theme->btn_desk->a_toggled_hover_focused->texture[0].data.mask.color = - theme->btn_shade->a_toggled_hover_focused->texture[0].data.mask.color = - theme->titlebut_toggled_hover_focused_color; - theme->btn_max->a_toggled_hover_unfocused->texture[0].data.mask.color = - theme->btn_desk->a_toggled_hover_unfocused->texture[0].data.mask.color = - theme->btn_shade->a_toggled_hover_unfocused->texture[0].data.mask.color = - theme->titlebut_toggled_hover_unfocused_color; - theme->btn_max->a_toggled_focused_unpressed->texture[0].data.mask.color = - theme->btn_desk->a_toggled_focused_unpressed->texture[0].data.mask.color = - theme->btn_shade->a_toggled_focused_unpressed->texture[0].data.mask.color = - theme->titlebut_toggled_focused_unpressed_color; - theme->btn_max->a_toggled_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].data.mask.color= - theme->titlebut_toggled_unfocused_unpressed_color; - theme->btn_max->a_toggled_focused_pressed->texture[0].data.mask.color = - theme->btn_desk->a_toggled_focused_pressed->texture[0].data.mask.color = - theme->btn_shade->a_toggled_focused_pressed->texture[0].data.mask.color = - theme->titlebut_toggled_focused_pressed_color; - theme->btn_max->a_toggled_unfocused_pressed->texture[0].data.mask.color = - theme->btn_desk->a_toggled_unfocused_pressed->texture[0].data.mask.color = - theme->btn_shade->a_toggled_unfocused_pressed->texture[0].data.mask.color = - theme->titlebut_toggled_unfocused_pressed_color; - theme->btn_max->a_focused_unpressed->texture[0].data.mask.color = - theme->btn_close->a_focused_unpressed->texture[0].data.mask.color = - theme->btn_desk->a_focused_unpressed->texture[0].data.mask.color = - theme->btn_shade->a_focused_unpressed->texture[0].data.mask.color = - theme->btn_iconify->a_focused_unpressed->texture[0].data.mask.color = - theme->titlebut_focused_unpressed_color; - theme->btn_max->a_focused_pressed->texture[0].data.mask.color = - theme->btn_close->a_focused_pressed->texture[0].data.mask.color = - theme->btn_desk->a_focused_pressed->texture[0].data.mask.color = - theme->btn_shade->a_focused_pressed->texture[0].data.mask.color = - theme->btn_iconify->a_focused_pressed->texture[0].data.mask.color = - theme->titlebut_focused_pressed_color; - theme->btn_max->a_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_close->a_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_desk->a_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_shade->a_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_iconify->a_unfocused_unpressed->texture[0].data.mask.color = - theme->titlebut_unfocused_unpressed_color; - theme->btn_max->a_unfocused_pressed->texture[0].data.mask.color = - theme->btn_close->a_unfocused_pressed->texture[0].data.mask.color = - theme->btn_desk->a_unfocused_pressed->texture[0].data.mask.color = - theme->btn_shade->a_unfocused_pressed->texture[0].data.mask.color = - theme->btn_iconify->a_unfocused_pressed->texture[0].data.mask.color = - theme->titlebut_unfocused_pressed_color; + theme->btn_max->a_disabled_focused->texture[0].data.mask.color = + theme->btn_max->disabled_focused_color; + theme->btn_close->a_disabled_focused->texture[0].data.mask.color = + theme->btn_close->disabled_focused_color; + theme->btn_desk->a_disabled_focused->texture[0].data.mask.color = + theme->btn_desk->disabled_focused_color; + theme->btn_shade->a_disabled_focused->texture[0].data.mask.color = + theme->btn_shade->disabled_focused_color; + theme->btn_iconify->a_disabled_focused->texture[0].data.mask.color = + theme->btn_iconify->disabled_focused_color; + theme->btn_max->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_max->disabled_unfocused_color; + theme->btn_close->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_close->disabled_unfocused_color; + theme->btn_desk->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_desk->disabled_unfocused_color; + theme->btn_shade->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_shade->disabled_unfocused_color; + theme->btn_iconify->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_iconify->disabled_unfocused_color; + theme->btn_max->a_hover_focused->texture[0].data.mask.color = + theme->btn_max->hover_focused_color; + theme->btn_close->a_hover_focused->texture[0].data.mask.color = + theme->btn_close->hover_focused_color; + theme->btn_desk->a_hover_focused->texture[0].data.mask.color = + theme->btn_desk->hover_focused_color; + theme->btn_shade->a_hover_focused->texture[0].data.mask.color = + theme->btn_shade->hover_focused_color; + theme->btn_iconify->a_hover_focused->texture[0].data.mask.color = + theme->btn_iconify->hover_focused_color; + theme->btn_max->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_max->hover_unfocused_color; + theme->btn_close->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_close->hover_unfocused_color; + theme->btn_desk->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_desk->hover_unfocused_color; + theme->btn_shade->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_shade->hover_unfocused_color; + theme->btn_iconify->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_iconify->hover_unfocused_color; + theme->btn_max->a_toggled_hover_focused->texture[0].data.mask.color = + theme->btn_max->toggled_hover_focused_color; + theme->btn_desk->a_toggled_hover_focused->texture[0].data.mask.color = + theme->btn_desk->toggled_hover_focused_color; + theme->btn_shade->a_toggled_hover_focused->texture[0].data.mask.color = + theme->btn_shade->toggled_hover_focused_color; + theme->btn_max->a_toggled_hover_unfocused->texture[0].data.mask.color = + theme->btn_max->toggled_hover_unfocused_color; + theme->btn_desk->a_toggled_hover_unfocused->texture[0].data.mask.color = + theme->btn_desk->toggled_hover_unfocused_color; + theme->btn_shade->a_toggled_hover_unfocused->texture[0].data.mask.color = + theme->btn_shade->toggled_hover_unfocused_color; + theme->btn_max->a_toggled_focused_unpressed->texture[0].data.mask.color = + theme->btn_max->toggled_focused_unpressed_color; + theme->btn_desk->a_toggled_focused_unpressed->texture[0].data.mask.color = + theme->btn_desk->toggled_focused_unpressed_color; + theme->btn_shade->a_toggled_focused_unpressed->texture[0].data.mask.color = + theme->btn_shade->toggled_focused_unpressed_color; + theme->btn_max->a_toggled_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_max->toggled_unfocused_unpressed_color; + theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_desk->toggled_unfocused_unpressed_color; + theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_shade->toggled_unfocused_unpressed_color; + theme->btn_max->a_toggled_focused_pressed->texture[0].data.mask.color = + theme->btn_max->toggled_focused_pressed_color; + theme->btn_desk->a_toggled_focused_pressed->texture[0].data.mask.color = + theme->btn_desk->toggled_focused_pressed_color; + theme->btn_shade->a_toggled_focused_pressed->texture[0].data.mask.color = + theme->btn_shade->toggled_focused_pressed_color; + theme->btn_max->a_toggled_unfocused_pressed->texture[0].data.mask.color = + theme->btn_max->toggled_unfocused_pressed_color; + theme->btn_desk->a_toggled_unfocused_pressed->texture[0].data.mask.color = + theme->btn_desk->toggled_unfocused_pressed_color; + theme->btn_shade->a_toggled_unfocused_pressed->texture[0].data.mask.color = + theme->btn_shade->toggled_unfocused_pressed_color; + theme->btn_max->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_max->focused_unpressed_color; + theme->btn_close->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_close->focused_unpressed_color; + theme->btn_desk->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_desk->focused_unpressed_color; + theme->btn_shade->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_shade->focused_unpressed_color; + theme->btn_iconify->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_iconify->focused_unpressed_color; + theme->btn_max->a_focused_pressed->texture[0].data.mask.color = + theme->btn_max->focused_pressed_color; + theme->btn_close->a_focused_pressed->texture[0].data.mask.color = + theme->btn_close->focused_pressed_color; + theme->btn_desk->a_focused_pressed->texture[0].data.mask.color = + theme->btn_desk->focused_pressed_color; + theme->btn_shade->a_focused_pressed->texture[0].data.mask.color = + theme->btn_shade->focused_pressed_color; + theme->btn_iconify->a_focused_pressed->texture[0].data.mask.color = + theme->btn_iconify->focused_pressed_color; + theme->btn_max->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_max->unfocused_unpressed_color; + theme->btn_close->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_close->unfocused_unpressed_color; + theme->btn_desk->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_desk->unfocused_unpressed_color; + theme->btn_shade->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_shade->unfocused_unpressed_color; + theme->btn_iconify->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_iconify->unfocused_unpressed_color; + theme->btn_max->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_max->unfocused_pressed_color; + theme->btn_close->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_close->unfocused_pressed_color; + theme->btn_desk->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_desk->unfocused_pressed_color; + theme->btn_shade->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_shade->unfocused_pressed_color; + theme->btn_iconify->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_iconify->unfocused_pressed_color; theme->a_menu_bullet_normal->texture[0].data.mask.color = theme->menu_color; theme->a_menu_bullet_selected->texture[0].data.mask.color = @@ -1974,3 +2028,162 @@ static RrPixel32* read_c_image(gint width, gint height, const guint8 *data) return im; } + +static void read_button_colors(XrmDatabase db, const RrInstance *inst, + const RrTheme *theme, RrButton *btn, + const gchar *btnname) +{ + gchar *temp, *temp2, *stemp, *stemp2; + + /* active unpressed */ + temp = "window.active.button-%s.unpressed.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->focused_unpressed_color, + RrColorCopy(theme->titlebut_focused_unpressed_color)); + + g_free(temp2); + + /* inactive unpressed */ + temp = "window.inactive.button-%s.unpressed.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->unfocused_unpressed_color, + RrColorCopy(theme->titlebut_unfocused_unpressed_color)); + + g_free(temp2); + + /* active pressed */ + temp = "window.active.button-%s.pressed.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->focused_pressed_color, + RrColorCopy(theme->titlebut_focused_pressed_color)); + + g_free(temp2); + + /* inactive pressed */ + temp = "window.inactive.button-%s.pressed.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->unfocused_pressed_color, + RrColorCopy(theme->titlebut_unfocused_pressed_color)); + + g_free(temp2); + + /* active disabled */ + temp = "window.active.button-%s.disabled.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->disabled_focused_color, + RrColorCopy(theme->titlebut_disabled_focused_color)); + + g_free(temp2); + + /* inactive disabled */ + temp = "window.inactive.button-%s.disabled.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->disabled_unfocused_color, + RrColorCopy(theme->titlebut_disabled_unfocused_color)); + + g_free(temp2); + + /* active hover */ + temp = "window.active.button-%s.hover.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->hover_focused_color, + RrColorCopy(theme->titlebut_hover_focused_color)); + + g_free(temp2); + + /* inactive hover */ + temp = "window.inactive.button-%s.hover.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->hover_unfocused_color, + RrColorCopy(theme->titlebut_hover_unfocused_color)); + + g_free(temp2); + + /* active toggled unpressed */ + temp = "window.active.button-%s.toggled.unpressed.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + stemp = "window.active.button-%s.toggled.image.color"; + stemp2 = g_malloc(strlen(stemp) - 2 + strlen(btnname) + 1); + g_sprintf(stemp2, stemp, btnname); + + READ_COLOR_(temp2, stemp2, btn->toggled_focused_unpressed_color, + RrColorCopy(theme->titlebut_toggled_focused_unpressed_color)); + + g_free(temp2); + g_free(stemp2); + + /* inactive toggled unpressed */ + temp = "window.inactive.button-%s.toggled.unpressed.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + stemp = "window.inactive.button-%s.toggled.image.color"; + stemp2 = g_malloc(strlen(stemp) - 2 + strlen(btnname) + 1); + g_sprintf(stemp2, stemp, btnname); + + READ_COLOR_(temp2, stemp2, btn->toggled_unfocused_unpressed_color, + RrColorCopy(theme->titlebut_toggled_unfocused_unpressed_color)); + + g_free(temp2); + g_free(stemp2); + + /* active toggled hover */ + temp = "window.active.button-%s.toggled.hover.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->toggled_hover_focused_color, + RrColorCopy(theme->titlebut_toggled_hover_focused_color)); + + g_free(temp2); + + /* inactive toggled hover */ + temp = "window.inactive.button-%s.toggled.hover.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->toggled_hover_unfocused_color, + RrColorCopy(theme->titlebut_toggled_hover_unfocused_color)); + + g_free(temp2); + + /* active toggled pressed */ + temp = "window.active.button-%s.toggled.pressed.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->toggled_focused_pressed_color, + RrColorCopy(theme->titlebut_toggled_focused_pressed_color)); + + g_free(temp2); + + /* inactive toggled pressed */ + temp = "window.inactive.button-%s.toggled.pressed.image.color"; + temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); + g_sprintf(temp2, temp, btnname); + + READ_COLOR(temp2, btn->toggled_unfocused_pressed_color, + RrColorCopy(theme->titlebut_toggled_unfocused_pressed_color)); + + g_free(temp2); +} + + -- cgit v1.2.3 From 464ee8996e6478e8bd6fc8c8e9df220187c51786 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Tue, 18 Dec 2007 14:11:04 -0500 Subject: Menu bullet color support. --- obrender/theme.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 442c8b89..29db238b 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -371,6 +371,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_COLOR("menu.items.text.color", theme->menu_color, RrColorNew(inst, 0xff, 0xff, 0xff)); + READ_COLOR("menu.bullet.image.color", theme->menu_bullet_color, + RrColorCopy(theme->menu_color)); + READ_COLOR("menu.items.disabled.text.color", theme->menu_disabled_color, RrColorNew(inst, 0, 0, 0)); @@ -383,7 +386,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_COLOR("menu.separator.color", theme->menu_sep_color, RrColorCopy(theme->menu_color)); - + + READ_COLOR("menu.bullet.selected.image.color", + theme->menu_bullet_selected_color, + RrColorCopy(theme->menu_selected_color)); + /* load the image masks */ /* maximize button masks */ @@ -1456,9 +1463,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->btn_iconify->a_unfocused_pressed->texture[0].data.mask.color = theme->btn_iconify->unfocused_pressed_color; theme->a_menu_bullet_normal->texture[0].data.mask.color = - theme->menu_color; + theme->menu_bullet_color; theme->a_menu_bullet_selected->texture[0].data.mask.color = - theme->menu_selected_color; + theme->menu_bullet_selected_color; g_free(path); XrmDestroyDatabase(db); @@ -1565,6 +1572,8 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->menu_title_color); RrColorFree(theme->menu_sep_color); RrColorFree(theme->menu_color); + RrColorFree(theme->menu_bullet_color); + RrColorFree(theme->menu_bullet_selected_color); RrColorFree(theme->menu_selected_color); RrColorFree(theme->menu_disabled_color); RrColorFree(theme->menu_disabled_selected_color); -- cgit v1.2.3 From 95ed8437020ca3070d7cafcdfef78f8b3985fb5f Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Tue, 12 Oct 2010 23:59:51 -0400 Subject: cleaning up remnants of bad rebase merges and modernizing some sections --- obrender/theme.c | 58 -------------------------------------------------------- 1 file changed, 58 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 29db238b..64938505 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -1602,64 +1602,6 @@ void RrThemeFree(RrTheme *theme) RrFontClose(theme->osd_font_hilite); 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_unfocused_grip); RrAppearanceFree(theme->a_focused_title); -- cgit v1.2.3 From a621e7a4fc9de355e4ef25afca745e2197c5fd47 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 11 Jan 2008 22:34:23 -0500 Subject: fix 80 cols and clean up the button color loading function --- obrender/theme.c | 333 +++++++++++++++++++++++-------------------------------- 1 file changed, 141 insertions(+), 192 deletions(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 64938505..c29550b8 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -645,84 +645,84 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, read_button_colors(db, inst, theme, theme->btn_max, "max"); /* bases: unpressed, pressed, disabled */ - READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button.max.unpressed.bg", theme->btn_max->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-max.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.max.unpressed.bg", theme->btn_max->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-max.pressed.bg", + READ_APPEARANCE_COPY("window.active.button.max.pressed.bg", theme->btn_max->a_focused_pressed, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.max.pressed.bg", theme->btn_max->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button-max.disabled.bg", + READ_APPEARANCE_COPY("window.active.button.max.disabled.bg", theme->btn_max->a_disabled_focused, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button-max.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button.max.disabled.bg", theme->btn_max->a_disabled_unfocused, TRUE, a_disabled_unfocused_tmp); /* hover */ - READ_APPEARANCE_COPY("window.active.button-max.hover.bg", + READ_APPEARANCE_COPY("window.active.button.max.hover.bg", theme->btn_max->a_hover_focused, TRUE, theme->btn_max->a_focused_unpressed); - READ_APPEARANCE_COPY("window.inactive.button-max.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button.max.hover.bg", theme->btn_max->a_hover_unfocused, TRUE, theme->btn_max->a_unfocused_unpressed); /* toggled unpressed */ - READ_APPEARANCE_("window.active.button-max.toggled.unpressed.bg", - "window.active.button-max.toggled.bg", + READ_APPEARANCE_("window.active.button.max.toggled.unpressed.bg", + "window.active.button.max.toggled.bg", theme->btn_max->a_toggled_focused_unpressed, TRUE, theme->btn_max->a_focused_pressed); - READ_APPEARANCE_("window.inactive.button-max.toggled.unpressed.bg", - "window.inactive.button-max.toggled.bg", + READ_APPEARANCE_("window.inactive.button.max.toggled.unpressed.bg", + "window.inactive.button.max.toggled.bg", theme->btn_max->a_toggled_unfocused_unpressed, TRUE, theme->btn_max->a_unfocused_pressed); /* toggled pressed */ - READ_APPEARANCE_COPY("window.active.button-max.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.active.button.max.toggled.pressed.bg", theme->btn_max->a_toggled_focused_pressed, TRUE, theme->btn_max->a_focused_pressed); - READ_APPEARANCE_COPY("window.inactive.button-max.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.max.toggled.pressed.bg", theme->btn_max->a_toggled_unfocused_pressed, TRUE, theme->btn_max->a_unfocused_pressed); /* toggled hover */ - READ_APPEARANCE_COPY("window.active.button-max.toggled.hover.bg", + READ_APPEARANCE_COPY("window.active.button.max.toggled.hover.bg", theme->btn_max->a_toggled_hover_focused, TRUE, theme->btn_max->a_toggled_focused_unpressed); - READ_APPEARANCE_COPY("window.inactive.button-max.toggled.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button.max.toggled.hover.bg", theme->btn_max->a_toggled_hover_unfocused, TRUE, theme->btn_max->a_toggled_unfocused_unpressed); /* close button */ read_button_colors(db, inst, theme, theme->btn_close, "close"); - READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button.close.unpressed.bg", theme->btn_close->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-close.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.close.unpressed.bg", theme->btn_close->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-close.pressed.bg", + READ_APPEARANCE_COPY("window.active.button.close.pressed.bg", theme->btn_close->a_focused_pressed, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-close.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.close.pressed.bg", theme->btn_close->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button-close.disabled.bg", + READ_APPEARANCE_COPY("window.active.button.close.disabled.bg", theme->btn_close->a_disabled_focused, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button-close.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button.close.disabled.bg", theme->btn_close->a_disabled_unfocused, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button-close.hover.bg", + READ_APPEARANCE_COPY("window.active.button.close.hover.bg", theme->btn_close->a_hover_focused, TRUE, theme->btn_close->a_focused_unpressed); - READ_APPEARANCE_COPY("window.inactive.button-close.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button.close.hover.bg", theme->btn_close->a_hover_unfocused, TRUE, theme->btn_close->a_unfocused_unpressed); @@ -730,56 +730,56 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, read_button_colors(db, inst, theme, theme->btn_desk, "desk"); /* bases: unpressed, pressed, disabled */ - READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button.desk.unpressed.bg", theme->btn_desk->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-desk.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.desk.unpressed.bg", theme->btn_desk->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg", + READ_APPEARANCE_COPY("window.active.button.desk.pressed.bg", theme->btn_desk->a_focused_pressed, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.desk.pressed.bg", theme->btn_desk->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button-desk.disabled.bg", + READ_APPEARANCE_COPY("window.active.button.desk.disabled.bg", theme->btn_desk->a_disabled_focused, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button-desk.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button.desk.disabled.bg", theme->btn_desk->a_disabled_unfocused, TRUE, a_disabled_unfocused_tmp); /* hover */ - READ_APPEARANCE_COPY("window.active.button-desk.hover.bg", + READ_APPEARANCE_COPY("window.active.button.desk.hover.bg", theme->btn_desk->a_hover_focused, TRUE, theme->btn_desk->a_focused_unpressed); - READ_APPEARANCE_COPY("window.inactive.button-desk.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button.desk.hover.bg", theme->btn_desk->a_hover_unfocused, TRUE, theme->btn_desk->a_unfocused_unpressed); /* toggled unpressed */ - READ_APPEARANCE_("window.active.button-desk.toggled.unpressed.bg", - "window.active.button-desk.toggled.bg", + READ_APPEARANCE_("window.active.button.desk.toggled.unpressed.bg", + "window.active.button.desk.toggled.bg", theme->btn_desk->a_toggled_focused_unpressed, TRUE, theme->btn_desk->a_focused_pressed); - READ_APPEARANCE_("window.inactive.button-desk.toggled.unpressed.bg", - "window.inactive.button-desk.toggled.bg", + READ_APPEARANCE_("window.inactive.button.desk.toggled.unpressed.bg", + "window.inactive.button.desk.toggled.bg", theme->btn_desk->a_toggled_unfocused_unpressed, TRUE, theme->btn_desk->a_unfocused_pressed); /* toggled pressed */ - READ_APPEARANCE_COPY("window.active.button-desk.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.active.button.desk.toggled.pressed.bg", theme->btn_desk->a_toggled_focused_pressed, TRUE, theme->btn_desk->a_focused_pressed); - READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.pressed.bg", theme->btn_desk->a_toggled_unfocused_pressed, TRUE, theme->btn_desk->a_unfocused_pressed); /* toggled hover */ - READ_APPEARANCE_COPY("window.active.button-desk.toggled.hover.bg", + READ_APPEARANCE_COPY("window.active.button.desk.toggled.hover.bg", theme->btn_desk->a_toggled_hover_focused, TRUE, theme->btn_desk->a_toggled_focused_unpressed); - READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.hover.bg", theme->btn_desk->a_toggled_hover_unfocused, TRUE, theme->btn_desk->a_toggled_unfocused_unpressed); @@ -787,84 +787,84 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, read_button_colors(db, inst, theme, theme->btn_shade, "shade"); /* bases: unpressed, pressed, disabled */ - READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button.shade.unpressed.bg", theme->btn_shade->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-shade.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.shade.unpressed.bg", theme->btn_shade->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg", + READ_APPEARANCE_COPY("window.active.button.shade.pressed.bg", theme->btn_shade->a_focused_pressed, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.shade.pressed.bg", theme->btn_shade->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button-shade.disabled.bg", + READ_APPEARANCE_COPY("window.active.button.shade.disabled.bg", theme->btn_shade->a_disabled_focused, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button-shade.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button.shade.disabled.bg", theme->btn_shade->a_disabled_unfocused, TRUE, a_disabled_unfocused_tmp); /* hover */ - READ_APPEARANCE_COPY("window.active.button-shade.hover.bg", + READ_APPEARANCE_COPY("window.active.button.shade.hover.bg", theme->btn_shade->a_hover_focused, TRUE, theme->btn_shade->a_focused_unpressed); - READ_APPEARANCE_COPY("window.inactive.button-shade.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button.shade.hover.bg", theme->btn_shade->a_hover_unfocused, TRUE, theme->btn_shade->a_unfocused_unpressed); /* toggled unpressed */ - READ_APPEARANCE_("window.active.button-shade.toggled.unpressed.bg", - "window.active.button-shade.toggled.bg", + READ_APPEARANCE_("window.active.button.shade.toggled.unpressed.bg", + "window.active.button.shade.toggled.bg", theme->btn_shade->a_toggled_focused_unpressed, TRUE, theme->btn_shade->a_focused_pressed); - READ_APPEARANCE_("window.inactive.button-shade.toggled.unpressed.bg", - "window.inactive.button-shade.toggled.bg", + READ_APPEARANCE_("window.inactive.button.shade.toggled.unpressed.bg", + "window.inactive.button.shade.toggled.bg", theme->btn_shade->a_toggled_unfocused_unpressed, TRUE, theme->btn_shade->a_unfocused_pressed); /* toggled pressed */ - READ_APPEARANCE_COPY("window.active.button-shade.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.active.button.shade.toggled.pressed.bg", theme->btn_shade->a_toggled_focused_pressed, TRUE, theme->btn_shade->a_focused_pressed); - READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.pressed.bg", theme->btn_shade->a_toggled_unfocused_pressed, TRUE, theme->btn_shade->a_unfocused_pressed); /* toggled hover */ - READ_APPEARANCE_COPY("window.active.button-shade.toggled.hover.bg", + READ_APPEARANCE_COPY("window.active.button.shade.toggled.hover.bg", theme->btn_shade->a_toggled_hover_focused, TRUE, theme->btn_shade->a_toggled_focused_unpressed); - READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.hover.bg", theme->btn_shade->a_toggled_hover_unfocused, TRUE, theme->btn_shade->a_toggled_unfocused_unpressed); /* iconify button */ read_button_colors(db, inst, theme, theme->btn_iconify, "iconify"); - READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button.iconify.unpressed.bg", theme->btn_iconify->a_focused_unpressed, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-iconify.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.iconify.unpressed.bg", theme->btn_iconify->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button-iconify.pressed.bg", + READ_APPEARANCE_COPY("window.active.button.iconify.pressed.bg", theme->btn_iconify->a_focused_pressed, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button-iconify.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button.iconify.pressed.bg", theme->btn_iconify->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button-iconify.disabled.bg", + READ_APPEARANCE_COPY("window.active.button.iconify.disabled.bg", theme->btn_iconify->a_disabled_focused, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button-iconify.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button.iconify.disabled.bg", theme->btn_iconify->a_disabled_unfocused, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button-iconify.hover.bg", + READ_APPEARANCE_COPY("window.active.button.iconify.hover.bg", theme->btn_iconify->a_hover_focused, TRUE, theme->btn_iconify->a_focused_unpressed); - READ_APPEARANCE_COPY("window.inactive.button-iconify.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button.iconify.hover.bg", theme->btn_iconify->a_hover_unfocused, TRUE, theme->btn_iconify->a_unfocused_unpressed); @@ -1272,11 +1272,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->btn_max->a_toggled_hover_unfocused->texture[0].data.mask.mask = theme->btn_max->toggled_hover_mask; theme->btn_max->a_toggled_focused_unpressed->texture[0].data.mask.mask = - theme->btn_max->a_toggled_unfocused_unpressed->texture[0].data.mask.mask = - theme->btn_max->toggled_mask; + theme->btn_max->a_toggled_unfocused_unpressed-> + texture[0].data.mask.mask = theme->btn_max->toggled_mask; theme->btn_max->a_toggled_focused_pressed->texture[0].data.mask.mask = - theme->btn_max->a_toggled_unfocused_pressed->texture[0].data.mask.mask = - theme->btn_max->toggled_pressed_mask; + theme->btn_max->a_toggled_unfocused_pressed->texture[0].data.mask.mask + = theme->btn_max->toggled_pressed_mask; theme->btn_close->a_disabled_focused->texture[0].data.mask.mask = theme->btn_close->a_disabled_unfocused->texture[0].data.mask.mask = theme->btn_close->disabled_mask; @@ -1305,11 +1305,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->btn_desk->a_toggled_hover_unfocused->texture[0].data.mask.mask = theme->btn_desk->toggled_hover_mask; theme->btn_desk->a_toggled_focused_unpressed->texture[0].data.mask.mask = - theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].data.mask.mask = - theme->btn_desk->toggled_mask; + theme->btn_desk->a_toggled_unfocused_unpressed-> + texture[0].data.mask.mask = theme->btn_desk->toggled_mask; theme->btn_desk->a_toggled_focused_pressed->texture[0].data.mask.mask = - theme->btn_desk->a_toggled_unfocused_pressed->texture[0].data.mask.mask = - theme->btn_desk->toggled_pressed_mask; + theme->btn_desk->a_toggled_unfocused_pressed->texture[0].data.mask.mask + = theme->btn_desk->toggled_pressed_mask; theme->btn_shade->a_disabled_focused->texture[0].data.mask.mask = theme->btn_shade->a_disabled_unfocused->texture[0].data.mask.mask = theme->btn_shade->disabled_mask; @@ -1323,14 +1323,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->btn_shade->a_unfocused_unpressed->texture[0].data.mask.mask = theme->btn_shade->mask; theme->btn_shade->a_toggled_hover_focused->texture[0].data.mask.mask = - theme->btn_shade->a_toggled_hover_unfocused->texture[0].data.mask.mask = - theme->btn_shade->toggled_hover_mask; + theme->btn_shade->a_toggled_hover_unfocused->texture[0].data.mask.mask + = theme->btn_shade->toggled_hover_mask; theme->btn_shade->a_toggled_focused_unpressed->texture[0].data.mask.mask = - theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].data.mask.mask = - theme->btn_shade->toggled_mask; + theme->btn_shade->a_toggled_unfocused_unpressed-> + texture[0].data.mask.mask = theme->btn_shade->toggled_mask; theme->btn_shade->a_toggled_focused_pressed->texture[0].data.mask.mask = - theme->btn_shade->a_toggled_unfocused_pressed->texture[0].data.mask.mask = - theme->btn_shade->toggled_pressed_mask; + theme->btn_shade->a_toggled_unfocused_pressed-> + texture[0].data.mask.mask = theme->btn_shade->toggled_pressed_mask; theme->btn_iconify->a_disabled_focused->texture[0].data.mask.mask = theme->btn_iconify->a_disabled_unfocused->texture[0].data.mask.mask = theme->btn_iconify->disabled_mask; @@ -1406,10 +1406,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->btn_shade->toggled_focused_unpressed_color; theme->btn_max->a_toggled_unfocused_unpressed->texture[0].data.mask.color = theme->btn_max->toggled_unfocused_unpressed_color; - theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_desk->toggled_unfocused_unpressed_color; - theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_shade->toggled_unfocused_unpressed_color; + theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].data.mask.color + = theme->btn_desk->toggled_unfocused_unpressed_color; + theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].data.mask.color + = theme->btn_shade->toggled_unfocused_unpressed_color; theme->btn_max->a_toggled_focused_pressed->texture[0].data.mask.color = theme->btn_max->toggled_focused_pressed_color; theme->btn_desk->a_toggled_focused_pressed->texture[0].data.mask.color = @@ -1984,157 +1984,106 @@ static void read_button_colors(XrmDatabase db, const RrInstance *inst, const RrTheme *theme, RrButton *btn, const gchar *btnname) { - gchar *temp, *temp2, *stemp, *stemp2; + gchar *name; /* active unpressed */ - temp = "window.active.button-%s.unpressed.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->focused_unpressed_color, + name = g_strdup_printf("window.active.button.%s.unpressed.image.color", + btnname); + READ_COLOR(name, btn->focused_unpressed_color, RrColorCopy(theme->titlebut_focused_unpressed_color)); - - g_free(temp2); + g_free(name); /* inactive unpressed */ - temp = "window.inactive.button-%s.unpressed.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->unfocused_unpressed_color, + name = g_strdup_printf("window.inactive.button.%s.unpressed.image.color", + btnname); + READ_COLOR(name, btn->unfocused_unpressed_color, RrColorCopy(theme->titlebut_unfocused_unpressed_color)); - - g_free(temp2); + g_free(name); /* active pressed */ - temp = "window.active.button-%s.pressed.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->focused_pressed_color, + name = g_strdup_printf("window.active.button.%s.pressed.image.color", + btnname); + READ_COLOR(name, btn->focused_pressed_color, RrColorCopy(theme->titlebut_focused_pressed_color)); - - g_free(temp2); + g_free(name); /* inactive pressed */ - temp = "window.inactive.button-%s.pressed.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->unfocused_pressed_color, + name = g_strdup_printf("window.inactive.button.%s.pressed.image.color", + btnname); + READ_COLOR(name, btn->unfocused_pressed_color, RrColorCopy(theme->titlebut_unfocused_pressed_color)); - - g_free(temp2); + g_free(name); /* active disabled */ - temp = "window.active.button-%s.disabled.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->disabled_focused_color, + name = g_strdup_printf("window.active.button.%s.disabled.image.color", + btnname); + READ_COLOR(name, btn->disabled_focused_color, RrColorCopy(theme->titlebut_disabled_focused_color)); - - g_free(temp2); + g_free(name); /* inactive disabled */ - temp = "window.inactive.button-%s.disabled.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->disabled_unfocused_color, + name = g_strdup_printf("window.inactive.button.%s.disabled.image.color", + btnname); + READ_COLOR(name, btn->disabled_unfocused_color, RrColorCopy(theme->titlebut_disabled_unfocused_color)); - - g_free(temp2); + g_free(name); /* active hover */ - temp = "window.active.button-%s.hover.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->hover_focused_color, + name = g_strdup_printf("window.active.button.%s.hover.image.color", + btnname); + READ_COLOR(name, btn->hover_focused_color, RrColorCopy(theme->titlebut_hover_focused_color)); - - g_free(temp2); + g_free(name); /* inactive hover */ - temp = "window.inactive.button-%s.hover.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->hover_unfocused_color, + name = g_strdup_printf("window.inactive.button.%s.hover.image.color", + btnname); + READ_COLOR(name, btn->hover_unfocused_color, RrColorCopy(theme->titlebut_hover_unfocused_color)); - - g_free(temp2); + g_free(name); /* active toggled unpressed */ - temp = "window.active.button-%s.toggled.unpressed.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - stemp = "window.active.button-%s.toggled.image.color"; - stemp2 = g_malloc(strlen(stemp) - 2 + strlen(btnname) + 1); - g_sprintf(stemp2, stemp, btnname); - - READ_COLOR_(temp2, stemp2, btn->toggled_focused_unpressed_color, - RrColorCopy(theme->titlebut_toggled_focused_unpressed_color)); - - g_free(temp2); - g_free(stemp2); + name = g_strdup_printf("window.active.button.%s.toggled." + "unpressed.image.color", btnname); + READ_COLOR(name, btn->toggled_focused_unpressed_color, + RrColorCopy(theme->titlebut_toggled_focused_unpressed_color)); + g_free(name); /* inactive toggled unpressed */ - temp = "window.inactive.button-%s.toggled.unpressed.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - stemp = "window.inactive.button-%s.toggled.image.color"; - stemp2 = g_malloc(strlen(stemp) - 2 + strlen(btnname) + 1); - g_sprintf(stemp2, stemp, btnname); - - READ_COLOR_(temp2, stemp2, btn->toggled_unfocused_unpressed_color, - RrColorCopy(theme->titlebut_toggled_unfocused_unpressed_color)); - - g_free(temp2); - g_free(stemp2); + name = g_strdup_printf("window.inactive.button.%s.toggled." + "unpressed.image.color", btnname); + READ_COLOR(name, btn->toggled_unfocused_unpressed_color, + RrColorCopy(theme->titlebut_toggled_unfocused_unpressed_color)); + g_free(name); /* active toggled hover */ - temp = "window.active.button-%s.toggled.hover.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->toggled_hover_focused_color, + name = g_strdup_printf("window.active.button.%s.toggled.hover.image.color", + btnname); + READ_COLOR(name, btn->toggled_hover_focused_color, RrColorCopy(theme->titlebut_toggled_hover_focused_color)); - g_free(temp2); + g_free(name); /* inactive toggled hover */ - temp = "window.inactive.button-%s.toggled.hover.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->toggled_hover_unfocused_color, + name = g_strdup_printf("window.inactive.button.%s.toggled.hover." + "image.color", btnname); + READ_COLOR(name, btn->toggled_hover_unfocused_color, RrColorCopy(theme->titlebut_toggled_hover_unfocused_color)); - - g_free(temp2); + g_free(name); /* active toggled pressed */ - temp = "window.active.button-%s.toggled.pressed.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->toggled_focused_pressed_color, + name = g_strdup_printf("window.active.button.%s.toggled.pressed." + "image.color", btnname); + READ_COLOR(name, btn->toggled_focused_pressed_color, RrColorCopy(theme->titlebut_toggled_focused_pressed_color)); - - g_free(temp2); + g_free(name); /* inactive toggled pressed */ - temp = "window.inactive.button-%s.toggled.pressed.image.color"; - temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1); - g_sprintf(temp2, temp, btnname); - - READ_COLOR(temp2, btn->toggled_unfocused_pressed_color, + name = g_strdup_printf("window.inactive.button.%s.toggled.pressed." + "image.color", btnname); + READ_COLOR(name, btn->toggled_unfocused_pressed_color, RrColorCopy(theme->titlebut_toggled_unfocused_pressed_color)); - - g_free(temp2); + g_free(name); } -- cgit v1.2.3 From da5441ecec51be3564c31275d193a2a18f157714 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Thu, 14 Oct 2010 15:58:03 +0200 Subject: Fix g_slice_new0 call --- obrender/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index c29550b8..3ab2fd4c 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -167,7 +167,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, a_unfocused_pressed_tmp = RrAppearanceNew(inst, 1); /* initialize theme */ - theme = g_slice_new0(RrTheme, 1); + theme = g_slice_new0(RrTheme); theme->inst = inst; theme->name = g_strdup(name ? name : DEFAULT_THEME); -- cgit v1.2.3 From d162451a0113da1e012e007f848e38f07348d9d2 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Thu, 14 Oct 2010 16:05:15 +0200 Subject: Fix some rebase artifacts --- obrender/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'obrender/theme.c') diff --git a/obrender/theme.c b/obrender/theme.c index 3ab2fd4c..cd641f8e 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -295,7 +295,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_COLOR_("osd.active.label.text.color", "osd.label.text.color", - theme->osd_color, RrColorCopy(theme->title_focused_color)); + theme->osd_text_active_color, RrColorCopy(theme->title_focused_color)); READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color, RrColorCopy(theme->title_unfocused_color)); -- cgit v1.2.3