aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Allow utf8 in occupants char

Browse Source
This commit is contained in:
Michael Vetter 2021-10-22 16:47:15 +02:00
parent fa2881fcea
commit 1c96115f97
6 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/cmd_funcs.c
View File

@ -4414,8 +4414,8 @@ cmd_occupants(ProfWin* window, const char* const command, gchar** args)
occupantswin_occupants_all(); occupantswin_occupants_all();
} else { } else {
prefs_set_occupants_char(args[1][0]); prefs_set_occupants_char(args[1]);
cons_show("Occupants char set to %c.", args[1][0]); cons_show("Occupants char set to %s.", args[1]);
occupantswin_occupants_all(); occupantswin_occupants_all();
} }

23
src/config/preferences.c
View File

@ -902,30 +902,23 @@ prefs_get_occupants_size(void)
} }
} }
char char*
prefs_get_occupants_char(void) prefs_get_occupants_char(void)
{ {
char result = 0;
char* resultstr = g_key_file_get_string(prefs, PREF_GROUP_UI, "occupants.char", NULL); char* result = g_key_file_get_string(prefs, PREF_GROUP_UI, "occupants.char", NULL);
if (!resultstr) {
result = 0;
} else {
result = resultstr[0];
}
free(resultstr);
return result; return result;
} }
void void
prefs_set_occupants_char(char ch) prefs_set_occupants_char(char* ch)
{ {
char str[2]; if (g_utf8_strlen(ch, 4) == 1) {
str[0] = ch; g_key_file_set_string(prefs, PREF_GROUP_UI, "occupants.char", ch);
str[1] = '\0'; } else {
log_error("Could not set roster resource char: %s", ch);
g_key_file_set_string(prefs, PREF_GROUP_UI, "occupants.char", str); }
} }
void void

4
src/config/preferences.h
View File

@ -272,8 +272,8 @@ void prefs_clear_roster_room_char(void);
char* prefs_get_roster_room_private_char(void); char* prefs_get_roster_room_private_char(void);
void prefs_set_roster_room_private_char(char* ch); void prefs_set_roster_room_private_char(char* ch);
void prefs_clear_roster_room_private_char(void); void prefs_clear_roster_room_private_char(void);
char prefs_get_occupants_char(void); char* prefs_get_occupants_char(void);
void prefs_set_occupants_char(char ch); void prefs_set_occupants_char(char* ch);
void prefs_clear_occupants_char(void); void prefs_clear_occupants_char(void);
char prefs_get_occupants_header_char(void); char prefs_get_occupants_header_char(void);
void prefs_set_occupants_header_char(char ch); void prefs_set_occupants_header_char(char ch);

4
src/config/theme.c
View File

@ -406,8 +406,8 @@ _load_preferences(void)
// with custom set functions // with custom set functions
if (g_key_file_has_key(theme, "ui", "occupants.char", NULL)) { if (g_key_file_has_key(theme, "ui", "occupants.char", NULL)) {
gchar* ch = g_key_file_get_string(theme, "ui", "occupants.char", NULL); gchar* ch = g_key_file_get_string(theme, "ui", "occupants.char", NULL);
if (ch && strlen(ch) > 0) { if (ch && g_utf8_strlen(ch, 4) == 1) {
prefs_set_occupants_char(ch[0]); prefs_set_occupants_char(ch);
g_free(ch); g_free(ch);
} }
} }

14
src/ui/console.c
View File

@ -1340,11 +1340,13 @@ cons_occupants_setting(void)
else else
cons_show("Occupants wrap (/occupants) : OFF"); cons_show("Occupants wrap (/occupants) : OFF");
char occupants_ch = prefs_get_occupants_char(); char* occupants_ch = prefs_get_occupants_char();
if (occupants_ch) if (occupants_ch) {
cons_show("Occupants char (/occupants) : %c", occupants_ch); cons_show("Occupants char (/occupants) : %s", occupants_ch);
else free(occupants_ch);
} else {
cons_show("Occupants char (/occupants) : none"); cons_show("Occupants char (/occupants) : none");
}
gint occupant_indent = prefs_get_occupants_indent(); gint occupant_indent = prefs_get_occupants_indent();
cons_show("Occupant indent (/occupants) : %d", occupant_indent); cons_show("Occupant indent (/occupants) : %d", occupant_indent);
@ -1509,7 +1511,7 @@ cons_roster_setting(void)
char* room_priv_ch = prefs_get_roster_room_private_char(); char* room_priv_ch = prefs_get_roster_room_private_char();
if (room_priv_ch) { if (room_priv_ch) {
cons_show("Roster room private char (/roster) : %c", room_priv_ch); cons_show("Roster room private char (/roster) : %s", room_priv_ch);
free(room_priv_ch); free(room_priv_ch);
} else { } else {
cons_show("Roster room private char (/roster) : none"); cons_show("Roster room private char (/roster) : none");
@ -1517,7 +1519,7 @@ cons_roster_setting(void)
char* private_ch = prefs_get_roster_private_char(); char* private_ch = prefs_get_roster_private_char();
if (private_ch) { if (private_ch) {
cons_show("Roster private char (/roster) : %c", private_ch); cons_show("Roster private char (/roster) : %s", private_ch);
free(private_ch); free(private_ch);
} else { } else {
cons_show("Roster private char (/roster) : none"); cons_show("Roster private char (/roster) : none");

5
src/ui/occupantswin.c
View File

@ -77,9 +77,10 @@ _occuptantswin_occupant(ProfLayoutSplit* layout, GList* item, gboolean showjid,
GString* msg = g_string_new(spaces->str); GString* msg = g_string_new(spaces->str);
char ch = prefs_get_occupants_char(); char* ch = prefs_get_occupants_char();
if (ch) { if (ch) {
g_string_append_printf(msg, "%c", ch); g_string_append_printf(msg, "%s", ch);
free(ch);
} }
gboolean wrap = prefs_get_boolean(PREF_OCCUPANTS_WRAP); gboolean wrap = prefs_get_boolean(PREF_OCCUPANTS_WRAP);