Skip to content

make focus cycle themeable #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stfnwp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make focus cycle themeable #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions obrender/theme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
READ_COLOR("osd.button.focused.box.color",
theme->osd_focused_lineart,
RrColorCopy(theme->titlebut_focused_hover_color));
READ_COLOR("focus.cycle.bg.color",
theme->focus_cycle_bg_color,
RrColorNew(inst, 0, 0, 0));
READ_COLOR("focus.cycle.border.color",
theme->focus_cycle_border_color,
RrColorNew(inst, 0xFF, 0xFF, 0xFF));

/* load window buttons */

Expand Down Expand Up @@ -1061,6 +1067,8 @@ void RrThemeFree(RrTheme *theme)
RrColorFree(theme->osd_focused_lineart);
RrColorFree(theme->menu_title_shadow_color);
RrColorFree(theme->menu_text_shadow_color);
RrColorFree(theme->focus_cycle_bg_color);
RrColorFree(theme->focus_cycle_border_color);

g_free(theme->def_win_icon);

Expand Down
2 changes: 2 additions & 0 deletions obrender/theme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ struct _RrTheme {
RrColor *osd_focused_lineart;
RrColor *menu_title_shadow_color;
RrColor *menu_text_shadow_color;
RrColor *focus_cycle_bg_color;
RrColor *focus_cycle_border_color;

/* style settings - pics */
RrPixel32 *def_win_icon; /* RGBA */
Expand Down
30 changes: 20 additions & 10 deletions openbox/focus_cycle_indicator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ static struct
} focus_indicator;

static RrAppearance *a_focus_indicator;
static RrColor *color_white;
static RrColor *border_color;
static gboolean visible;

static Window create_window(Window parent, gulong mask,
Expand Down Expand Up @@ -92,28 +92,28 @@ void focus_cycle_indicator_startup(gboolean reconfig)
window_add(&focus_indicator.bottom.window,
INTERNAL_AS_WINDOW(&focus_indicator.bottom));

color_white = RrColorNew(ob_rr_inst, 0xff, 0xff, 0xff);

a_focus_indicator = RrAppearanceNew(ob_rr_inst, 4);
a_focus_indicator->surface.grad = RR_SURFACE_SOLID;
a_focus_indicator->surface.relief = RR_RELIEF_FLAT;
a_focus_indicator->surface.primary = RrColorNew(ob_rr_inst,
0, 0, 0);
a_focus_indicator->surface.primary = ob_rr_theme->focus_cycle_bg_color;

border_color = ob_rr_theme->focus_cycle_border_color;

a_focus_indicator->texture[0].type = RR_TEXTURE_LINE_ART;
a_focus_indicator->texture[0].data.lineart.color = color_white;
a_focus_indicator->texture[0].data.lineart.color = border_color;
a_focus_indicator->texture[1].type = RR_TEXTURE_LINE_ART;
a_focus_indicator->texture[1].data.lineart.color = color_white;
a_focus_indicator->texture[1].data.lineart.color = border_color;
a_focus_indicator->texture[2].type = RR_TEXTURE_LINE_ART;
a_focus_indicator->texture[2].data.lineart.color = color_white;
a_focus_indicator->texture[2].data.lineart.color = border_color;
a_focus_indicator->texture[3].type = RR_TEXTURE_LINE_ART;
a_focus_indicator->texture[3].data.lineart.color = color_white;
a_focus_indicator->texture[3].data.lineart.color = border_color;
}

void focus_cycle_indicator_shutdown(gboolean reconfig)
{
if (reconfig) return;

RrColorFree(color_white);
RrColorFree(border_color);

RrAppearanceFree(a_focus_indicator);

Expand Down Expand Up @@ -204,6 +204,16 @@ void focus_cycle_draw_indicator(ObClient *c)

XMoveResizeWindow(obt_display, focus_indicator.left.window,
x, y, w, h);

a_focus_indicator->surface.primary = ob_rr_theme->focus_cycle_bg_color;

border_color = ob_rr_theme->focus_cycle_border_color;

a_focus_indicator->texture[0].data.lineart.color = border_color;
a_focus_indicator->texture[1].data.lineart.color = border_color;
a_focus_indicator->texture[2].data.lineart.color = border_color;
a_focus_indicator->texture[3].data.lineart.color = border_color;

a_focus_indicator->texture[0].data.lineart.x1 = w-1;
a_focus_indicator->texture[0].data.lineart.y1 = 0;
a_focus_indicator->texture[0].data.lineart.x2 = 0;
Expand Down