Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 22:13:26 +01:00
Code Issues Projects Releases Wiki Activity

fix bug where tab alert colours weren't being properly prioritized

Browse Source
This commit is contained in:
Jfreegman 2014-08-07 19:53:47 -04:00
parent bb85f31bb2
commit e75cf4f3ad
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/notify.c
View File

@ -443,10 +443,10 @@ void m_notify_action(NotifyNotification *box, char *action, void* data)
int sound_notify(ToxWindow* self, Notification notif, uint64_t flags, int* id_indicator) int sound_notify(ToxWindow* self, Notification notif, uint64_t flags, int* id_indicator)
{ {
/* Consider colored notify as primary */ /* Consider colored notify as primary */
if (self && self->alert == WINDOW_ALERT_NONE) { if (self) {
if (flags & NT_WNDALERT_0) self->alert = WINDOW_ALERT_0; if (flags & NT_WNDALERT_0) self->alert = WINDOW_ALERT_0;
else if (flags & NT_WNDALERT_1) self->alert = WINDOW_ALERT_1; else if ( (flags & NT_WNDALERT_1) && (!self->alert || self->alert > WINDOW_ALERT_0) ) self->alert = WINDOW_ALERT_1;
else if (flags & NT_WNDALERT_2) self->alert = WINDOW_ALERT_2; else if ( (flags & NT_WNDALERT_2) && (!self->alert || self->alert > WINDOW_ALERT_1) ) self->alert = WINDOW_ALERT_2;
} }
if ((flags & NT_RESTOL && Control.cooldown > time(NULL)) || if ((flags & NT_RESTOL && Control.cooldown > time(NULL)) ||
@ -487,10 +487,10 @@ int sound_notify(ToxWindow* self, Notification notif, uint64_t flags, int* id_in
int sound_notify2(ToxWindow* self, Notification notif, uint64_t flags, int id) int sound_notify2(ToxWindow* self, Notification notif, uint64_t flags, int id)
{ {
/* Consider colored notify as primary */ /* Consider colored notify as primary */
if (self && self->alert == WINDOW_ALERT_NONE) { if (self) {
if (flags & NT_WNDALERT_0) self->alert = WINDOW_ALERT_0; if (flags & NT_WNDALERT_0) self->alert = WINDOW_ALERT_0;
else if (flags & NT_WNDALERT_1) self->alert = WINDOW_ALERT_1; else if ( (flags & NT_WNDALERT_1) && (!self->alert || self->alert > WINDOW_ALERT_0) ) self->alert = WINDOW_ALERT_1;
else if (flags & NT_WNDALERT_2) self->alert = WINDOW_ALERT_2; else if ( (flags & NT_WNDALERT_2) && (!self->alert || self->alert > WINDOW_ALERT_1) ) self->alert = WINDOW_ALERT_2;
} }
if ((flags & NT_RESTOL && Control.cooldown > time(NULL)) || if ((flags & NT_RESTOL && Control.cooldown > time(NULL)) ||
@ -636,10 +636,10 @@ int box_notify2(ToxWindow* self, Notification notif, uint64_t flags, int id, con
int box_silent_notify(ToxWindow* self, uint64_t flags, int* id_indicator, const char* title, const char* format, ...) int box_silent_notify(ToxWindow* self, uint64_t flags, int* id_indicator, const char* title, const char* format, ...)
{ {
/* Always do colored notify */ /* Always do colored notify */
if (self && self->alert == WINDOW_ALERT_NONE) { if (self) {
if (flags & NT_WNDALERT_0) self->alert = WINDOW_ALERT_0; if (flags & NT_WNDALERT_0) self->alert = WINDOW_ALERT_0;
else if (flags & NT_WNDALERT_1) self->alert = WINDOW_ALERT_1; else if ( (flags & NT_WNDALERT_1) && (!self->alert || self->alert > WINDOW_ALERT_0) ) self->alert = WINDOW_ALERT_1;
else if (flags & NT_WNDALERT_2) self->alert = WINDOW_ALERT_2; else if ( (flags & NT_WNDALERT_2) && (!self->alert || self->alert > WINDOW_ALERT_1) ) self->alert = WINDOW_ALERT_2;
} }
if ((flags & NT_RESTOL && Control.cooldown > time(NULL)) || if ((flags & NT_RESTOL && Control.cooldown > time(NULL)) ||
@ -692,10 +692,10 @@ int box_silent_notify(ToxWindow* self, uint64_t flags, int* id_indicator, const
int box_silent_notify2(ToxWindow* self, uint64_t flags, int id, const char* format, ...) int box_silent_notify2(ToxWindow* self, uint64_t flags, int id, const char* format, ...)
{ {
/* Always do colored notify */ /* Always do colored notify */
if (self && self->alert == WINDOW_ALERT_NONE) { if (self) {
if (flags & NT_WNDALERT_0) self->alert = WINDOW_ALERT_0; if (flags & NT_WNDALERT_0) self->alert = WINDOW_ALERT_0;
else if (flags & NT_WNDALERT_1) self->alert = WINDOW_ALERT_1; else if ( (flags & NT_WNDALERT_1) && (!self->alert || self->alert > WINDOW_ALERT_0) ) self->alert = WINDOW_ALERT_1;
else if (flags & NT_WNDALERT_2) self->alert = WINDOW_ALERT_2; else if ( (flags & NT_WNDALERT_2) && (!self->alert || self->alert > WINDOW_ALERT_1) ) self->alert = WINDOW_ALERT_2;
} }
if ((flags & NT_RESTOL && Control.cooldown > time(NULL)) || if ((flags & NT_RESTOL && Control.cooldown > time(NULL)) ||

11
src/windows.c
View File

@ -368,13 +368,12 @@ void on_window_resize(void)
} }
} }
static void draw_window_tab(ToxWindow toxwin) static void draw_window_tab(ToxWindow *toxwin)
{ {
if (toxwin.alert) attron(COLOR_PAIR(toxwin.alert)); if (toxwin->alert != WINDOW_ALERT_NONE) attron(COLOR_PAIR(toxwin->alert));
clrtoeol(); clrtoeol();
printw(" [%s]", toxwin.name); printw(" [%s]", toxwin->name);
if (toxwin->alert != WINDOW_ALERT_NONE) attroff(COLOR_PAIR(toxwin->alert));
if (toxwin.alert) attroff(COLOR_PAIR(toxwin.alert));
} }
static void draw_bar(void) static void draw_bar(void)
@ -404,7 +403,7 @@ static void draw_bar(void)
attron(A_BOLD); attron(A_BOLD);
draw_window_tab(windows[i]); draw_window_tab(&windows[i]);
if (windows + i == active_window) if (windows + i == active_window)

2
src/windows.h
View File

@ -52,7 +52,7 @@ enum {
BLACK, BLACK,
} C_COLOURS; } C_COLOURS;
/* tab alert types: lower types take priority */ /* tab alert types: lower types take priority (this relies on the order of C_COLOURS) */
typedef enum { typedef enum {
WINDOW_ALERT_NONE = 0, WINDOW_ALERT_NONE = 0,
WINDOW_ALERT_0 = GREEN, WINDOW_ALERT_0 = GREEN,