diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2007-07-17 02:48:16 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2007-07-17 02:48:16 +0200 |
| commit | 77baf26a7f2f64ddf1274035fd4991ab17345904 (patch) | |
| tree | 1b7719e8dd6785bbedca505c53ce3cfcf398fff0 /render | |
| parent | e5a797f10d61e33f5d02c2d276f615ea3a00793f (diff) | |
remove trailing whitespace
Diffstat (limited to 'render')
| -rw-r--r-- | render/color.c | 6 | ||||
| -rw-r--r-- | render/font.c | 2 | ||||
| -rw-r--r-- | render/font.h | 2 | ||||
| -rw-r--r-- | render/gradient.c | 22 | ||||
| -rw-r--r-- | render/image.c | 20 | ||||
| -rw-r--r-- | render/render.c | 10 | ||||
| -rw-r--r-- | render/render.h | 2 | ||||
| -rw-r--r-- | render/test.c | 2 | ||||
| -rw-r--r-- | render/theme.c | 310 |
9 files changed, 188 insertions, 188 deletions
diff --git a/render/color.c b/render/color.c index a247673f..41fcc710 100644 --- a/render/color.c +++ b/render/color.c @@ -140,7 +140,7 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) } data += im->width; p32 += im->width; - } + } } else im->data = (gchar*) data; break; case 16: @@ -192,11 +192,11 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) break; default: g_error("Your bit depth is currently unhandled\n"); - + } } -XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b) +XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b) { r = (r & 0xff) >> (8-RrPseudoBPC(inst)); g = (g & 0xff) >> (8-RrPseudoBPC(inst)); diff --git a/render/font.c b/render/font.c index a32bf7ce..8d389d8b 100644 --- a/render/font.c +++ b/render/font.c @@ -244,7 +244,7 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) pango_layout_get_pixel_extents(t->font->layout, NULL, &rect); mw = rect.width; - /* pango_layout_set_alignment doesn't work with + /* pango_layout_set_alignment doesn't work with pango_xft_render_layout_line */ switch (t->justify) { case RR_JUSTIFY_LEFT: diff --git a/render/font.h b/render/font.h index e3081dc2..07d648d1 100644 --- a/render/font.h +++ b/render/font.h @@ -26,7 +26,7 @@ struct _RrFont { const RrInstance *inst; gint ref; - PangoFontDescription *font_desc; + PangoFontDescription *font_desc; PangoLayout *layout; /*!< Used for measuring and rendering strings */ PangoAttribute *shortcut_underline; /*< For underlining the shortcut key */ gint ascent; /*!< The font's ascent in pango-units */ diff --git a/render/gradient.c b/render/gradient.c index e4bfc540..63b8e949 100644 --- a/render/gradient.c +++ b/render/gradient.c @@ -74,7 +74,7 @@ void RrRender(RrAppearance *a, gint w, gint h) g_assert_not_reached(); /* unhandled gradient */ return; } - + if (a->surface.interlaced) { gint i; RrPixel32 *p; @@ -157,7 +157,7 @@ static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y, gboolean raised) if (b > 0xFF) b = 0xFF; *up = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset) + (b << RrDefaultBlueOffset); - + r = (*down >> RrDefaultRedOffset) & 0xFF; r -= (r * s->bevel_dark_adjust) >> 8; g = (*down >> RrDefaultGreenOffset) & 0xFF; @@ -247,7 +247,7 @@ static void gradient_parentrelative(RrAppearance *a, gint w, gint h) } } -static void gradient_solid(RrAppearance *l, gint w, gint h) +static void gradient_solid(RrAppearance *l, gint w, gint h) { gint i; RrPixel32 pix; @@ -279,7 +279,7 @@ static void gradient_solid(RrAppearance *l, gint w, gint h) left, bottom, right, bottom); XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), right, bottom, right, top); - + XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), left, top, right, top); XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), @@ -310,7 +310,7 @@ static void gradient_solid(RrAppearance *l, gint w, gint h) left, bottom, right, bottom); XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), right, bottom, right, top); - + XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), left, top, right, top); XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), @@ -338,7 +338,7 @@ static void gradient_solid(RrAppearance *l, gint w, gint h) left, top, right, bottom); } break; - default: + default: g_assert_not_reached(); /* unhandled ReliefType */ } } @@ -466,10 +466,10 @@ static void gradient_splitvertical(RrAppearance *a, gint w, gint h) current = COLOR(y2); for (x = w - 1; x >= 0; --x) *(data++) = current; - + NEXT(y2); } - + for (y3 = y3sz; y3 > 0; --y3) { current = COLOR(y3); for (x = w - 1; x >= 0; --x) @@ -606,7 +606,7 @@ static void gradient_diagonal(RrSurface *sf, gint w, gint h) for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */ *(data++) = COLOR(x); - + NEXT(x); } *data = COLOR(x); @@ -653,7 +653,7 @@ static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h) for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */ *(data++) = COLOR(x); - + NEXT(x); } *data = COLOR(x); @@ -717,7 +717,7 @@ static void gradient_pyramid(RrSurface *sf, gint inw, gint inh) *(data+inw-x) = current; *(end-x) = current; *(end-(inw-x)) = current; - + NEXT(x); } current = COLOR(x); diff --git a/render/image.c b/render/image.c index 4b123040..2eb043a2 100644 --- a/render/image.c +++ b/render/image.c @@ -34,24 +34,24 @@ static void ImageCopyResampled(RrPixel32 *dst, RrPixel32 *src, gulong dstX, dstY, srcX, srcY; gulong srcX1, srcX2, srcY1, srcY2; gulong ratioX, ratioY; - + ratioX = (srcW << FRACTION) / dstW; ratioY = (srcH << FRACTION) / dstH; - + srcY2 = 0; for (dstY = 0; dstY < dstH; dstY++) { srcY1 = srcY2; srcY2 += ratioY; - + srcX2 = 0; for (dstX = 0; dstX < dstW; dstX++) { gulong red = 0, green = 0, blue = 0, alpha = 0; gulong portionX, portionY, portionXY, sumXY = 0; RrPixel32 pixel; - + srcX1 = srcX2; srcX2 += ratioX; - + for (srcY = srcY1; srcY < srcY2; srcY += (1UL << FRACTION)) { if (srcY == srcY1) { srcY = FLOOR(srcY); @@ -63,7 +63,7 @@ static void ImageCopyResampled(RrPixel32 *dst, RrPixel32 *src, portionY = srcY2 - srcY; else portionY = (1UL << FRACTION); - + for (srcX = srcX1; srcX < srcX2; srcX += (1UL << FRACTION)) { if (srcX == srcX1) { srcX = FLOOR(srcX); @@ -75,10 +75,10 @@ static void ImageCopyResampled(RrPixel32 *dst, RrPixel32 *src, portionX = srcX2 - srcX; else portionX = (1UL << FRACTION); - + portionXY = (portionX * portionY) >> FRACTION; sumXY += portionXY; - + pixel = *(src + (srcY >> FRACTION) * srcW + (srcX >> FRACTION)); red += ((pixel >> RrDefaultRedOffset) & 0xFF) @@ -91,13 +91,13 @@ static void ImageCopyResampled(RrPixel32 *dst, RrPixel32 *src, * portionXY; } } - + g_assert(sumXY != 0); red /= sumXY; green /= sumXY; blue /= sumXY; alpha /= sumXY; - + *dst++ = (red << RrDefaultRedOffset) | (green << RrDefaultGreenOffset) | (blue << RrDefaultBlueOffset) | diff --git a/render/render.c b/render/render.c index 97ec7b52..4119dc7f 100644 --- a/render/render.c +++ b/render/render.c @@ -86,8 +86,8 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h) { gint l, t, r, b; RrMargins(a, &l, &t, &r, &b); - RECT_SET(tarea, l, t, w - l - r, h - t - b); - } + RECT_SET(tarea, l, t, w - l - r, h - t - b); + } for (i = 0; i < a->textures; i++) { switch (a->texture[i].type) { @@ -101,7 +101,7 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h) pixel_data_to_pixmap(a, 0, 0, w, h); } if (a->xftdraw == NULL) { - a->xftdraw = XftDrawCreate(RrDisplay(a->inst), a->pixmap, + a->xftdraw = XftDrawCreate(RrDisplay(a->inst), a->pixmap, RrVisual(a->inst), RrColormap(a->inst)); } @@ -202,7 +202,7 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig) if (spo->primary != NULL) spc->primary = RrColorNew(copy->inst, spo->primary->r, - spo->primary->g, + spo->primary->g, spo->primary->b); else spc->primary = NULL; @@ -376,7 +376,7 @@ gint RrMinWidth(RrAppearance *a) break; case RR_TEXTURE_TEXT: m = RrFontMeasureString(a->texture[i].data.text.font, - a->texture[i].data.text.string, + a->texture[i].data.text.string, a->texture[i].data.text.shadow_offset_x, a->texture[i].data.text.shadow_offset_y); w = MAX(w, m->width); diff --git a/render/render.h b/render/render.h index f021410c..1f87c6e0 100644 --- a/render/render.h +++ b/render/render.h @@ -114,7 +114,7 @@ struct _RrSurface { RrColor *primary; RrColor *secondary; RrColor *border_color; - RrColor *bevel_dark; + RrColor *bevel_dark; RrColor *bevel_light; RrColor *interlace_color; gboolean interlaced; diff --git a/render/test.c b/render/test.c index 6cf41c1b..307e2629 100644 --- a/render/test.c +++ b/render/test.c @@ -55,7 +55,7 @@ gint main() ob_root = RootWindow(ob_display, ob_screen); win = XCreateWindow(ob_display, RootWindow(ob_display, 0), - 10, 10, w, h, 10, + 10, 10, w, h, 10, CopyFromParent, /* depth */ CopyFromParent, /* class */ CopyFromParent, /* visual */ diff --git a/render/theme.c b/render/theme.c index 26537853..a793ced7 100644 --- a/render/theme.c +++ b/render/theme.c @@ -401,7 +401,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, "menu.items.active.text.color", &theme->menu_selected_color)) theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); - + /* load the image masks */ /* maximize button masks */ @@ -768,7 +768,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_hover_focused_desk = RrAppearanceCopy(theme->a_hover_focused_max); theme->a_hover_unfocused_desk = - RrAppearanceCopy(theme->a_hover_unfocused_max); + RrAppearanceCopy(theme->a_hover_unfocused_max); theme->a_toggled_hover_focused_desk = RrAppearanceCopy(theme->a_toggled_hover_focused_max); theme->a_toggled_hover_unfocused_desk = @@ -1020,13 +1020,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_menu_text_normal->texture[0].type = theme->a_menu_text_selected->texture[0].type = - theme->a_menu_text_disabled->texture[0].type = - theme->a_menu_text_disabled_selected->texture[0].type = + theme->a_menu_text_disabled->texture[0].type = + theme->a_menu_text_disabled_selected->texture[0].type = RR_TEXTURE_TEXT; - theme->a_menu_text_normal->texture[0].data.text.justify = + theme->a_menu_text_normal->texture[0].data.text.justify = theme->a_menu_text_selected->texture[0].data.text.justify = - theme->a_menu_text_disabled->texture[0].data.text.justify = - theme->a_menu_text_disabled_selected->texture[0].data.text.justify = + theme->a_menu_text_disabled->texture[0].data.text.justify = + theme->a_menu_text_disabled_selected->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_menu_text_normal->texture[0].data.text.font = theme->a_menu_text_selected->texture[0].data.text.font = @@ -1072,7 +1072,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, i = parse_inline_number(p + strlen("shadowtint=")); j = (i > 0 ? 0 : 255); i = ABS(i*255/100); - + theme->menu_text_normal_shadow_color = RrColorNew(inst, j, j, j); theme->menu_text_selected_shadow_color = RrColorNew(inst, j, j, j); theme->menu_text_disabled_shadow_color = RrColorNew(inst, j, j, j); @@ -1107,180 +1107,180 @@ 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_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->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->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->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_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->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_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_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_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->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->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_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_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->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->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_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->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_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_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_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->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->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_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->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_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_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_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->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->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_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->a_focused_unpressed_iconify->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = theme->iconify_mask; - theme->a_menu_bullet_normal->texture[0].data.mask.mask = - theme->a_menu_bullet_selected->texture[0].data.mask.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->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->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->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->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->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->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->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->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 = @@ -1306,33 +1306,33 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.color = theme->a_toggled_unfocused_pressed_shade->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->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->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_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->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->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->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_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->titlebut_unfocused_pressed_color; - theme->a_menu_bullet_normal->texture[0].data.mask.color = + theme->a_menu_bullet_normal->texture[0].data.mask.color = theme->menu_color; - theme->a_menu_bullet_selected->texture[0].data.mask.color = + theme->a_menu_bullet_selected->texture[0].data.mask.color = theme->menu_selected_color; g_free(path); @@ -1464,7 +1464,7 @@ void RrThemeFree(RrTheme *theme) RrPixmapMaskFree(theme->close_pressed_mask); RrPixmapMaskFree(theme->menu_bullet_mask); - RrFontClose(theme->win_font_focused); + RrFontClose(theme->win_font_focused); RrFontClose(theme->win_font_unfocused); RrFontClose(theme->menu_title_font); RrFontClose(theme->menu_font); @@ -1621,7 +1621,7 @@ static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value) gchar *rclass = create_class_name(rname); gchar *rettype, *end; XrmValue retvalue; - + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { *value = (gint)strtol(retvalue.addr, &end, 10); @@ -1639,7 +1639,7 @@ static gboolean read_string(XrmDatabase db, const gchar *rname, gchar **value) gchar *rclass = create_class_name(rname); gchar *rettype; XrmValue retvalue; - + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { *value = retvalue.addr; @@ -1657,7 +1657,7 @@ static gboolean read_color(XrmDatabase db, const RrInstance *inst, gchar *rclass = create_class_name(rname); gchar *rettype; XrmValue retvalue; - + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { RrColor *c = RrColorParse(inst, retvalue.addr); |
