about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/config/theme.c4
-rw-r--r--src/config/theme.h2
-rw-r--r--src/ui/console.c10
-rw-r--r--theme_template2
-rw-r--r--themes/aqua2
-rw-r--r--themes/batman2
-rw-r--r--themes/bios2
-rw-r--r--themes/boothj52
-rw-r--r--themes/boothj5_slack2
-rw-r--r--themes/forest2
-rw-r--r--themes/hacker2
-rw-r--r--themes/headache2
-rw-r--r--themes/joker2
-rw-r--r--themes/mono2
-rw-r--r--themes/orange2
-rw-r--r--themes/original2
-rw-r--r--themes/original_bright2
-rw-r--r--themes/shade2
-rw-r--r--themes/spawn2
-rw-r--r--themes/whiteness2
20 files changed, 46 insertions, 4 deletions
diff --git a/src/config/theme.c b/src/config/theme.c
index 6a235f6d..c8e466d5 100644
--- a/src/config/theme.c
+++ b/src/config/theme.c
@@ -82,6 +82,8 @@ theme_init(const char *const theme_name)
     g_hash_table_insert(defaults, strdup("main.splash"),             strdup("cyan"));
     g_hash_table_insert(defaults, strdup("error"),                   strdup("red"));
     g_hash_table_insert(defaults, strdup("incoming"),                strdup("yellow"));
+    g_hash_table_insert(defaults, strdup("mention"),                 strdup("yellow"));
+    g_hash_table_insert(defaults, strdup("trigger"),                 strdup("yellow"));
     g_hash_table_insert(defaults, strdup("input.text"),              strdup("white"));
     g_hash_table_insert(defaults, strdup("main.time"),               strdup("white"));
     g_hash_table_insert(defaults, strdup("titlebar.text"),           strdup("white"));
@@ -724,6 +726,8 @@ theme_attrs(theme_item_t attrs)
     case THEME_SPLASH:                  _theme_prep_fgnd("main.splash",             lookup_str, &bold); break;
     case THEME_ERROR:                   _theme_prep_fgnd("error",                   lookup_str, &bold); break;
     case THEME_INCOMING:                _theme_prep_fgnd("incoming",                lookup_str, &bold); break;
+    case THEME_MENTION:                 _theme_prep_fgnd("mention",                 lookup_str, &bold); break;
+    case THEME_TRIGGER:                 _theme_prep_fgnd("trigger",                 lookup_str, &bold); break;
     case THEME_INPUT_TEXT:              _theme_prep_fgnd("input.text",              lookup_str, &bold); break;
     case THEME_TIME:                    _theme_prep_fgnd("main.time",               lookup_str, &bold); break;
     case THEME_TITLE_TEXT:              _theme_prep_fgnd("titlebar.text",           lookup_str, &bold); break;
