Moved main.c to maaster

This commit is contained in:
Sean Qureshi 2013-08-07 10:36:32 -07:00
parent 2b916b96bd
commit ece3407c55

View File

@ -22,7 +22,7 @@ extern int add_req(uint8_t *public_key); // XXX
/* Holds status of chat windows */ /* Holds status of chat windows */
char WINDOW_STATUS[MAX_WINDOW_SLOTS]; char WINDOW_STATUS[MAX_WINDOW_SLOTS];
#define TOXICVER "0.1.0" //Will be moved to a -D flag later #define TOXICVER "0.1.0" //Will be moved to a -D flag later
static ToxWindow windows[MAX_WINDOW_SLOTS]; static ToxWindow windows[MAX_WINDOW_SLOTS];
static ToxWindow* prompt; static ToxWindow* prompt;
@ -250,6 +250,7 @@ static void load_data(char *path)
static void draw_bar() static void draw_bar()
{ {
static int odd = 0; static int odd = 0;
int blinkrate = 30;
attron(COLOR_PAIR(4)); attron(COLOR_PAIR(4));
mvhline(LINES - 2, 0, '_', COLS); mvhline(LINES - 2, 0, '_', COLS);
@ -258,7 +259,7 @@ static void draw_bar()
move(LINES - 1, 0); move(LINES - 1, 0);
attron(COLOR_PAIR(4) | A_BOLD); attron(COLOR_PAIR(4) | A_BOLD);
printw(" TOXIC " TOXICVER " |"); printw(" TOXIC " TOXICVER " |");
attroff(COLOR_PAIR(4) | A_BOLD); attroff(COLOR_PAIR(4) | A_BOLD);
int i; int i;
@ -267,14 +268,13 @@ static void draw_bar()
if (i == active_window) if (i == active_window)
attron(A_BOLD); attron(A_BOLD);
odd = (odd+1) % 10; odd = (odd+1) % blinkrate;
if (windows[i].blink && (odd < 5)) { if (windows[i].blink && (odd < (blinkrate/2))) {
attron(COLOR_PAIR(3)); attron(COLOR_PAIR(3));
} }
printw(" %s", windows[i].title); printw(" %s", windows[i].title);
if (windows[i].blink && (odd < 5)) { if (windows[i].blink && (odd < (blinkrate/2))) {
attron(COLOR_PAIR(3)); attroff(COLOR_PAIR(3));
} }
if (i == active_window) { if (i == active_window) {
attroff(A_BOLD); attroff(A_BOLD);
@ -376,9 +376,8 @@ int main(int argc, char *argv[])
ch = getch(); ch = getch();
if (ch == '\t' || ch == KEY_BTAB) if (ch == '\t' || ch == KEY_BTAB)
set_active_window(ch); set_active_window(ch);
else if (ch != ERR) { else if (ch != ERR)
a->onKey(a, ch); a->onKey(a, ch);
}
} }
return 0; return 0;
} }