1
0
Fork 0

Added roster room themes

This commit is contained in:
James Booth 2016-01-09 21:37:59 +00:00
parent fcbd2592cf
commit cd2458c019
18 changed files with 80 additions and 38 deletions

View File

@ -120,6 +120,8 @@ static struct colours_t {
NCURSES_COLOR_T otrtrusted;
NCURSES_COLOR_T otruntrusted;
NCURSES_COLOR_T rosterheader;
NCURSES_COLOR_T rosterroom;
NCURSES_COLOR_T rosterroomunread;
NCURSES_COLOR_T occupantsheader;
NCURSES_COLOR_T receiptsent;
} colour_prefs;
@ -284,19 +286,23 @@ theme_init_colours(void)
init_pair(43, colour_prefs.otrtrusted, colour_prefs.bkgnd);
init_pair(44, colour_prefs.otruntrusted, colour_prefs.bkgnd);
// subwin headers
// roster
init_pair(45, colour_prefs.rosterheader, colour_prefs.bkgnd);
init_pair(46, colour_prefs.occupantsheader, colour_prefs.bkgnd);
init_pair(46, colour_prefs.rosterroom, colour_prefs.bkgnd);
init_pair(47, colour_prefs.rosterroomunread, colour_prefs.bkgnd);
// occupants
init_pair(48, colour_prefs.occupantsheader, colour_prefs.bkgnd);
// raw
init_pair(47, COLOR_WHITE, colour_prefs.bkgnd);
init_pair(48, COLOR_GREEN, colour_prefs.bkgnd);
init_pair(49, COLOR_RED, colour_prefs.bkgnd);
init_pair(50, COLOR_YELLOW, colour_prefs.bkgnd);
init_pair(51, COLOR_BLUE, colour_prefs.bkgnd);
init_pair(52, COLOR_CYAN, colour_prefs.bkgnd);
init_pair(53, COLOR_BLACK, colour_prefs.bkgnd);
init_pair(54, COLOR_MAGENTA, colour_prefs.bkgnd);
init_pair(49, COLOR_WHITE, colour_prefs.bkgnd);
init_pair(50, COLOR_GREEN, colour_prefs.bkgnd);
init_pair(51, COLOR_RED, colour_prefs.bkgnd);
init_pair(52, COLOR_YELLOW, colour_prefs.bkgnd);
init_pair(53, COLOR_BLUE, colour_prefs.bkgnd);
init_pair(54, COLOR_CYAN, colour_prefs.bkgnd);
init_pair(55, COLOR_BLACK, colour_prefs.bkgnd);
init_pair(56, COLOR_MAGENTA, colour_prefs.bkgnd);
}
static NCURSES_COLOR_T
@ -401,6 +407,8 @@ _load_colours(void)
_set_colour("me", &colour_prefs.me, COLOR_YELLOW, THEME_ME);
_set_colour("them", &colour_prefs.them, COLOR_GREEN, THEME_THEM);
_set_colour("roster.header", &colour_prefs.rosterheader, COLOR_YELLOW, THEME_ROSTER_HEADER);
_set_colour("roster.room", &colour_prefs.rosterroom, COLOR_GREEN, THEME_ROSTER_ROOM);
_set_colour("roster.room.unread", &colour_prefs.rosterroomunread, COLOR_GREEN, THEME_ROSTER_ROOM_UNREAD);
_set_colour("occupants.header", &colour_prefs.occupantsheader, COLOR_YELLOW, THEME_OCCUPANTS_HEADER);
_set_colour("receipt.sent", &colour_prefs.receiptsent, COLOR_RED, THEME_RECEIPT_SENT);
}
@ -663,23 +671,25 @@ theme_attrs(theme_item_t attrs)
case THEME_OTR_TRUSTED: result = COLOR_PAIR(43); break;
case THEME_OTR_UNTRUSTED: result = COLOR_PAIR(44); break;
case THEME_ROSTER_HEADER: result = COLOR_PAIR(45); break;
case THEME_OCCUPANTS_HEADER: result = COLOR_PAIR(46); break;
case THEME_WHITE: result = COLOR_PAIR(47); break;
case THEME_WHITE_BOLD: result = COLOR_PAIR(47); break;
case THEME_GREEN: result = COLOR_PAIR(48); break;
case THEME_GREEN_BOLD: result = COLOR_PAIR(48); break;
case THEME_RED: result = COLOR_PAIR(49); break;
case THEME_RED_BOLD: result = COLOR_PAIR(49); break;
case THEME_YELLOW: result = COLOR_PAIR(50); break;
case THEME_YELLOW_BOLD: result = COLOR_PAIR(50); break;
case THEME_BLUE: result = COLOR_PAIR(51); break;
case THEME_BLUE_BOLD: result = COLOR_PAIR(51); break;
case THEME_CYAN: result = COLOR_PAIR(52); break;
case THEME_CYAN_BOLD: result = COLOR_PAIR(52); break;
case THEME_BLACK: result = COLOR_PAIR(53); break;
case THEME_BLACK_BOLD: result = COLOR_PAIR(53); break;
case THEME_MAGENTA: result = COLOR_PAIR(54); break;
case THEME_MAGENTA_BOLD: result = COLOR_PAIR(54); break;
case THEME_ROSTER_ROOM: result = COLOR_PAIR(46); break;
case THEME_ROSTER_ROOM_UNREAD: result = COLOR_PAIR(47); break;
case THEME_OCCUPANTS_HEADER: result = COLOR_PAIR(48); break;
case THEME_WHITE: result = COLOR_PAIR(49); break;
case THEME_WHITE_BOLD: result = COLOR_PAIR(49); break;
case THEME_GREEN: result = COLOR_PAIR(50); break;
case THEME_GREEN_BOLD: result = COLOR_PAIR(50); break;
case THEME_RED: result = COLOR_PAIR(51); break;
case THEME_RED_BOLD: result = COLOR_PAIR(51); break;
case THEME_YELLOW: result = COLOR_PAIR(52); break;
case THEME_YELLOW_BOLD: result = COLOR_PAIR(52); break;
case THEME_BLUE: result = COLOR_PAIR(53); break;
case THEME_BLUE_BOLD: result = COLOR_PAIR(53); break;
case THEME_CYAN: result = COLOR_PAIR(54); break;
case THEME_CYAN_BOLD: result = COLOR_PAIR(54); break;
case THEME_BLACK: result = COLOR_PAIR(55); break;
case THEME_BLACK_BOLD: result = COLOR_PAIR(55); break;
case THEME_MAGENTA: result = COLOR_PAIR(56); break;
case THEME_MAGENTA_BOLD: result = COLOR_PAIR(56); break;
default: break;
}

