give different border colors to active and inactive windows. adjust the xml theme format a little to make it BETTER. rawr. add some metadata standards too.
This commit is contained in:
parent
b2006b8b45
commit
b63ad92cca
17 changed files with 219 additions and 140 deletions
|
@ -88,16 +88,9 @@
|
||||||
</xs:all>
|
</xs:all>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
|
||||||
<xs:complexType name="border">
|
|
||||||
<xs:all>
|
|
||||||
<xs:element name="primary" type="obt:color" minOccurs="0"/>
|
|
||||||
<xs:element name="width" type="xs:integer" minOccurs="0"/>
|
|
||||||
</xs:all>
|
|
||||||
</xs:complexType>
|
|
||||||
|
|
||||||
<xs:complexType name="allmenus">
|
<xs:complexType name="allmenus">
|
||||||
<xs:all>
|
<xs:all>
|
||||||
<xs:element name="border" type="obt:border" minOccurs="0"/>
|
<xs:element name="border" type="obt:color" minOccurs="0"/>
|
||||||
<xs:element name="overlap" type="xs:integer" minOccurs="0"/>
|
<xs:element name="overlap" type="xs:integer" minOccurs="0"/>
|
||||||
<xs:element name="justify" type="obt:justify" minOccurs="0"/>
|
<xs:element name="justify" type="obt:justify" minOccurs="0"/>
|
||||||
<xs:element name="title" type="obt:textarea" minOccurs="0"/>
|
<xs:element name="title" type="obt:textarea" minOccurs="0"/>
|
||||||
|
@ -123,6 +116,7 @@
|
||||||
|
|
||||||
<xs:complexType name="window">
|
<xs:complexType name="window">
|
||||||
<xs:all>
|
<xs:all>
|
||||||
|
<xs:element name="border" type="obt:border" minOccurs="0"/>
|
||||||
<xs:element name="clientpadding" type="obt:color" minOccurs="0"/>
|
<xs:element name="clientpadding" type="obt:color" minOccurs="0"/>
|
||||||
<xs:element name="titlebar" type="obt:area" minOccurs="0"/>
|
<xs:element name="titlebar" type="obt:area" minOccurs="0"/>
|
||||||
<xs:element name="label" type="obt:textarea" minOccurs="0"/>
|
<xs:element name="label" type="obt:textarea" minOccurs="0"/>
|
||||||
|
@ -134,9 +128,7 @@
|
||||||
|
|
||||||
<xs:complexType name="allwindows">
|
<xs:complexType name="allwindows">
|
||||||
<xs:all>
|
<xs:all>
|
||||||
<xs:element name="clientpadding" type="obt:point" minOccurs="0"/>
|
|
||||||
<xs:element name="justify" type="obt:justify" minOccurs="0"/>
|
<xs:element name="justify" type="obt:justify" minOccurs="0"/>
|
||||||
<xs:element name="border" type="obt:border" minOccurs="0"/>
|
|
||||||
<xs:element name="inactive" type="obt:window" minOccurs="0"/>
|
<xs:element name="inactive" type="obt:window" minOccurs="0"/>
|
||||||
<xs:element name="active" type="obt:window" minOccurs="0"/>
|
<xs:element name="active" type="obt:window" minOccurs="0"/>
|
||||||
</xs:all>
|
</xs:all>
|
||||||
|
@ -148,10 +140,25 @@
|
||||||
</xs:all>
|
</xs:all>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
|
||||||
|
<xs:complexType name="windowDimensions">
|
||||||
|
<xs:all>
|
||||||
|
<xs:element name="borderwidth" type="xs:integer" minOccurs="0"/>
|
||||||
|
<xs:element name="clientpadding" type="obt:point" minOccurs="0"/>
|
||||||
|
</xs:all>
|
||||||
|
</xs:complexType>
|
||||||
|
|
||||||
|
<xs:complexType name="menuDimensions">
|
||||||
|
<xs:all>
|
||||||
|
<xs:element name="borderwidth" type="xs:integer" minOccurs="0"/>
|
||||||
|
</xs:all>
|
||||||
|
</xs:complexType>
|
||||||
|
|
||||||
<xs:complexType name="themeDimensions">
|
<xs:complexType name="themeDimensions">
|
||||||
<xs:all>
|
<xs:all>
|
||||||
<xs:element name="padding" type="obt:point" minOccurs="0"/>
|
<xs:element name="padding" type="obt:point" minOccurs="0"/>
|
||||||
<xs:element name="handle" type="xs:integer" minOccurs="0"/>
|
<xs:element name="handle" type="xs:integer" minOccurs="0"/>
|
||||||
|
<xs:element name="window" type="obt:windowDimensions" minOccurs="0"/>
|
||||||
|
<xs:element name="menu" type="obt:menuDimensions" minOccurs="0"/>
|
||||||
</xs:all>
|
</xs:all>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,8 @@ void dock_startup(gboolean reconfig)
|
||||||
GList *it;
|
GList *it;
|
||||||
|
|
||||||
XSetWindowBorder(ob_display, dock->frame,
|
XSetWindowBorder(ob_display, dock->frame,
|
||||||
RrColorPixel(ob_rr_theme->frame_b_color));
|
RrColorPixel(ob_rr_theme->
|
||||||
|
frame_focused_border_color));
|
||||||
XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->fbwidth);
|
XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->fbwidth);
|
||||||
|
|
||||||
RrAppearanceFree(dock->a_frame);
|
RrAppearanceFree(dock->a_frame);
|
||||||
|
@ -91,7 +92,7 @@ void dock_startup(gboolean reconfig)
|
||||||
&attrib);
|
&attrib);
|
||||||
dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_focused_title);
|
dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_focused_title);
|
||||||
XSetWindowBorder(ob_display, dock->frame,
|
XSetWindowBorder(ob_display, dock->frame,
|
||||||
RrColorPixel(ob_rr_theme->frame_b_color));
|
RrColorPixel(ob_rr_theme->frame_focused_border_color));
|
||||||
XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->fbwidth);
|
XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->fbwidth);
|
||||||
|
|
||||||
g_hash_table_insert(window_map, &dock->frame, dock);
|
g_hash_table_insert(window_map, &dock->frame, dock);
|
||||||
|
|
|
@ -184,19 +184,6 @@ ObFrame *frame_new(ObClient *client)
|
||||||
static void set_theme_statics(ObFrame *self)
|
static void set_theme_statics(ObFrame *self)
|
||||||
{
|
{
|
||||||
/* set colors/appearance/sizes for stuff that doesn't change */
|
/* set colors/appearance/sizes for stuff that doesn't change */
|
||||||
XSetWindowBorder(ob_display, self->window,
|
|
||||||
RrColorPixel(ob_rr_theme->frame_b_color));
|
|
||||||
XSetWindowBorder(ob_display, self->inner,
|
|
||||||
RrColorPixel(ob_rr_theme->frame_b_color));
|
|
||||||
XSetWindowBorder(ob_display, self->title,
|
|
||||||
RrColorPixel(ob_rr_theme->frame_b_color));
|
|
||||||
XSetWindowBorder(ob_display, self->handle,
|
|
||||||
RrColorPixel(ob_rr_theme->frame_b_color));
|
|
||||||
XSetWindowBorder(ob_display, self->rgrip,
|
|
||||||
RrColorPixel(ob_rr_theme->frame_b_color));
|
|
||||||
XSetWindowBorder(ob_display, self->lgrip,
|
|
||||||
RrColorPixel(ob_rr_theme->frame_b_color));
|
|
||||||
|
|
||||||
XResizeWindow(ob_display, self->max,
|
XResizeWindow(ob_display, self->max,
|
||||||
ob_rr_theme->button_size, ob_rr_theme->button_size);
|
ob_rr_theme->button_size, ob_rr_theme->button_size);
|
||||||
XResizeWindow(ob_display, self->iconify,
|
XResizeWindow(ob_display, self->iconify,
|
||||||
|
|
|
@ -42,6 +42,16 @@ void framerender_frame(ObFrame *self)
|
||||||
RrColorPixel(ob_rr_theme->cb_unfocused_color));
|
RrColorPixel(ob_rr_theme->cb_unfocused_color));
|
||||||
XSetWindowBackground(ob_display, self->inner, px);
|
XSetWindowBackground(ob_display, self->inner, px);
|
||||||
XClearWindow(ob_display, self->inner);
|
XClearWindow(ob_display, self->inner);
|
||||||
|
|
||||||
|
px = (self->focused ?
|
||||||
|
RrColorPixel(ob_rr_theme->frame_focused_border_color) :
|
||||||
|
RrColorPixel(ob_rr_theme->frame_unfocused_border_color));
|
||||||
|
XSetWindowBorder(ob_display, self->window, px);
|
||||||
|
XSetWindowBorder(ob_display, self->inner, px);
|
||||||
|
XSetWindowBorder(ob_display, self->title, px);
|
||||||
|
XSetWindowBorder(ob_display, self->handle, px);
|
||||||
|
XSetWindowBorder(ob_display, self->rgrip, px);
|
||||||
|
XSetWindowBorder(ob_display, self->lgrip, px);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
|
if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
|
||||||
|
|
|
@ -89,7 +89,7 @@ ObMenuFrame* menu_frame_new(ObMenu *menu, guint show_from, ObClient *client)
|
||||||
|
|
||||||
XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->mbwidth);
|
XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->mbwidth);
|
||||||
XSetWindowBorder(ob_display, self->window,
|
XSetWindowBorder(ob_display, self->window,
|
||||||
RrColorPixel(ob_rr_theme->menu_b_color));
|
RrColorPixel(ob_rr_theme->menu_border_color));
|
||||||
|
|
||||||
self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title);
|
self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title);
|
||||||
self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
|
self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
|
||||||
|
@ -689,7 +689,7 @@ void menu_frame_render(ObMenuFrame *self)
|
||||||
XMoveWindow(ob_display, e->window, e->area.x-e->border, e->area.y-e->border);
|
XMoveWindow(ob_display, e->window, e->area.x-e->border, e->area.y-e->border);
|
||||||
XSetWindowBorderWidth(ob_display, e->window, e->border);
|
XSetWindowBorderWidth(ob_display, e->window, e->border);
|
||||||
XSetWindowBorder(ob_display, e->window,
|
XSetWindowBorder(ob_display, e->window,
|
||||||
RrColorPixel(ob_rr_theme->menu_b_color));
|
RrColorPixel(ob_rr_theme->menu_border_color));
|
||||||
|
|
||||||
|
|
||||||
text_a = (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
|
text_a = (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
|
||||||
|
|
|
@ -52,7 +52,8 @@ ObPopup *popup_new()
|
||||||
InputOutput, RrVisual(ob_rr_inst), 0, NULL);
|
InputOutput, RrVisual(ob_rr_inst), 0, NULL);
|
||||||
|
|
||||||
XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->fbwidth);
|
XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->fbwidth);
|
||||||
XSetWindowBorder(ob_display, self->bg, ob_rr_theme->frame_b_color->pixel);
|
XSetWindowBorder(ob_display, self->bg,
|
||||||
|
RrColorPixel(ob_rr_theme->frame_focused_border_color));
|
||||||
|
|
||||||
XMapWindow(ob_display, self->text);
|
XMapWindow(ob_display, self->text);
|
||||||
|
|
||||||
|
@ -487,7 +488,8 @@ void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
|
||||||
for (i = self->desks; i < screen_num_desktops; ++i) {
|
for (i = self->desks; i < screen_num_desktops; ++i) {
|
||||||
XSetWindowAttributes attr;
|
XSetWindowAttributes attr;
|
||||||
|
|
||||||
attr.border_pixel = RrColorPixel(ob_rr_theme->frame_b_color);
|
attr.border_pixel =
|
||||||
|
RrColorPixel(ob_rr_theme->frame_focused_border_color);
|
||||||
self->wins[i] = XCreateWindow(ob_display, self->popup->bg,
|
self->wins[i] = XCreateWindow(ob_display, self->popup->bg,
|
||||||
0, 0, 1, 1, ob_rr_theme->fbwidth,
|
0, 0, 1, 1, ob_rr_theme->fbwidth,
|
||||||
RrDepth(ob_rr_inst), InputOutput,
|
RrDepth(ob_rr_inst), InputOutput,
|
||||||
|
|
|
@ -196,31 +196,40 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
|
||||||
&theme->paddingx, &theme->paddingy, 0, 100, 0, 100))
|
&theme->paddingx, &theme->paddingy, 0, 100, 0, 100))
|
||||||
theme->paddingx = theme->paddingy = 3;
|
theme->paddingx = theme->paddingy = 3;
|
||||||
|
|
||||||
if (!FIND(int, L("window","border","width"),
|
if (!FIND(int, L("dimensions","window","border"),
|
||||||
&theme->fbwidth, 0, 100))
|
&theme->fbwidth, 0, 100))
|
||||||
theme->fbwidth = 1;
|
theme->fbwidth = 1;
|
||||||
|
|
||||||
/* menu border width inherits from frame border width */
|
/* menu border width inherits from frame border width */
|
||||||
if (!FIND(int, L("menu","border","width"),
|
if (!FIND(int, L("dimensions","menu","border"),
|
||||||
&theme->mbwidth, 0, 100))
|
&theme->mbwidth, 0, 100))
|
||||||
theme->mbwidth = theme->fbwidth;
|
theme->mbwidth = theme->fbwidth;
|
||||||
|
|
||||||
if (!FIND(point, L("window","clientpadding"), &theme->cbwidthx,
|
if (!FIND(point, L("dimensions","window","clientpadding"),
|
||||||
&theme->cbwidthy, 0, 100, 0, 100))
|
&theme->cbwidthx, &theme->cbwidthy, 0, 100, 0, 100))
|
||||||
theme->cbwidthx = theme->cbwidthy = 1;
|
theme->cbwidthx = theme->cbwidthy = 1;
|
||||||
|
|
||||||
/* load colors */
|
/* load colors */
|
||||||
if (!FIND(color, L("window","border","primary"),
|
if (!FIND(color, L("window","active","border"),
|
||||||
&theme->frame_b_color, NULL))
|
&theme->frame_focused_border_color, NULL))
|
||||||
theme->frame_b_color = RrColorNew(inst, 0, 0, 0);
|
theme->frame_focused_border_color = RrColorNew(inst, 0, 0, 0);
|
||||||
|
/* frame unfocused border color inherits from frame focused border color */
|
||||||
|
if (!FIND(color, L("window","inactive","border"),
|
||||||
|
&theme->frame_unfocused_border_color, NULL))
|
||||||
|
theme->frame_unfocused_border_color =
|
||||||
|
RrColorNew(inst,
|
||||||
|
theme->frame_focused_border_color->r,
|
||||||
|
theme->frame_focused_border_color->g,
|
||||||
|
theme->frame_focused_border_color->b);
|
||||||
|
|
||||||
/* menu border color inherits from frame border color */
|
/* menu border color inherits from frame focused border color */
|
||||||
if (!FIND(color, L("menu","border","primary"),
|
if (!FIND(color, L("menu","border"),
|
||||||
&theme->menu_b_color, NULL))
|
&theme->menu_border_color, NULL))
|
||||||
theme->menu_b_color = RrColorNew(inst,
|
theme->menu_border_color =
|
||||||
theme->frame_b_color->r,
|
RrColorNew(inst,
|
||||||
theme->frame_b_color->g,
|
theme->frame_focused_border_color->r,
|
||||||
theme->frame_b_color->b);
|
theme->frame_focused_border_color->g,
|
||||||
|
theme->frame_focused_border_color->b);
|
||||||
if (!FIND(color, L("window","active","clientpadding"),
|
if (!FIND(color, L("window","active","clientpadding"),
|
||||||
&theme->cb_focused_color, NULL))
|
&theme->cb_focused_color, NULL))
|
||||||
theme->cb_focused_color = RrColorNew(inst, 255, 255, 255);
|
theme->cb_focused_color = RrColorNew(inst, 255, 255, 255);
|
||||||
|
@ -1220,8 +1229,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
|
||||||
void RrThemeFree(RrTheme *theme)
|
void RrThemeFree(RrTheme *theme)
|
||||||
{
|
{
|
||||||
if (theme) {
|
if (theme) {
|
||||||
RrColorFree(theme->menu_b_color);
|
RrColorFree(theme->menu_border_color);
|
||||||
RrColorFree(theme->frame_b_color);
|
RrColorFree(theme->frame_focused_border_color);
|
||||||
|
RrColorFree(theme->frame_unfocused_border_color);
|
||||||
RrColorFree(theme->cb_unfocused_color);
|
RrColorFree(theme->cb_unfocused_color);
|
||||||
RrColorFree(theme->cb_focused_color);
|
RrColorFree(theme->cb_focused_color);
|
||||||
RrColorFree(theme->title_focused_color);
|
RrColorFree(theme->title_focused_color);
|
||||||
|
|
|
@ -57,8 +57,9 @@ struct _RrTheme {
|
||||||
gint menu_title_height;
|
gint menu_title_height;
|
||||||
|
|
||||||
/* style settings - colors */
|
/* style settings - colors */
|
||||||
RrColor *menu_b_color;
|
RrColor *menu_border_color;
|
||||||
RrColor *frame_b_color;
|
RrColor *frame_focused_border_color;
|
||||||
|
RrColor *frame_unfocused_border_color;
|
||||||
RrColor *cb_focused_color;
|
RrColor *cb_focused_color;
|
||||||
RrColor *cb_unfocused_color;
|
RrColor *cb_unfocused_color;
|
||||||
RrColor *title_focused_color;
|
RrColor *title_focused_color;
|
||||||
|
|
|
@ -1,16 +1,24 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<openbox_theme version="1" engine="box" xmlns="http://openbox.org/themerc">
|
<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
|
||||||
|
<about>
|
||||||
|
<author></author>
|
||||||
|
<email></email>
|
||||||
|
<webpage></webpage>
|
||||||
|
<comment></comment>
|
||||||
|
</about>
|
||||||
<dimensions>
|
<dimensions>
|
||||||
<handle>4</handle>
|
<handle>4</handle>
|
||||||
<padding x="1" y="1"/>
|
<padding x="1" y="1"/>
|
||||||
|
<window>
|
||||||
|
<border>1</border>
|
||||||
|
</window>
|
||||||
|
<menu>
|
||||||
|
<border>1</border>
|
||||||
|
</menu>
|
||||||
</dimensions>
|
</dimensions>
|
||||||
<window>
|
<window>
|
||||||
<border>
|
|
||||||
<width>1</width>
|
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
|
||||||
</border>
|
|
||||||
<justify>center</justify>
|
|
||||||
<active>
|
<active>
|
||||||
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<clientpadding r="64" g="68" b="72" a="255"/>
|
<clientpadding r="64" g="68" b="72" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -62,6 +70,7 @@
|
||||||
</grip>
|
</grip>
|
||||||
</active>
|
</active>
|
||||||
<inactive>
|
<inactive>
|
||||||
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<clientpadding r="32" g="36" b="40" a="255"/>
|
<clientpadding r="32" g="36" b="40" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -113,12 +122,10 @@
|
||||||
<secondary r="48" g="64" b="80" a="255"/>
|
<secondary r="48" g="64" b="80" a="255"/>
|
||||||
</grip>
|
</grip>
|
||||||
</inactive>
|
</inactive>
|
||||||
|
<justify>center</justify>
|
||||||
</window>
|
</window>
|
||||||
<menu>
|
<menu>
|
||||||
<border>
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<width>1</width>
|
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
|
||||||
</border>
|
|
||||||
<justify>center</justify>
|
<justify>center</justify>
|
||||||
<title>
|
<title>
|
||||||
<text>
|
<text>
|
||||||
|
|
|
@ -1,17 +1,25 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<openbox_theme version="1" engine="box" xmlns="http://openbox.org/themerc">
|
<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
|
||||||
|
<about>
|
||||||
|
<author></author>
|
||||||
|
<email></email>
|
||||||
|
<webpage></webpage>
|
||||||
|
<comment></comment>
|
||||||
|
</about>
|
||||||
<dimensions>
|
<dimensions>
|
||||||
<handle>4</handle>
|
<handle>4</handle>
|
||||||
<padding x="3" y="3"/>
|
<padding x="3" y="3"/>
|
||||||
|
<window>
|
||||||
|
<border>1</border>
|
||||||
|
<clientpadding x="0" y="0"/>
|
||||||
|
</window>
|
||||||
|
<menu>
|
||||||
|
<border>1</border>
|
||||||
|
</menu>
|
||||||
</dimensions>
|
</dimensions>
|
||||||
<window>
|
<window>
|
||||||
<border>
|
|
||||||
<width>1</width>
|
|
||||||
<primary r="78" g="78" b="78" a="255"/>
|
|
||||||
</border>
|
|
||||||
<clientpadding x="0" y="0"/>
|
|
||||||
<justify>center</justify>
|
|
||||||
<active>
|
<active>
|
||||||
|
<border r="78" g="78" b="78" a="255"/>
|
||||||
<clientpadding r="238" g="238" b="236" a="255"/>
|
<clientpadding r="238" g="238" b="236" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -62,6 +70,7 @@
|
||||||
</grip>
|
</grip>
|
||||||
</active>
|
</active>
|
||||||
<inactive>
|
<inactive>
|
||||||
|
<border r="78" g="78" b="78" a="255"/>
|
||||||
<clientpadding r="238" g="238" b="236" a="255"/>
|
<clientpadding r="238" g="238" b="236" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -110,12 +119,10 @@
|
||||||
<style>parentrelative</style>
|
<style>parentrelative</style>
|
||||||
</grip>
|
</grip>
|
||||||
</inactive>
|
</inactive>
|
||||||
|
<justify>center</justify>
|
||||||
</window>
|
</window>
|
||||||
<menu>
|
<menu>
|
||||||
<border>
|
<border r="78" g="78" b="78" a="255"/>
|
||||||
<width>1</width>
|
|
||||||
<primary r="78" g="78" b="78" a="255"/>
|
|
||||||
</border>
|
|
||||||
<justify>center</justify>
|
<justify>center</justify>
|
||||||
<overlap>2</overlap>
|
<overlap>2</overlap>
|
||||||
<title>
|
<title>
|
||||||
|
|
|
@ -1,16 +1,25 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<openbox_theme version="1" engine="box" xmlns="http://openbox.org/themerc">
|
<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
|
||||||
|
<about>
|
||||||
|
<author></author>
|
||||||
|
<email></email>
|
||||||
|
<webpage></webpage>
|
||||||
|
<comment></comment>
|
||||||
|
</about>
|
||||||
<dimensions>
|
<dimensions>
|
||||||
<handle>3</handle>
|
<handle>3</handle>
|
||||||
<padding x="2" y="2"/>
|
<padding x="2" y="2"/>
|
||||||
|
<window>
|
||||||
|
<border>1</border>
|
||||||
|
<clientpadding x="0" y="0"/>
|
||||||
|
</window>
|
||||||
|
<menu>
|
||||||
|
<border>1</border>
|
||||||
|
</menu>
|
||||||
</dimensions>
|
</dimensions>
|
||||||
<window>
|
<window>
|
||||||
<border>
|
|
||||||
<width>1</width>
|
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
|
||||||
</border>
|
|
||||||
<clientpadding x="0" y="0"/>
|
|
||||||
<active>
|
<active>
|
||||||
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
<primary r="255" g="255" b="255" a="255"/>
|
<primary r="255" g="255" b="255" a="255"/>
|
||||||
|
@ -68,6 +77,7 @@
|
||||||
</grip>
|
</grip>
|
||||||
</active>
|
</active>
|
||||||
<inactive>
|
<inactive>
|
||||||
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
<primary r="0" g="0" b="0" a="255"/>
|
||||||
|
@ -126,10 +136,7 @@
|
||||||
</inactive>
|
</inactive>
|
||||||
</window>
|
</window>
|
||||||
<menu>
|
<menu>
|
||||||
<border>
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<width>1</width>
|
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
|
||||||
</border>
|
|
||||||
<justify>left</justify>
|
<justify>left</justify>
|
||||||
<overlap>0</overlap>
|
<overlap>0</overlap>
|
||||||
<title>
|
<title>
|
||||||
|
|
|
@ -1,16 +1,25 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<openbox_theme version="1" engine="box" xmlns="http://openbox.org/themerc">
|
<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
|
||||||
|
<about>
|
||||||
|
<author></author>
|
||||||
|
<email></email>
|
||||||
|
<webpage></webpage>
|
||||||
|
<comment></comment>
|
||||||
|
</about>
|
||||||
<dimensions>
|
<dimensions>
|
||||||
<handle>3</handle>
|
<handle>3</handle>
|
||||||
<padding x="2" y="2"/>
|
<padding x="2" y="2"/>
|
||||||
|
<window>
|
||||||
|
<border>1</border>
|
||||||
|
<clientpadding x="0" y="0"/>
|
||||||
|
</window>
|
||||||
|
<menu>
|
||||||
|
<border>1</border>
|
||||||
|
</menu>
|
||||||
</dimensions>
|
</dimensions>
|
||||||
<window>
|
<window>
|
||||||
<border>
|
|
||||||
<width>1</width>
|
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
|
||||||
</border>
|
|
||||||
<clientpadding x="0" y="0"/>
|
|
||||||
<active>
|
<active>
|
||||||
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
<primary r="255" g="255" b="255" a="255"/>
|
<primary r="255" g="255" b="255" a="255"/>
|
||||||
|
@ -68,6 +77,7 @@
|
||||||
</grip>
|
</grip>
|
||||||
</active>
|
</active>
|
||||||
<inactive>
|
<inactive>
|
||||||
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
<primary r="0" g="0" b="0" a="255"/>
|
||||||
|
@ -126,10 +136,7 @@
|
||||||
</inactive>
|
</inactive>
|
||||||
</window>
|
</window>
|
||||||
<menu>
|
<menu>
|
||||||
<border>
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<width>1</width>
|
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
|
||||||
</border>
|
|
||||||
<justify>left</justify>
|
<justify>left</justify>
|
||||||
<overlap>0</overlap>
|
<overlap>0</overlap>
|
||||||
<title>
|
<title>
|
||||||
|
|
|
@ -1,17 +1,25 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<openbox_theme version="1" engine="box" xmlns="http://openbox.org/themerc">
|
<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
|
||||||
|
<about>
|
||||||
|
<author></author>
|
||||||
|
<email></email>
|
||||||
|
<webpage></webpage>
|
||||||
|
<comment></comment>
|
||||||
|
</about>
|
||||||
<dimensions>
|
<dimensions>
|
||||||
<handle>0</handle>
|
<handle>0</handle>
|
||||||
<padding x="1" y="1"/>
|
<padding x="1" y="1"/>
|
||||||
|
<window>
|
||||||
|
<border>1</border>
|
||||||
|
<clientpadding x="0" y="0"/>
|
||||||
|
</window>
|
||||||
|
<menu>
|
||||||
|
<border>1</border>
|
||||||
|
</menu>
|
||||||
</dimensions>
|
</dimensions>
|
||||||
<window>
|
<window>
|
||||||
<border>
|
|
||||||
<width>1</width>
|
|
||||||
<primary r="34" g="51" b="68" a="255"/>
|
|
||||||
</border>
|
|
||||||
<clientpadding x="0" y="0"/>
|
|
||||||
<justify>left</justify>
|
|
||||||
<active>
|
<active>
|
||||||
|
<border r="34" g="51" b="68" a="255"/>
|
||||||
<clientpadding r="0" g="255" b="0" a="255"/>
|
<clientpadding r="0" g="255" b="0" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -79,6 +87,7 @@
|
||||||
</grip>
|
</grip>
|
||||||
</active>
|
</active>
|
||||||
<inactive>
|
<inactive>
|
||||||
|
<border r="34" g="51" b="68" a="255"/>
|
||||||
<clientpadding r="127" g="127" b="127" a="255"/>
|
<clientpadding r="127" g="127" b="127" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -149,12 +158,10 @@
|
||||||
<border r="0" g="0" b="0" a="255"/>
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
</grip>
|
</grip>
|
||||||
</inactive>
|
</inactive>
|
||||||
|
<justify>left</justify>
|
||||||
</window>
|
</window>
|
||||||
<menu>
|
<menu>
|
||||||
<border>
|
<border r="34" g="51" b="68" a="255"/>
|
||||||
<width>1</width>
|
|
||||||
<primary r="34" g="51" b="68" a="255"/>
|
|
||||||
</border>
|
|
||||||
<justify>center</justify>
|
<justify>center</justify>
|
||||||
<title>
|
<title>
|
||||||
<text>
|
<text>
|
||||||
|
|
|
@ -1,17 +1,25 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<openbox_theme version="1" engine="box" xmlns="http://openbox.org/themerc">
|
<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
|
||||||
|
<about>
|
||||||
|
<author></author>
|
||||||
|
<email></email>
|
||||||
|
<webpage></webpage>
|
||||||
|
<comment></comment>
|
||||||
|
</about>
|
||||||
<dimensions>
|
<dimensions>
|
||||||
<handle>2</handle>
|
<handle>2</handle>
|
||||||
<padding x="2" y="2"/>
|
<padding x="2" y="2"/>
|
||||||
|
<window>
|
||||||
|
<border>1</border>
|
||||||
|
<clientpadding x="0" y="0"/>
|
||||||
|
</window>
|
||||||
|
<menu>
|
||||||
|
<border>1</border>
|
||||||
|
</menu>
|
||||||
</dimensions>
|
</dimensions>
|
||||||
<window>
|
<window>
|
||||||
<border>
|
|
||||||
<width>1</width>
|
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
|
||||||
</border>
|
|
||||||
<clientpadding x="0" y="0"/>
|
|
||||||
<justify>left</justify>
|
|
||||||
<active>
|
<active>
|
||||||
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<clientpadding r="238" g="238" b="238" a="255"/>
|
<clientpadding r="238" g="238" b="238" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -72,6 +80,7 @@
|
||||||
</grip>
|
</grip>
|
||||||
</active>
|
</active>
|
||||||
<inactive>
|
<inactive>
|
||||||
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<clientpadding r="238" g="238" b="238" a="255"/>
|
<clientpadding r="238" g="238" b="238" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -133,12 +142,10 @@
|
||||||
<border r="191" g="191" b="191" a="255"/>
|
<border r="191" g="191" b="191" a="255"/>
|
||||||
</grip>
|
</grip>
|
||||||
</inactive>
|
</inactive>
|
||||||
|
<justify>left</justify>
|
||||||
</window>
|
</window>
|
||||||
<menu>
|
<menu>
|
||||||
<border>
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<width>1</width>
|
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
|
||||||
</border>
|
|
||||||
<justify>left</justify>
|
<justify>left</justify>
|
||||||
<overlap>0</overlap>
|
<overlap>0</overlap>
|
||||||
<title>
|
<title>
|
||||||
|
|
|
@ -1,17 +1,25 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<openbox_theme version="1" engine="box" xmlns="http://openbox.org/themerc">
|
<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
|
||||||
|
<about>
|
||||||
|
<author></author>
|
||||||
|
<email></email>
|
||||||
|
<webpage></webpage>
|
||||||
|
<comment></comment>
|
||||||
|
</about>
|
||||||
<dimensions>
|
<dimensions>
|
||||||
<handle>3</handle>
|
<handle>3</handle>
|
||||||
<padding x="1" y="1"/>
|
<padding x="1" y="1"/>
|
||||||
|
<window>
|
||||||
|
<border>1</border>
|
||||||
|
<clientpadding x="0" y="0"/>
|
||||||
|
</window>
|
||||||
|
<menu>
|
||||||
|
<border>1</border>
|
||||||
|
</menu>
|
||||||
</dimensions>
|
</dimensions>
|
||||||
<window>
|
<window>
|
||||||
<border>
|
|
||||||
<width>1</width>
|
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
|
||||||
</border>
|
|
||||||
<clientpadding x="0" y="0"/>
|
|
||||||
<justify>left</justify>
|
|
||||||
<active>
|
<active>
|
||||||
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<clientpadding r="247" g="247" b="247" a="255"/>
|
<clientpadding r="247" g="247" b="247" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -59,6 +67,7 @@
|
||||||
</grip>
|
</grip>
|
||||||
</active>
|
</active>
|
||||||
<inactive>
|
<inactive>
|
||||||
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<clientpadding r="247" g="247" b="247" a="255"/>
|
<clientpadding r="247" g="247" b="247" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -101,12 +110,10 @@
|
||||||
<style>parentrelative</style>
|
<style>parentrelative</style>
|
||||||
</grip>
|
</grip>
|
||||||
</inactive>
|
</inactive>
|
||||||
|
<justify>left</justify>
|
||||||
</window>
|
</window>
|
||||||
<menu>
|
<menu>
|
||||||
<border>
|
<border r="0" g="0" b="0" a="255"/>
|
||||||
<width>1</width>
|
|
||||||
<primary r="0" g="0" b="0" a="255"/>
|
|
||||||
</border>
|
|
||||||
<justify>left</justify>
|
<justify>left</justify>
|
||||||
<overlap>2</overlap>
|
<overlap>2</overlap>
|
||||||
<title>
|
<title>
|
||||||
|
|
|
@ -1,17 +1,25 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<openbox_theme version="1" engine="box" xmlns="http://openbox.org/themerc">
|
<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
|
||||||
|
<about>
|
||||||
|
<author></author>
|
||||||
|
<email></email>
|
||||||
|
<webpage></webpage>
|
||||||
|
<comment></comment>
|
||||||
|
</about>
|
||||||
<dimensions>
|
<dimensions>
|
||||||
<handle>0</handle>
|
<handle>0</handle>
|
||||||
<padding x="1" y="1"/>
|
<padding x="1" y="1"/>
|
||||||
|
<window>
|
||||||
|
<border>1</border>
|
||||||
|
<clientpadding x="0" y="0"/>
|
||||||
|
</window>
|
||||||
|
<menu>
|
||||||
|
<border>1</border>
|
||||||
|
</menu>
|
||||||
</dimensions>
|
</dimensions>
|
||||||
<window>
|
<window>
|
||||||
<border>
|
|
||||||
<width>1</width>
|
|
||||||
<primary r="109" g="109" b="109" a="255"/>
|
|
||||||
</border>
|
|
||||||
<clientpadding x="0" y="0"/>
|
|
||||||
<justify>left</justify>
|
|
||||||
<active>
|
<active>
|
||||||
|
<border r="109" g="109" b="109" a="255"/>
|
||||||
<clientpadding r="76" g="76" b="76" a="255"/>
|
<clientpadding r="76" g="76" b="76" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -60,6 +68,7 @@
|
||||||
</grip>
|
</grip>
|
||||||
</active>
|
</active>
|
||||||
<inactive>
|
<inactive>
|
||||||
|
<border r="109" g="109" b="109" a="255"/>
|
||||||
<clientpadding r="112" g="112" b="112" a="255"/>
|
<clientpadding r="112" g="112" b="112" a="255"/>
|
||||||
<label>
|
<label>
|
||||||
<text>
|
<text>
|
||||||
|
@ -99,12 +108,10 @@
|
||||||
<primary r="230" g="230" b="224" a="255"/>
|
<primary r="230" g="230" b="224" a="255"/>
|
||||||
</grip>
|
</grip>
|
||||||
</inactive>
|
</inactive>
|
||||||
|
<justify>left</justify>
|
||||||
</window>
|
</window>
|
||||||
<menu>
|
<menu>
|
||||||
<border>
|
<border r="109" g="109" b="109" a="255"/>
|
||||||
<width>1</width>
|
|
||||||
<primary r="109" g="109" b="109" a="255"/>
|
|
||||||
</border>
|
|
||||||
<justify>left</justify>
|
<justify>left</justify>
|
||||||
<overlap>0</overlap>
|
<overlap>0</overlap>
|
||||||
<title>
|
<title>
|
||||||
|
|
|
@ -326,6 +326,10 @@ int main(int argc, char **argv)
|
||||||
xmlSetProp(root, (const xmlChar*)"version", (const xmlChar*)"1");
|
xmlSetProp(root, (const xmlChar*)"version", (const xmlChar*)"1");
|
||||||
xmlSetProp(root, (const xmlChar*)"xmlns",
|
xmlSetProp(root, (const xmlChar*)"xmlns",
|
||||||
(const xmlChar*)"http://openbox.org/themerc");
|
(const xmlChar*)"http://openbox.org/themerc");
|
||||||
|
CONT2("about", "author", "");
|
||||||
|
CONT2("about", "email", "");
|
||||||
|
CONT2("about", "webpage", "");
|
||||||
|
CONT2("about", "comment", "");
|
||||||
|
|
||||||
if (read_int(db, "window.handle.width", &i))
|
if (read_int(db, "window.handle.width", &i))
|
||||||
CONT2("dimensions", "handle", NUM(i));
|
CONT2("dimensions", "handle", NUM(i));
|
||||||
|
@ -336,21 +340,22 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (read_int(db, "borderWidth", &i)) {
|
if (read_int(db, "borderWidth", &i)) {
|
||||||
CONT3("window", "border", "width", NUM(i));
|
CONT3("dimensions", "window", "border", NUM(i));
|
||||||
CONT3("menu", "border", "width", NUM(i));
|
CONT3("dimensions", "menu", "border", NUM(i));
|
||||||
} else if (read_int(db, "border.width", &i)) {
|
} else if (read_int(db, "border.width", &i)) {
|
||||||
CONT3("window", "border", "width", NUM(i));
|
CONT3("dimensions", "window", "border", NUM(i));
|
||||||
CONT3("menu", "border", "width", NUM(i));
|
CONT3("dimensions", "menu", "border", NUM(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (read_color(db, "border.color", &i, &j, &k)) {
|
if (read_color(db, "border.color", &i, &j, &k)) {
|
||||||
COLOR3("window", "border", "primary", i, j, k, 255);
|
COLOR3("window", "active", "border", i, j, k, 255);
|
||||||
COLOR3("menu", "border", "primary", i, j, k, 255);
|
COLOR3("window", "inactive", "border", i, j, k, 255);
|
||||||
|
COLOR2("menu", "border", i, j, k, 255);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (read_int(db, "window.client.padding.width", &i)) {
|
if (read_int(db, "window.client.padding.width", &i)) {
|
||||||
ATTR2("window", "clientpadding", "x", NUM(i));
|
ATTR3("dimensions", "window", "clientpadding", "x", NUM(i));
|
||||||
ATTR2("window", "clientpadding", "y", NUM(i));
|
ATTR3("dimensions", "window", "clientpadding", "y", NUM(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (read_string(db, "window.label.text.justify", &s)) {
|
if (read_string(db, "window.label.text.justify", &s)) {
|
||||||
|
|
Loading…
Reference in a new issue