fbt/lemonbar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added a feature to switch between main and alt font in syntax

Browse Source
This commit is contained in:
Kevin van der Burgt 2014-04-19 18:48:09 +02:00
parent 3919a0045c
commit d0ba041662
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.pod
View File

@ -144,6 +144,16 @@ Draw a line over the text.
Draw a line under the text. Draw a line under the text.
B<Font usage>
=item B<+>I<fm>
Sets the current font to the main (1st) font
= itemB<+>I<fa>
Sets the current font to the alternative (2nd) font
=back =back
=head1 OUTPUT =head1 OUTPUT

16
bar.c
View File

@ -25,7 +25,7 @@ typedef struct font_t {
uint16_t char_min; uint16_t char_min;
xcb_charinfo_t *width_lut; xcb_charinfo_t *width_lut;
} font_t; } font_t;
//
typedef struct monitor_t { typedef struct monitor_t {
int x, width; int x, width;
xcb_window_t window; xcb_window_t window;
@ -80,6 +80,7 @@ static char *mfont, *afont;
static uint32_t fgc, bgc, ugc; static uint32_t fgc, bgc, ugc;
static uint32_t dfgc, dbgc; static uint32_t dfgc, dbgc;
static area_stack_t astack; static area_stack_t astack;
static bool use_alt_font = false;
void void
update_gc (void) update_gc (void)
@ -359,6 +360,14 @@ parse (char *text)
fill_rect(cur_mon->pixmap, gc[GC_CLEAR], 0, 0, cur_mon->width, bh); fill_rect(cur_mon->pixmap, gc[GC_CLEAR], 0, 0, cur_mon->width, bh);
break; break;
case 'f':
if(*p == 'm')
{ use_alt_font = false; }
else if(*p == 'a')
{ use_alt_font = true; }
break;
/* In case of error keep parsing after the closing } */ /* In case of error keep parsing after the closing } */
default: default:
p = end; p = end;
@ -387,8 +396,13 @@ parse (char *text)
p += 1; p += 1;
} }
/* What font should be primary, use main: %(fm) or use alt %(fa) */
/* If the character is outside the main font charset use the alternate font */ /* If the character is outside the main font charset use the alternate font */
if(use_alt_font == true) {
cur_font = (ucs < alt_font->char_min || ucs > alt_font->char_max) ? main_font : alt_font;
} else {
cur_font = (ucs < main_font->char_min || ucs > main_font->char_max) ? alt_font : main_font; cur_font = (ucs < main_font->char_min || ucs > main_font->char_max) ? alt_font : main_font;
}
xcb_change_gc(c, gc[GC_DRAW] , XCB_GC_FONT, (const uint32_t []){ cur_font->ptr }); xcb_change_gc(c, gc[GC_DRAW] , XCB_GC_FONT, (const uint32_t []){ cur_font->ptr });