View File

@ -85,6 +85,8 @@ typedef enum {
THEME_OTR_UNTRUSTED,
THEME_OCCUPANTS_HEADER,
THEME_ROSTER_HEADER,
THEME_ROSTER_ROOM,
THEME_ROSTER_ROOM_UNREAD,
THEME_RECEIPT_SENT,
THEME_NONE,
THEME_WHITE,

View File

@ -375,9 +375,9 @@ _rosterwin_room(ProfLayoutSplit *layout, ProfMucWin *mucwin)
GString *msg = g_string_new(" ");
if (mucwin->unread > 0) {
wattron(layout->subwin, theme_attrs(THEME_GREEN_BOLD));
wattron(layout->subwin, theme_attrs(THEME_ROSTER_ROOM_UNREAD));
} else {
wattron(layout->subwin, theme_attrs(THEME_GREEN));
wattron(layout->subwin, theme_attrs(THEME_ROSTER_ROOM));
}
int indent = prefs_get_roster_contact_indent();
@ -405,9 +405,9 @@ _rosterwin_room(ProfLayoutSplit *layout, ProfMucWin *mucwin)
g_string_free(msg, TRUE);
if (mucwin->unread > 0) {
wattroff(layout->subwin, theme_attrs(THEME_GREEN_BOLD));
wattroff(layout->subwin, theme_attrs(THEME_ROSTER_ROOM_UNREAD));
} else {
wattroff(layout->subwin, theme_attrs(THEME_GREEN));
wattroff(layout->subwin, theme_attrs(THEME_ROSTER_ROOM));
}
}

