diff options
author | irungentoo <irungentoo@gmail.com> | 2013-08-07 06:04:11 -0700 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-08-07 06:04:11 -0700 |
commit | 48d7d60a47fd0b18bade920ee68155d032cc96b1 (patch) | |
tree | abb68cc4a3a401a61c1ff191af63e3d0c6c4d4ec /testing | |
parent | 6864e9c93119f8304356744072fe515e007de81a (diff) | |
parent | 3f3be026b7b8cbf5eecaa7272c780c651698702e (diff) |
Merge pull request #370 from JFreegman/master
Fixed two bugs
Diffstat (limited to 'testing')
-rw-r--r-- | testing/toxic/main.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/testing/toxic/main.c b/testing/toxic/main.c index 1ba8b6c9..8de76244 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c | |||
@@ -249,6 +249,7 @@ static void load_data(char *path) | |||
249 | static void draw_bar() | 249 | static void draw_bar() |
250 | { | 250 | { |
251 | static int odd = 0; | 251 | static int odd = 0; |
252 | int blinkrate = 30; | ||
252 | 253 | ||
253 | attron(COLOR_PAIR(4)); | 254 | attron(COLOR_PAIR(4)); |
254 | mvhline(LINES - 2, 0, '_', COLS); | 255 | mvhline(LINES - 2, 0, '_', COLS); |
@@ -266,14 +267,13 @@ static void draw_bar() | |||
266 | if (i == active_window) | 267 | if (i == active_window) |
267 | attron(A_BOLD); | 268 | attron(A_BOLD); |
268 | 269 | ||
269 | odd = (odd+1) % 10; | 270 | odd = (odd+1) % blinkrate; |
270 | if (windows[i].blink && (odd < 5)) { | 271 | if (windows[i].blink && (odd < (blinkrate/2))) { |
271 | attron(COLOR_PAIR(3)); | 272 | attron(COLOR_PAIR(3)); |
272 | } | 273 | } |
273 | |||
274 | printw(" %s", windows[i].title); | 274 | printw(" %s", windows[i].title); |
275 | if (windows[i].blink && (odd < 5)) { | 275 | if (windows[i].blink && (odd < (blinkrate/2))) { |
276 | attron(COLOR_PAIR(3)); | 276 | attroff(COLOR_PAIR(3)); |
277 | } | 277 | } |
278 | if (i == active_window) { | 278 | if (i == active_window) { |
279 | attroff(A_BOLD); | 279 | attroff(A_BOLD); |
@@ -375,9 +375,8 @@ int main(int argc, char *argv[]) | |||
375 | ch = getch(); | 375 | ch = getch(); |
376 | if (ch == '\t' || ch == KEY_BTAB) | 376 | if (ch == '\t' || ch == KEY_BTAB) |
377 | set_active_window(ch); | 377 | set_active_window(ch); |
378 | else if (ch != ERR) { | 378 | else if (ch != ERR) |
379 | a->onKey(a, ch); | 379 | a->onKey(a, ch); |
380 | } | ||
381 | } | 380 | } |
382 | return 0; | 381 | return 0; |
383 | } | 382 | } |