diff --git a/src/config/theme.h b/src/config/theme.h
index e6a72dde..4ec74510 100644
--- a/src/config/theme.h
+++ b/src/config/theme.h
@@ -46,6 +46,8 @@ typedef enum {
     THEME_SPLASH,
     THEME_ERROR,
     THEME_INCOMING,
+    THEME_MENTION,
+    THEME_TRIGGER,
     THEME_INPUT_TEXT,
     THEME_TIME,
     THEME_TITLE_TEXT,
diff --git a/src/ui/console.c b/src/ui/console.c
index 55b1e25f..8d8542a4 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -334,10 +334,10 @@ cons_show_incoming_room_message(const char *const nick, const char *const room,
 
     if (g_strcmp0(muc_show, "all") == 0) {
         if (mention) {
-            win_vprint(console, '-', 0, NULL, 0, THEME_INCOMING, "", "<< room mention: %s in %s (win %d)", nick, room, ui_index);
+            win_vprint(console, '-', 0, NULL, 0, THEME_MENTION, "", "<< room mention: %s in %s (win %d)", nick, room, ui_index);
         } else if (triggers) {
             char *triggers_str = _room_triggers_to_string(triggers);
-            win_vprint(console, '-', 0, NULL, 0, THEME_INCOMING, "", "<< room trigger %s: %s in %s (win %d)", triggers_str, nick, room, ui_index);
+            win_vprint(console, '-', 0, NULL, 0, THEME_TRIGGER, "", "<< room trigger %s: %s in %s (win %d)", triggers_str, nick, room, ui_index);
             free(triggers_str);
         } else {
             win_vprint(console, '-', 0, NULL, 0, THEME_INCOMING, "", "<< room message: %s in %s (win %d)", nick, room, ui_index);
@@ -346,11 +346,11 @@ cons_show_incoming_room_message(const char *const nick, const char *const room,
 
     } else if (g_strcmp0(muc_show, "first") == 0) {
         if (mention) {
-            win_vprint(console, '-', 0, NULL, 0, THEME_INCOMING, "", "<< room mention: %s in %s (win %d)", nick, room, ui_index);
+            win_vprint(console, '-', 0, NULL, 0, THEME_MENTION, "", "<< room mention: %s in %s (win %d)", nick, room, ui_index);
             cons_alert();
         } else if (triggers) {
             char *triggers_str = _room_triggers_to_string(triggers);
-            win_vprint(console, '-', 0, NULL, 0, THEME_INCOMING, "", "<< room trigger %s: %s in %s (win %d)", triggers_str, nick, room, ui_index);
+            win_vprint(console, '-', 0, NULL, 0, THEME_TRIGGER, "", "<< room trigger %s: %s in %s (win %d)", triggers_str, nick, room, ui_index);
             free(triggers_str);
             cons_alert();
         } else if (unread == 0) {
@@ -2208,6 +2208,8 @@ cons_theme_properties(void)
     _cons_theme_prop(THEME_UNSUBSCRIBED, "unsubscribed");
 
     _cons_theme_prop(THEME_INCOMING, "incoming");
+    _cons_theme_prop(THEME_MENTION, "mention");
+    _cons_theme_prop(THEME_TRIGGER, "trigger");
     _cons_theme_prop(THEME_TYPING, "typing");
     _cons_theme_prop(THEME_GONE, "gone");
 
diff --git a/theme_template b/theme_template
index 88c486fd..926008b6 100644
--- a/theme_template
+++ b/theme_template
@@ -38,6 +38,8 @@ dnd=
 xa=
 offline=
 incoming=
+mention=
+trigger=
 typing=
 gone=
 error=
diff --git a/themes/aqua b/themes/aqua
index ecdfac16..6ea11e2c 100644
--- a/themes/aqua
+++ b/themes/aqua
@@ -38,6 +38,8 @@ dnd=blue
 xa=cyan
 offline=bold_black
 incoming=bold_cyan
+mention=bold_blue
+trigger=bold_blue
 typing=cyan
 gone=blue
 error=bold_white
diff --git a/themes/batman b/themes/batman
index 937e0ad3..b90fdc23 100644
--- a/themes/batman
+++ b/themes/batman
@@ -22,6 +22,8 @@ typing=cyan
 gone=red
 error=red
 incoming=yellow
+mention=cyan
+trigger=cyan
 roominfo=green
 me=black_bold
 them=yellow
diff --git a/themes/bios b/themes/bios
index 51d63c84..262ea9e6 100644
--- a/themes/bios
+++ b/themes/bios
@@ -38,6 +38,8 @@ dnd=bold_red
 xa=bold_cyan
 offline=bold_blue
 incoming=bold_yellow
+mention=bold_green
+trigger=bold_green
 typing=bold_yellow
 gone=bold_red
 error=bold_red
diff --git a/themes/boothj5 b/themes/boothj5
index 3e728bb5..179e154b 100644
--- a/themes/boothj5
+++ b/themes/boothj5
@@ -38,6 +38,8 @@ dnd=magenta
 xa=blue
 offline=red
 incoming=bold_yellow
+mention=bold_cyan
+trigger=bold_blue
 typing=yellow
 gone=red
 error=red
diff --git a/themes/boothj5_slack b/themes/boothj5_slack
index 2254b949..8fa88497 100644
--- a/themes/boothj5_slack
+++ b/themes/boothj5_slack
@@ -38,6 +38,8 @@ dnd=magenta
 xa=blue
 offline=red
 incoming=bold_yellow
+mention=bold_cyan
+trigger=bold_blue
 typing=yellow
 gone=red
 error=red
diff --git a/themes/forest b/themes/forest
index cd289d44..32344439 100644
--- a/themes/forest
+++ b/themes/forest
@@ -38,6 +38,8 @@ dnd=bold_black
 xa=blue
 offline=bold_black
 incoming=bold_yellow
+mention=bold_cyan
+trigger=bold_cyan
 typing=yellow
 gone=bold_black
 error=bold_black
diff --git a/themes/hacker b/themes/hacker
index 4ece8417..70f65b7a 100644
--- a/themes/hacker
+++ b/themes/hacker
@@ -38,6 +38,8 @@ dnd=green
 xa=green
 offline=green
 incoming=bold_green
+mention=bold_green
+trigger=bold_green
 typing=green
 gone=green
 error=bold_green
diff --git a/themes/headache b/themes/headache
index 8f95e796..3c47e4c2 100644
--- a/themes/headache
+++ b/themes/headache
@@ -38,6 +38,8 @@ dnd=megenta
 xa=cyan
 offline=green
 incoming=yellow
+mention=green
+trigger=green
 typing=magenta
 gone=yellow
 error=red
diff --git a/themes/joker b/themes/joker
index 400dc0a7..49a387ec 100644
--- a/themes/joker
+++ b/themes/joker
@@ -38,6 +38,8 @@ dnd=green
 xa=yellow
 offline=bold_black
 incoming=yellow
+mention=green
+trigger=green
 typing=green
 gone=red
 error=red
diff --git a/themes/mono b/themes/mono
index 392d458a..c6743ab6 100644
--- a/themes/mono
+++ b/themes/mono
@@ -38,6 +38,8 @@ dnd=white
 xa=white
 offline=white
 incoming=white
+mention=white
+trigger=white
 typing=white
 gone=white
 error=white
diff --git a/themes/orange b/themes/orange
index a7875ec9..de988435 100644
--- a/themes/orange
+++ b/themes/orange
@@ -38,6 +38,8 @@ dnd=white
 xa=white
 offline=white
 incoming=blue
+mention=blue
+trigger=blue
 typing=black
 gone=green
 error=red
diff --git a/themes/original b/themes/original
index c9433d34..85df4c48 100644
--- a/themes/original
+++ b/themes/original
@@ -38,6 +38,8 @@ dnd=red
 xa=cyan
 offline=red
 incoming=yellow
+mention=yellow
+trigger=yellow
 typing=yellow
 gone=yellow
 error=red
diff --git a/themes/original_bright b/themes/original_bright
index 4e0dd8e8..49c9d336 100644
--- a/themes/original_bright
+++ b/themes/original_bright
@@ -38,6 +38,8 @@ dnd=bold_red
 xa=bold_cyan
 offline=bold_red
 incoming=bold_yellow
+mention=bold_yellow
+trigger=bold_yellow
 typing=bold_yellow
 gone=bold_yellow
 error=bold_red
diff --git a/themes/shade b/themes/shade
index cd343727..6a2f5729 100644
--- a/themes/shade
+++ b/themes/shade
@@ -38,6 +38,8 @@ dnd=green
 xa=yellow
 offline=white
 incoming=yellow
+mention=green
+trigger=green
 typing=green
 gone=red
 error=red
diff --git a/themes/spawn b/themes/spawn
index be3fb5ed..7b267948 100644
--- a/themes/spawn
+++ b/themes/spawn
@@ -38,6 +38,8 @@ dnd=green
 xa=yellow
 offline=bold_black
 incoming=yellow
+mention=red
+trigger=red
 typing=green
 gone=red
 error=red
diff --git a/themes/whiteness b/themes/whiteness
index 883038f6..9799877e 100644
--- a/themes/whiteness
+++ b/themes/whiteness
@@ -38,6 +38,8 @@ dnd=red
 xa=cyan
 offline=red
 incoming=yellow
+mention=yellow
+trigger=yellow
 typing=yellow
 gone=red
 error=red
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-09-29 20:11:27 +0000