View File

@ -46,6 +46,8 @@ roommention=
me=
them=
roster.header=
roster.room=
roster.room.unread=
occupants.header=
receipt.sent=

View File

@ -46,5 +46,7 @@ roommention=bold_blue
me=cyan
them=white
roster.header=bold_white
roster.room=cyan
roster.room.unread=bold_cyan
occupants.header=bold_white
receipt.sent=white

View File

@ -46,5 +46,7 @@ subscribed=magenta
unsubscribed=black_bold
roommention=cyan
roster.header=yellow
roster.room=green
roster.room.unread=green
occupants.header=yellow
receipt.sent=red

View File

@ -46,6 +46,8 @@ roommention=bold_red
me=blue
them=bold_green
roster.header=bold_yellow
roster.room=green
roster.room.unread=bold_green
occupants.header=bold_yellow
receipt.sent=bold_black

View File

@ -46,5 +46,7 @@ roommention=bold_cyan
me=blue
them=bold_blue
roster.header=bold_green
roster.room=green
roster.room.unread=bold_green
occupants.header=bold_green
receipt.sent=bold_black

View File

@ -46,5 +46,7 @@ roommention=bold_green
me=green
them=bold_green
roster.header=bold_green
roster.room=green
roster.room=bold_green
occupants.header=bold_green
receipt.sent=bold_black

View File

@ -46,5 +46,7 @@ roommention=bold_green
me=white
them=white
roster.header=bold_cyan
roster.room=red
roster.room.unread=bold_red
occupants.header=bold_cyan
receipt.sent=red
receipt.sent=red

View File

@ -46,5 +46,7 @@ roommention=green
me=magenta
them=green
roster.header=magenta
roster.room=green
roster.room.unread=green
occupants.header=magenta
receipt.sent=red
receipt.sent=red

View File

@ -46,5 +46,7 @@ roommention=white
me=white
them=white
roster.header=white
roster.room=white
roster.room.unread=white
occupants.header=white
receipt.sent=white
receipt.sent=white

View File

@ -46,5 +46,7 @@ roommention=blue
me=black
them=black
roster.header=black
roster.room=blue
roster.room.unread=blue
occupants.header=black
receipt.sent=red
receipt.sent=red

View File

@ -46,5 +46,7 @@ roommention=yellow
me=yellow
them=green
roster.header=yellow
roster.room=green
roster.room.unread=green
occupants.header=yellow
receipt.sent=red
receipt.sent=red

View File

@ -46,5 +46,7 @@ roommention=bold_yellow
me=bold_yellow
them=bold_green
roster.header=bold_yellow
roster.room=bold_green
roster.room.unread=bold_green
occupants.header=bold_yellow
receipt.sent=bold_red

View File

@ -46,5 +46,7 @@ roommention=green
me=bold_black
them=magenta
roster.header=magenta
roster.room=green
roster.room.unread=green
occupants.header=magenta
receipt.sent=red
receipt.sent=red

View File

@ -46,5 +46,7 @@ roommention=red
me=green
them=yellow
roster.header=white
roster.room=green
roster.room.unread=green
occupants.header=white
receipt.sent=red
receipt.sent=red

View File

@ -46,5 +46,7 @@ roommention=yellow
me=black
them=black
roster.header=black
roster.room=green
roster.room.unread=green
occupants.header=black
receipt.sent=red