aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralexey.skladnoy <alexey.skladnoy@f2baff5b-bf2c-0410-a398-912abdc3d8b2>2008-07-20 10:42:51 +0000
committeralexey.skladnoy <alexey.skladnoy@f2baff5b-bf2c-0410-a398-912abdc3d8b2>2008-07-20 10:42:51 +0000
commit0d6376293cda17e3eb30d9bf8e202d0c06a62a39 (patch)
treef2a0a8598e239e1755bf17bf2b22b8abd2347da9
parentb4dcac06dbbcbc2e0f6120c8237f8dadb6702a14 (diff)
downloaddzen-0d6376293cda17e3eb30d9bf8e202d0c06a62a39.tar.gz
dzen-0d6376293cda17e3eb30d9bf8e202d0c06a62a39.zip
aligment setting code refactored. set_alignment replaced with alignment from char.
git-svn-id: http://dzen.googlecode.com/svn/trunk@228 f2baff5b-bf2c-0410-a398-912abdc3d8b2
-rw-r--r--main.c46
1 files changed, 11 insertions, 35 deletions
diff --git a/main.c b/main.c
index d405a6d..eeb457c 100644
--- a/main.c
+++ b/main.c
@@ -761,37 +761,15 @@ font_preload(char *s) {
}
}
-
-static void
-set_alignment(void) {
- if(dzen.title_win.alignment)
- switch(dzen.title_win.alignment) {
- case 'l':
- dzen.title_win.alignment = ALIGNLEFT;
- break;
- case 'c':
- dzen.title_win.alignment = ALIGNCENTER;
- break;
- case 'r':
- dzen.title_win.alignment = ALIGNRIGHT;
- break;
- default:
- dzen.title_win.alignment = ALIGNCENTER;
- }
- if(dzen.slave_win.alignment)
- switch(dzen.slave_win.alignment) {
- case 'l':
- dzen.slave_win.alignment = ALIGNLEFT;
- break;
- case 'c':
- dzen.slave_win.alignment = ALIGNCENTER;
- break;
- case 'r':
- dzen.slave_win.alignment = ALIGNRIGHT;
- break;
- default:
- dzen.slave_win.alignment = ALIGNLEFT;
- }
+/* Get alignment from character 'l'eft, 'r'ight and 'c'enter */
+static char
+alignment_from_char(char align) {
+ switch(align) {
+ case 'l' : return ALIGNLEFT;
+ case 'r' : return ALIGNRIGHT;
+ case 'c' : return ALIGNCENTER;
+ default : return ALIGNCENTER;
+ }
}
static void
@@ -885,10 +863,10 @@ main(int argc, char *argv[]) {
}
}
else if(!strncmp(argv[i], "-ta", 4)) {
- if(++i < argc) dzen.title_win.alignment = argv[i][0];
+ if(++i < argc) dzen.title_win.alignment = alignment_from_char(argv[i][0]);
}
else if(!strncmp(argv[i], "-sa", 4)) {
- if(++i < argc) dzen.slave_win.alignment = argv[i][0];
+ if(++i < argc) dzen.slave_win.alignment = alignment_from_char(argv[i][0]);
}
else if(!strncmp(argv[i], "-m", 3)) {
dzen.slave_win.ismenu = True;
@@ -1002,8 +980,6 @@ main(int argc, char *argv[]) {
if(setup_signal(SIGALRM, catch_alrm) == SIG_ERR)
fprintf(stderr, "dzen: error hooking SIGALARM\n");
- set_alignment();
-
if(dzen.slave_win.ishmenu &&
!dzen.slave_win.max_lines)
dzen.slave_win.max_lines = 1;