nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #388 from fhost/fhost/ellipsize

Browse Source 
Use config.h for default ellipsize value
This commit is contained in:
Nikos Tsipinakis 2017-09-26 09:32:11 +03:00 committed by GitHub
commit a64cb82946
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.def.h
View File

@ -27,6 +27,7 @@ int sticky_history = true;
int history_length = 20; /* max amount of notifications kept in history */ int history_length = 20; /* max amount of notifications kept in history */
int show_indicators = true; int show_indicators = true;
int word_wrap = false; int word_wrap = false;
enum ellipsize ellipsize = middle;
int ignore_newline = false; int ignore_newline = false;
int line_height = 0; /* if line height < font height, it will be raised to font height */ int line_height = 0; /* if line height < font height, it will be raised to font height */
int notification_height = 0; /* if notification height < font height and padding, it will be raised */ int notification_height = 0; /* if notification height < font height and padding, it will be raised */

27
src/settings.c
View File

@ -172,24 +172,23 @@ void load_settings(char *cmdline_config_path)
{ {
char *c = option_get_string( char *c = option_get_string(
"global", "global",
"ellipsize", "-ellipsize", "middle", "ellipsize", "-ellipsize", "",
"Ellipsize truncated lines on the start/middle/end" "Ellipsize truncated lines on the start/middle/end"
); );
if (strlen(c) > 0) { if (strlen(c) == 0) {
if (strcmp(c, "start") == 0) settings.ellipsize = ellipsize;
settings.ellipsize = start; } else if (strcmp(c, "start") == 0) {
else if (strcmp(c, "middle") == 0) settings.ellipsize = start;
settings.ellipsize = middle; } else if (strcmp(c, "middle") == 0) {
else if (strcmp(c, "end") == 0) settings.ellipsize = middle;
settings.ellipsize = end; } else if (strcmp(c, "end") == 0) {
else { settings.ellipsize = end;
fprintf(stderr, } else {
"Warning: unknown value for ellipsize\n"); fprintf(stderr, "Warning: unknown ellipsize value: \"%s\"\n", c);
settings.ellipsize = middle; settings.ellipsize = ellipsize;
}
g_free(c);
} }
g_free(c);
} }
settings.ignore_newline = option_get_bool( settings.ignore_newline = option_get_bool(