#include "config.h"
#include "grab.h"
#include "openbox.h"
-#include "render/theme.h"
+#include "obrender/theme.h"
#include "obt/prop.h"
#define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \
XSetWindowBorderWidth(obt_display, dock->frame, ob_rr_theme->obwidth);
RrAppearanceFree(dock->a_frame);
- dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
+ dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_bg);
stacking_add(DOCK_AS_WINDOW(dock));
STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0);
- dock = g_new0(ObDock, 1);
+ dock = g_slice_new0(ObDock);
dock->obwin.type = OB_WINDOW_CLASS_DOCK;
dock->hidden = TRUE;
CWOverrideRedirect | CWEventMask |
CWDontPropagate,
&attrib);
- dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
+ dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_bg);
XSetWindowBorder(obt_display, dock->frame,
RrColorPixel(ob_rr_theme->osd_border_color));
XSetWindowBorderWidth(obt_display, dock->frame, ob_rr_theme->obwidth);
RrAppearanceFree(dock->a_frame);
window_remove(dock->frame);
stacking_remove(dock);
+ g_slice_free(ObDock, dock);
+ dock = NULL;
}
void dock_manage(Window icon_win, Window name_win)
XWindowAttributes attrib;
gchar **data;
- app = g_new0(ObDockApp, 1);
+ app = g_slice_new0(ObDockApp);
app->name_win = name_win;
app->icon_win = icon_win;
g_free(app->name);
g_free(app->class);
- g_free(app);
+ g_slice_free(ObDockApp, app);
}
void dock_configure(void)
gint gravity;
gint l, r, t, b;
gint strw, strh;
- Rect *a;
+ const Rect *a;
gint hidesize;
RrMargins(dock->a_frame, &l, &t, &r, &b);
}
screen_update_areas();
-
- g_free(a);
}
void dock_app_configure(ObDockApp *app, gint w, gint h)