author | Myhailo Danylenko <isbear@ukrpost.net> |
Sun, 24 Mar 2013 00:59:26 +0200 | |
changeset 84 | 6ff846816073 |
parent 57 | cfa24a16e928 |
child 85 | 93c3cc0d7891 |
permissions | -rw-r--r-- |
29
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
1 |
Change roster item colors on chatstate change |
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
2 |
|
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
3 |
diff -r 1c4b2c41f849 mcabber/contrib/themes/light.txt |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
4 |
--- a/mcabber/contrib/themes/light.txt Mon Nov 26 19:33:15 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
5 |
+++ b/mcabber/contrib/themes/light.txt Mon Nov 26 19:33:24 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
6 |
@@ -14,7 +14,6 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
7 |
set color_bgrostersel = green |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
8 |
set color_rostersel = yellow |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
9 |
set color_rosterselmsg = red |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
10 |
-set color_rosternewmsg = red |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
11 |
set color_readmark = red |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
12 |
|
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
13 |
# vim:set ft=conf: |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
14 |
diff -r 1c4b2c41f849 mcabber/contrib/themes/light2.txt |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
15 |
--- a/mcabber/contrib/themes/light2.txt Mon Nov 26 19:33:15 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
16 |
+++ b/mcabber/contrib/themes/light2.txt Mon Nov 26 19:33:24 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
17 |
@@ -14,7 +14,6 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
18 |
set color_bgrostersel = black |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
19 |
set color_rostersel = brightgreen |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
20 |
set color_rosterselmsg = red |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
21 |
-set color_rosternewmsg = red |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
22 |
set color_readmark = red |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
23 |
|
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
24 |
# vim:set ft=conf: |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
25 |
diff -r 1c4b2c41f849 mcabber/contrib/themes/oliver.txt |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
26 |
--- a/mcabber/contrib/themes/oliver.txt Mon Nov 26 19:33:15 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
27 |
+++ b/mcabber/contrib/themes/oliver.txt Mon Nov 26 19:33:24 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
28 |
@@ -14,7 +14,6 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
29 |
set color_bgrostersel = yellow |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
30 |
set color_rostersel = blue |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
31 |
set color_rosterselmsg = red |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
32 |
-set color_rosternewmsg = red |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
33 |
set color_readmark = red |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
34 |
|
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
35 |
# vim:set ft=conf: |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
36 |
diff -r 1c4b2c41f849 mcabber/doc/help/en/hlp_color.txt |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
37 |
--- a/mcabber/doc/help/en/hlp_color.txt Mon Nov 26 19:33:15 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
38 |
+++ b/mcabber/doc/help/en/hlp_color.txt Mon Nov 26 19:33:24 2012 +0200 |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
39 |
@@ -11,6 +11,7 @@ |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
40 |
Set a color rule (or overwrite, if it already exists). The status is string containing all statuses the roster item can have for the rule to match, or * if any status is OK. Wildcard is the file-matching wildcard that will be applied to JID. Color is the wanted color. |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
41 |
If color is -, the rule is removed. |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
42 |
If more than one rule matches, the color from the last created (not overwritten) is used. |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
43 |
+ Also mask can contain symbols '!', '#', '+' and '.', that represent buddies with urgent condition, with new messages, that are typing and that have ceased typing. These symbols have higher priority than status ones. |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
44 |
/color mucnick nick (color|-) |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
45 |
Marks the nick to be colored by given color. If a MUC has colored nicks, this one will be used. If color is -, the color is marked as chosen automatically, which means it will not be used in 'preset' coloring mode, but will stay the same in 'on' coloring mode. |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
46 |
/color muc (jid|.|*) [on|preset|off|-] |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
47 |
diff -r 1c4b2c41f849 mcabber/doc/help/uk/hlp_color.txt |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
48 |
--- a/mcabber/doc/help/uk/hlp_color.txt Mon Nov 26 19:33:15 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
49 |
+++ b/mcabber/doc/help/uk/hlp_color.txt Mon Nov 26 19:33:24 2012 +0200 |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
50 |
@@ -11,6 +11,7 @@ |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
51 |
Додає нове чи змінює існуюче правило кольору. "Статус" складений з літер статусу, до яких докладається це правило (наприклад "n_d?"). Зірочка ("*") відповідає будь-якому статусу. "Маска" подібна до файлової маски й докладається до jid. Правило встановлює колір контактів, що йому відповідають. |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
52 |
Щоб вилучити правило, вкажіть колір "-". |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
53 |
Коли є декілька правил, що відповідають контакту, спрацьовує останнє додане (_не_ змінене). |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
54 |
+ Також рядок статусів може містити символи '!', '#', '+' та '.', що відповідають користувачам, які відповідно мають негайні події, нові повідомлення, друкують та друкували але спинилися. Ці символи мають більший пріоритет ніж символи статусів. |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
55 |
/color muc (jid|.|*) [on|preset|off|-] |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
56 |
Встановлює режим забарвлення прізвиськ у чаті. Якщо замість jid вказано * режим докладається до всіх чатів, для яких не визначено особистого правила (з вказанням jid). |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
57 |
У режимі on забарвлюються усі прізвиська, у режимі preset - лише ті, для яких колір встановлено командою /color mucnick, а режим off вимикає забарвлення прізвиськ. Режим - прибирає з вказаних jid особисті режими забарвлення. Тоді до них докладається глобальний. Глобальний режим прибрати не можна. |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
58 |
diff -r 1c4b2c41f849 mcabber/mcabber/screen.c |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
59 |
--- a/mcabber/mcabber/screen.c Mon Nov 26 19:33:15 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
60 |
+++ b/mcabber/mcabber/screen.c Mon Nov 26 19:33:24 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
61 |
@@ -436,7 +436,7 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
62 |
"roster", |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
63 |
"rostersel", |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
64 |
"rosterselmsg", |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
65 |
- "rosternewmsg", |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
66 |
+ "rosternewmsg", /* not removing this to not break binary compatibility with mainstream */ |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
67 |
"info", |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
68 |
"msgin", |
18
2714b95de09d
Sync with development version
Mikael Berthe <mikael@lilotux.net>
parents:
16
diff
changeset
|
69 |
"readmark", |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
70 |
@@ -509,10 +509,6 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
71 |
init_pair(i+1, ((color) ? find_color(color) : COLOR_RED), |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
72 |
find_color(backselected)); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
73 |
break; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
74 |
- case COLOR_ROSTERNMSG: |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
75 |
- init_pair(i+1, ((color) ? find_color(color) : COLOR_RED), |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
76 |
- find_color(background)); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
77 |
- break; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
78 |
case COLOR_INFO: |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
79 |
init_pair(i+1, ((color) ? find_color(color) : COLOR_WHITE), |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
80 |
find_color(background)); |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
81 |
@@ -811,6 +807,21 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
82 |
settings_set_guard("color_rosterselmsg", scr_color_guard); |
16
ca5a2f1def20
Rebase to new development version
Mikael Berthe <mikael@lilotux.net>
parents:
1
diff
changeset
|
83 |
settings_set_guard("color_rosternewmsg", scr_color_guard); |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
84 |
|
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
85 |
+ { // Add default rule only if user has not defined one already |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
86 |
+ GSList *rel; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
87 |
+ gboolean found = FALSE; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
88 |
+ for (rel = rostercolrules; rel; rel = rel->next) { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
89 |
+ rostercolor *rule = rel->data; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
90 |
+ if ((strchr(rule->status, '#') || strchr(rule->status, '!')) |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
91 |
+ && (!strcmp(rule->wildcard, "*"))) { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
92 |
+ found = TRUE; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
93 |
+ break; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
94 |
+ } |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
95 |
+ } |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
96 |
+ if (!found) |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
97 |
+ scr_roster_color("#!", "*", "red"); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
98 |
+ } |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
99 |
+ |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
100 |
getmaxyx(stdscr, maxY, maxX); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
101 |
Log_Win_Height = DEFAULT_LOG_WIN_HEIGHT; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
102 |
// Note scr_draw_main_window() should be called early after scr_init_curses() |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
103 |
@@ -2078,6 +2089,10 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
104 |
// for unfolded groups. |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
105 |
if (ismsg && (!isgrp || ishid)) { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
106 |
pending = '#'; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
107 |
+ // Attention sign? |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
108 |
+ if ((ismuc && isurg >= ui_attn_sign_prio_level_muc) || |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
109 |
+ (!ismuc && isurg >= ui_attn_sign_prio_level)) |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
110 |
+ pending = '!'; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
111 |
} |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
112 |
|
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
113 |
if (ismuc) { |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
114 |
@@ -2101,24 +2116,22 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
115 |
for (n = 0; n < maxx; n++) |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
116 |
waddch(rosterWnd, ' '); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
117 |
} else { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
118 |
- if (pending == '#') |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
119 |
- wattrset(rosterWnd, get_color(COLOR_ROSTERNMSG)); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
120 |
- else { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
121 |
- int color = get_color(COLOR_ROSTER); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
122 |
- if ((!isspe) && (!isgrp)) { // Look for color rules |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
123 |
- GSList *head; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
124 |
- const char *bjid = buddy_getjid(BUDDATA(buddy)); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
125 |
- for (head = rostercolrules; head; head = g_slist_next(head)) { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
126 |
- rostercolor *rc = head->data; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
127 |
- if (g_pattern_match_string(rc->compiled, bjid) && |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
128 |
- (!strcmp("*", rc->status) || strchr(rc->status, status))) { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
129 |
- color = compose_color(rc->color); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
130 |
- break; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
131 |
- } |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
132 |
+ int color = get_color(COLOR_ROSTER); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
133 |
+ if ((!isspe) && (!isgrp)) { // Look for color rules |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
134 |
+ GSList *head; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
135 |
+ const char *jid = buddy_getjid(BUDDATA(buddy)); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
136 |
+ for (head = rostercolrules; head; head = g_slist_next(head)) { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
137 |
+ rostercolor *rc = head->data; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
138 |
+ if (g_pattern_match_string(rc->compiled, jid) && |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
139 |
+ (!strcmp("*", rc->status) || |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
140 |
+ strchr(rc->status, pending) || |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
141 |
+ strchr(rc->status, status))) { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
142 |
+ color = compose_color(rc->color); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
143 |
+ break; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
144 |
} |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
145 |
} |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
146 |
- wattrset(rosterWnd, color); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
147 |
} |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
148 |
+ wattrset(rosterWnd, color); |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
149 |
} |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
150 |
|
26
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
151 |
if (Roster_Width > prefix_length) |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
152 |
@@ -2126,13 +2139,6 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
153 |
else |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
154 |
name[0] = 0; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
155 |
|
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
156 |
- if (pending == '#') { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
157 |
- // Attention sign? |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
158 |
- if ((ismuc && isurg >= ui_attn_sign_prio_level_muc) || |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
159 |
- (!ismuc && isurg >= ui_attn_sign_prio_level)) |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
160 |
- pending = '!'; |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
161 |
- } |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
162 |
- |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
163 |
if (isgrp) { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
164 |
if (ishid) { |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
165 |
int group_count = 0; |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
166 |
diff -r 1c4b2c41f849 mcabber/mcabber/screen.h |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
167 |
--- a/mcabber/mcabber/screen.h Mon Nov 26 19:33:15 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
168 |
+++ b/mcabber/mcabber/screen.h Mon Nov 26 19:33:24 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
169 |
@@ -47,7 +47,7 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
170 |
COLOR_ROSTER, |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
171 |
COLOR_ROSTERSEL, |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
172 |
COLOR_ROSTERSELNMSG, |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
173 |
- COLOR_ROSTERNMSG, |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
174 |
+ COLOR_ROSTERNMSG, /* not removing this to not break binary compatibility with mainstream */ |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
175 |
COLOR_INFO, |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
176 |
COLOR_MSGIN, |
18
2714b95de09d
Sync with development version
Mikael Berthe <mikael@lilotux.net>
parents:
16
diff
changeset
|
177 |
COLOR_READMARK, |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
178 |
diff -r 1c4b2c41f849 mcabber/mcabberrc.example |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
179 |
--- a/mcabber/mcabberrc.example Mon Nov 26 19:33:15 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
180 |
+++ b/mcabber/mcabberrc.example Mon Nov 26 19:33:24 2012 +0200 |
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
181 |
@@ -399,7 +399,6 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
182 |
# bgrostersel: background color of the selected roster item |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
183 |
# rostersel: text color of the selected roster item |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
184 |
# rosterselmsg:text color of the selected roster item, if there is a new msg |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
185 |
-# rosternewmsg: text color of items with unread messages |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
186 |
# |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
187 |
#set color_background = black |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
188 |
#set color_general = white |
57
cfa24a16e928
Drop accepted, add guide to seaprate-build
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
189 |
@@ -414,15 +413,24 @@ |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
190 |
#set color_bgrostersel = cyan |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
191 |
#set color_rostersel = blue |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
192 |
#set color_rosterselmsg = red |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
193 |
-#set color_rosternewmsg = red |
18
2714b95de09d
Sync with development version
Mikael Berthe <mikael@lilotux.net>
parents:
16
diff
changeset
|
194 |
#set color_readmark = red |
1
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
195 |
|
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
196 |
-# You can color roster items by their status and JID. For example, to have |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
197 |
-# all roster items white, just all contacts from jabber.org that are away, |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
198 |
-# not available or do not disturb yellow, you do this: |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
199 |
+# You can color roster items by their status, state and JID. For example, |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
200 |
+# to have all roster items white, just all contacts from jabber.org that |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
201 |
+# are away, not available or do not disturb yellow, you do this: |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
202 |
# |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
203 |
#color roster * * white |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
204 |
#color roster adn *@jabber.org yellow |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
205 |
+# |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
206 |
+# You can specify '!', '#', '+' and '.' in status mask, they will take |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
207 |
+# precedence over status letters and will select buddies accordingly with |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
208 |
+# urgent condition, with new messages, that are typing and that ceased |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
209 |
+# typing. By default there exists one rule: |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
210 |
+# |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
211 |
+#color roster !# * red |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
212 |
+# |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
213 |
+# However, if you define a rule with either '!' or '#', this default rule |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
214 |
+# will not be added. |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
215 |
|
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
216 |
# You can let mcabber color nicks in MUC. |
024f3a2dda3e
Add roster-state-colors (hg ignored it for some reason)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
217 |
# These colors will by used automatically: |