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

Better naming. Avoid useless check when xinerama isn't active

This commit is contained in:
LemonBoy 2014-01-24 11:38:49 +00:00
parent fbeadbe9de
commit 0d937fcadb
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bar.c
View File

@ -149,8 +149,8 @@ parse (char *text)
int pos_x = 0; int pos_x = 0;
int align = 0; int align = 0;
int scr_idx = 0; int screen_idx = 0;
screen_t *screen = &screens[scr_idx]; screen_t *screen_ptr = &screens[screen_idx];
xcb_fill_rect (clear_gc, 0, 0, bar_width, BAR_HEIGHT); xcb_fill_rect (clear_gc, 0, 0, bar_width, BAR_HEIGHT);
@ -177,15 +177,15 @@ parse (char *text)
#if XINERAMA #if XINERAMA
case 's': case 's':
if ((*p) == 'r') { if ((*p) == 'r') {
scr_idx = num_screens - 1; screen_idx = num_screens - 1;
} else if ((*p) == 'l') { } else if ((*p) == 'l') {
scr_idx = 0; screen_idx = 0;
} else if ((*p) == 'n') { } else if ((*p) == 'n') {
scr_idx++; screen_idx++;
} else if ((*p) == 'p') { } else if ((*p) == 'p') {
scr_idx--; screen_idx--;
} else if (isdigit(*p)) { } else if (isdigit(*p)) {
scr_idx = (*p)-'0'; screen_idx = (*p)-'0';
} else { } else {
break; break;
} }
@ -194,12 +194,12 @@ parse (char *text)
p++; p++;
/* Sanity checks */ /* Sanity checks */
if (scr_idx < 0) if (screen_idx < 0)
scr_idx = 0; screen_idx = 0;
if (scr_idx > num_screens - 1) if (screen_idx > num_screens - 1)
scr_idx = num_screens - 1; screen_idx = num_screens - 1;
screen = &screens[scr_idx]; screen_ptr = &screens[screen_idx];
align = ALIGN_L; align = ALIGN_L;
pos_x = 0; pos_x = 0;
@ -219,8 +219,10 @@ parse (char *text)
break; break;
} }
} else { } else {
if (!screen->window) #if XINERAMA
if (!screen_ptr->window)
continue; continue;
#endif
/* utf-8 -> ucs-2 */ /* utf-8 -> ucs-2 */
wchar_t t; wchar_t t;
@ -248,7 +250,7 @@ parse (char *text)
else else
xcb_set_fontset (FONT_MAIN); xcb_set_fontset (FONT_MAIN);
pos_x += draw_char (screen, pos_x, align, t); pos_x += draw_char (screen_ptr, pos_x, align, t);
} }
} }
} }