diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/obrender-4.0.pc.in (renamed from render/obrender-3.0.pc.in) | 6 | ||||
| -rw-r--r-- | render/render.h | 2 | ||||
| -rw-r--r-- | render/theme.c | 23 | ||||
| -rw-r--r-- | render/theme.h | 3 | ||||
| -rw-r--r-- | render/version.h.in | 15 |
5 files changed, 42 insertions, 7 deletions
diff --git a/render/obrender-3.0.pc.in b/render/obrender-4.0.pc.in index ebb17ef3..539606a4 100644 --- a/render/obrender-3.0.pc.in +++ b/render/obrender-4.0.pc.in @@ -8,7 +8,7 @@ xlibs=@X_LIBS@ Name: ObRender Description: Openbox Render Library -Version: @VERSION@ -Requires: obparser-3.0 glib-2.0 xft pangoxft +Version: @RR_VERSION@ +Requires: obt-4.0 glib-2.0 xft pangoxft Libs: -L${libdir} -lobrender ${xlibs} -Cflags: -I${includedir}/openbox/@OB_VERSION@ ${xcflags} +Cflags: -I${includedir}/openbox/@RR_VERSION@ ${xcflags} diff --git a/render/render.h b/render/render.h index f7bc5041..706843e3 100644 --- a/render/render.h +++ b/render/render.h @@ -22,7 +22,7 @@ #define __render_h #include "geom.h" -#include "version.h" +#include "render/version.h" #include <X11/Xlib.h> /* some platforms dont include this as needed for Xft */ #include <pango/pangoxft.h> diff --git a/render/theme.c b/render/theme.c index 8c7393b5..ece4037c 100644 --- a/render/theme.c +++ b/render/theme.c @@ -23,7 +23,7 @@ #include "mask.h" #include "theme.h" #include "icon.h" -#include "parser/parse.h" +#include "obt/paths.h" #include <X11/Xlib.h> #include <X11/Xresource.h> @@ -560,6 +560,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (gchar*)data); } + /* up and down arrows */ + { + guchar data[] = { 0xfe, 0x00, 0x7c, 0x00, 0x38, 0x00, 0x10, 0x00 }; + theme->down_arrow_mask = RrPixmapMaskNew(inst, 9, 4, (gchar*)data); + } + { + guchar data[] = { 0x10, 0x00, 0x38, 0x00, 0x7c, 0x00, 0xfe, 0x00 }; + theme->up_arrow_mask = RrPixmapMaskNew(inst, 9, 4, (gchar*)data); + } + /* setup the default window icon */ theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH, OB_DEFAULT_ICON_HEIGHT, @@ -1472,6 +1482,8 @@ void RrThemeFree(RrTheme *theme) 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); RrFontClose(theme->win_font_focused); RrFontClose(theme->win_font_unfocused); @@ -1582,6 +1594,10 @@ static XrmDatabase loaddb(const gchar *name, gchar **path) *path = g_path_get_dirname(s); g_free(s); } else { + ObtPaths *p; + + p = obt_paths_new(); + /* XXX backwards compatibility, remove me sometime later */ s = g_build_filename(g_get_home_dir(), ".themes", name, "openbox-3", "themerc", NULL); @@ -1589,8 +1605,7 @@ static XrmDatabase loaddb(const gchar *name, gchar **path) *path = g_path_get_dirname(s); g_free(s); - for (it = parse_xdg_data_dir_paths(); !db && it; - it = g_slist_next(it)) + for (it = obt_paths_data_dirs(p); !db && it; it = g_slist_next(it)) { s = g_build_filename(it->data, "themes", name, "openbox-3", "themerc", NULL); @@ -1598,6 +1613,8 @@ static XrmDatabase loaddb(const gchar *name, gchar **path) *path = g_path_get_dirname(s); g_free(s); } + + obt_paths_unref(p); } if (db == NULL) { diff --git a/render/theme.h b/render/theme.h index a14dac29..da8e80d3 100644 --- a/render/theme.h +++ b/render/theme.h @@ -151,6 +151,9 @@ struct _RrTheme { RrPixmapMask *menu_toggle_mask; /* menu boolean */ #endif + RrPixmapMask *down_arrow_mask; + RrPixmapMask *up_arrow_mask; + /* global appearances */ RrAppearance *a_disabled_focused_max; RrAppearance *a_disabled_unfocused_max; diff --git a/render/version.h.in b/render/version.h.in new file mode 100644 index 00000000..0ff30b57 --- /dev/null +++ b/render/version.h.in @@ -0,0 +1,15 @@ +#ifndef rr__version_h +#define rr__version_h + +#define RR_MAJOR_VERSION @RR_MAJOR_VERSION@ +#define RR_MINOR_VERSION @RR_MINOR_VERSION@ +#define RR_MICRO_VERSION @RR_MICRO_VERSION@ +#define RR_VERSION RR_MAJOR_VERSION.RR_MINOR_VERSION.RR_MICRO_VERSION + +#define RR_CHECK_VERSION(major,minor,micro) \ + (RR_MAJOR_VERSION > (major) || \ + (RR_MAJOR_VERSION == (major) && RR_MINOR_VERSION > (minor)) || \ + (RR_MAJOR_VERSION == (major) && RR_MINOR_VERSION == (minor) && \ + RR_MICRO_VERSION >= (micro))) + +#endif |