#include "frame.h"
#include "openbox.h"
#include "screen.h"
+#include "client.h"
#include "framerender.h"
#include "render/theme.h"
-static void framerender_label(Frame *self, RrAppearance *a);
-static void framerender_icon(Frame *self, RrAppearance *a);
-static void framerender_max(Frame *self, RrAppearance *a);
-static void framerender_iconify(Frame *self, RrAppearance *a);
-static void framerender_desk(Frame *self, RrAppearance *a);
-static void framerender_shade(Frame *self, RrAppearance *a);
-static void framerender_close(Frame *self, RrAppearance *a);
+static void framerender_label(ObFrame *self, RrAppearance *a);
+static void framerender_icon(ObFrame *self, RrAppearance *a);
+static void framerender_max(ObFrame *self, RrAppearance *a);
+static void framerender_iconify(ObFrame *self, RrAppearance *a);
+static void framerender_desk(ObFrame *self, RrAppearance *a);
+static void framerender_shade(ObFrame *self, RrAppearance *a);
+static void framerender_close(ObFrame *self, RrAppearance *a);
-void framerender_frame(Frame *self)
+void framerender_frame(ObFrame *self)
{
if (self->focused)
XSetWindowBorder(ob_display, self->plate,
- ob_rr_theme->cb_focused_color->pixel);
+ RrColorPixel(ob_rr_theme->cb_focused_color));
else
XSetWindowBorder(ob_display, self->plate,
- ob_rr_theme->cb_unfocused_color->pixel);
+ RrColorPixel(ob_rr_theme->cb_unfocused_color));
if (self->client->decorations & Decor_Titlebar) {
RrAppearance *t, *l, *m, *n, *i, *d, *s, *c;
}
}
-static void framerender_label(Frame *self, RrAppearance *a)
+static void framerender_label(ObFrame *self, RrAppearance *a)
{
if (self->label_x < 0) return;
/* set the texture's text! */
RrPaint(a, self->label, self->label_width, ob_rr_theme->label_height);
}
-static void framerender_icon(Frame *self, RrAppearance *a)
+static void framerender_icon(ObFrame *self, RrAppearance *a)
{
if (self->icon_x < 0) return;
ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2);
}
-static void framerender_max(Frame *self, RrAppearance *a)
+static void framerender_max(ObFrame *self, RrAppearance *a)
{
if (self->max_x < 0) return;
RrPaint(a, self->max, ob_rr_theme->button_size, ob_rr_theme->button_size);
}
-static void framerender_iconify(Frame *self, RrAppearance *a)
+static void framerender_iconify(ObFrame *self, RrAppearance *a)
{
if (self->iconify_x < 0) return;
RrPaint(a, self->iconify,
ob_rr_theme->button_size, ob_rr_theme->button_size);
}
-static void framerender_desk(Frame *self, RrAppearance *a)
+static void framerender_desk(ObFrame *self, RrAppearance *a)
{
if (self->desk_x < 0) return;
RrPaint(a, self->desk, ob_rr_theme->button_size, ob_rr_theme->button_size);
}
-static void framerender_shade(Frame *self, RrAppearance *a)
+static void framerender_shade(ObFrame *self, RrAppearance *a)
{
if (self->shade_x < 0) return;
RrPaint(a, self->shade,
ob_rr_theme->button_size, ob_rr_theme->button_size);
}
-static void framerender_close(Frame *self, RrAppearance *a)
+static void framerender_close(ObFrame *self, RrAppearance *a)
{
if (self->close_x < 0) return;
RrPaint(a, self->close,