From 5b886074bc2e948e0757f6a71b2cd12d86e50cdb Mon Sep 17 00:00:00 2001 From: gotmor Date: Mon, 26 Jan 2009 14:30:58 +0000 Subject: added "-title-name" and "-slave-name" command line options git-svn-id: http://dzen.googlecode.com/svn/trunk@238 f2baff5b-bf2c-0410-a398-912abdc3d8b2 --- dzen.h | 3 ++- main.c | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dzen.h b/dzen.h index 625cfbf..f31a629 100644 --- a/dzen.h +++ b/dzen.h @@ -31,7 +31,6 @@ # define Button7 7 #endif -/* gui data structures */ enum { ColFG, ColBG, ColLast }; /* exapansion directions */ @@ -55,6 +54,7 @@ struct Fnt { struct TW { int x, y, width, height; + char *name; Window win; Drawable drawable; char alignment; @@ -67,6 +67,7 @@ struct TW { struct SW { int x, y, width, height; + char *name; Window win; Window *line; Drawable *drawable; diff --git a/main.c b/main.c index 51d8f6d..72ae29e 100644 --- a/main.c +++ b/main.c @@ -479,7 +479,7 @@ x_create_windows(int use_ewmh_dock) { DefaultDepth(dzen.dpy, dzen.screen), CopyFromParent, DefaultVisual(dzen.dpy, dzen.screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); - XStoreName(dzen.dpy, dzen.title_win.win, "dzen title"); + XStoreName(dzen.dpy, dzen.title_win.win, dzen.title_win.name); dzen.title_win.drawable = XCreatePixmap(dzen.dpy, root, dzen.title_win.width, dzen.line_height, DefaultDepth(dzen.dpy, dzen.screen)); @@ -513,7 +513,7 @@ x_create_windows(int use_ewmh_dock) { DefaultDepth(dzen.dpy, dzen.screen), CopyFromParent, DefaultVisual(dzen.dpy, dzen.screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); - XStoreName(dzen.dpy, dzen.slave_win.win, "dzen slave"); + XStoreName(dzen.dpy, dzen.slave_win.win, dzen.slave_win.name); for(i=0; i < dzen.slave_win.max_lines; i++) { dzen.slave_win.drawable[i] = XCreatePixmap(dzen.dpy, root, ew+r, @@ -550,7 +550,7 @@ x_create_windows(int use_ewmh_dock) { DefaultDepth(dzen.dpy, dzen.screen), CopyFromParent, DefaultVisual(dzen.dpy, dzen.screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); - XStoreName(dzen.dpy, dzen.slave_win.win, "dzen slave"); + XStoreName(dzen.dpy, dzen.slave_win.win, dzen.slave_win.name); for(i=0; i < dzen.slave_win.max_lines; i++) { dzen.slave_win.drawable[i] = XCreatePixmap(dzen.dpy, root, dzen.slave_win.width, @@ -834,6 +834,8 @@ main(int argc, char *argv[]) { char *endptr, *fnpre = NULL; /* default values */ + dzen.title_win.name = "dzen title"; + dzen.slave_win.name = "dzen slave"; dzen.cur_line = 0; dzen.ret_val = 0; dzen.title_win.x = dzen.slave_win.x = 0; @@ -931,6 +933,12 @@ main(int argc, char *argv[]) { else if(!strncmp(argv[i], "-e", 3)) { if(++i < argc) action_string = argv[i]; } + else if(!strncmp(argv[i], "-title-name", 12)) { + if(++i < argc) dzen.title_win.name = argv[i]; + } + else if(!strncmp(argv[i], "-slave-name", 12)) { + if(++i < argc) dzen.slave_win.name = argv[i]; + } else if(!strncmp(argv[i], "-bg", 4)) { if(++i < argc) dzen.bg = argv[i]; } -- cgit v1.2.3-54-g00ecf