diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/color.c | 2 | ||||
| -rw-r--r-- | render/test.c | 102 | ||||
| -rw-r--r-- | render/theme.c | 8 |
3 files changed, 56 insertions, 56 deletions
diff --git a/render/color.c b/render/color.c index 491dc47b..9f053e97 100644 --- a/render/color.c +++ b/render/color.c @@ -49,7 +49,7 @@ RrColor *RrColorParse(const RrInstance *inst, gchar *colorname) xcol.pixel = 0; if (!XParseColor(RrDisplay(inst), RrColormap(inst), colorname, &xcol)) { g_warning("unable to parse color '%s'", colorname); - return NULL; + return NULL; } return RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8); } diff --git a/render/test.c b/render/test.c index b50053c2..cb67c2b0 100644 --- a/render/test.c +++ b/render/test.c @@ -28,10 +28,10 @@ static gint x_error_handler(Display * disp, XErrorEvent * error) { - gchar buf[1024]; - XGetErrorText(disp, error->error_code, buf, 1024); - printf("%s\n", buf); - return 0; + gchar buf[1024]; + XGetErrorText(disp, error->error_code, buf, 1024); + printf("%s\n", buf); + return 0; } Display *ob_display; @@ -40,58 +40,58 @@ Window ob_root; gint main() { - Window win; - RrInstance *inst; - RrAppearance *look; + Window win; + RrInstance *inst; + RrAppearance *look; - Window root; - XEvent report; - gint h = 500, w = 500; + Window root; + XEvent report; + gint h = 500, w = 500; - ob_display = XOpenDisplay(NULL); - XSetErrorHandler(x_error_handler); - ob_screen = DefaultScreen(ob_display); - ob_root = RootWindow(ob_display, ob_screen); - win = - XCreateWindow(ob_display, RootWindow(ob_display, 0), - 10, 10, w, h, 10, - CopyFromParent, /* depth */ - CopyFromParent, /* class */ - CopyFromParent, /* visual */ - 0, /* valuemask */ - 0); /* attributes */ - XMapWindow(ob_display, win); - XSelectInput(ob_display, win, ExposureMask | StructureNotifyMask); - root = RootWindow (ob_display, DefaultScreen (ob_display)); - inst = RrInstanceNew(ob_display, ob_screen); + ob_display = XOpenDisplay(NULL); + XSetErrorHandler(x_error_handler); + ob_screen = DefaultScreen(ob_display); + ob_root = RootWindow(ob_display, ob_screen); + win = + XCreateWindow(ob_display, RootWindow(ob_display, 0), + 10, 10, w, h, 10, + CopyFromParent, /* depth */ + CopyFromParent, /* class */ + CopyFromParent, /* visual */ + 0, /* valuemask */ + 0); /* attributes */ + XMapWindow(ob_display, win); + XSelectInput(ob_display, win, ExposureMask | StructureNotifyMask); + root = RootWindow (ob_display, DefaultScreen (ob_display)); + inst = RrInstanceNew(ob_display, ob_screen); - look = RrAppearanceNew(inst, 0); - look->surface.grad = RR_SURFACE_PYRAMID; - look->surface.secondary = RrColorParse(inst, "Yellow"); - look->surface.primary = RrColorParse(inst, "Blue"); - look->surface.interlaced = FALSE; - if (ob_display == NULL) { - fprintf(stderr, "couldn't connect to X server :0\n"); - return 0; - } + look = RrAppearanceNew(inst, 0); + look->surface.grad = RR_SURFACE_PYRAMID; + look->surface.secondary = RrColorParse(inst, "Yellow"); + look->surface.primary = RrColorParse(inst, "Blue"); + look->surface.interlaced = FALSE; + if (ob_display == NULL) { + fprintf(stderr, "couldn't connect to X server :0\n"); + return 0; + } - RrPaint(look, win, w, h); - while (1) { - XNextEvent(ob_display, &report); - switch (report.type) { - case Expose: - break; - case ConfigureNotify: - RrPaint(look, win, - report.xconfigure.width, - report.xconfigure.height); - break; - } + RrPaint(look, win, w, h); + while (1) { + XNextEvent(ob_display, &report); + switch (report.type) { + case Expose: + break; + case ConfigureNotify: + RrPaint(look, win, + report.xconfigure.width, + report.xconfigure.height); + break; + } - } + } - RrAppearanceFree (look); - RrInstanceFree (inst); + RrAppearanceFree (look); + RrInstanceFree (inst); - return 1; + return 1; } diff --git a/render/theme.c b/render/theme.c index bb6a1232..3b44b525 100644 --- a/render/theme.c +++ b/render/theme.c @@ -500,17 +500,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) /* read buttons textures */ if (!read_appearance(db, inst, "window.active.button.disabled.bg", - theme->a_disabled_focused_max, + 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, + 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, + theme->a_focused_pressed_max, TRUE)) set_default_appearance(theme->a_focused_pressed_max); if (!read_appearance(db, inst, @@ -1212,7 +1212,7 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, *relief = RR_RELIEF_FLAT; else *relief = RR_RELIEF_RAISED; - + *border = FALSE; if (*relief == RR_RELIEF_FLAT) { if (strstr(tex, "border") != NULL) |