Merge pull request #6 from jrk-/xresources

Xresources!

Makefile

@@ -1,5 +1,5 @@
 CFLAGS?=-Wall -Os
-LDADD?=`pkg-config --cflags --libs x11 xinerama xft`
+LDADD?=`pkg-config --cflags --libs x11 xinerama xft xres`
 PREFIX?=$(DESTDIR)/usr
 BINDIR?=$(PREFIX)/bin
 

simpleswitcher.1

@@ -30,16 +30,21 @@ is an X11 popup window switcher. A list is displayed center-screen showing open
 .P
 License: MIT/X11
 .SH USAGE
-See options below for custom key combinations. These are the defaults.
+See options below for custom key combinations. These are the defaults. In addition to the command line switches X resources can be used for configuration. The instance name is
+.B simpleswitcher
+and the class name is
+.B Simpleswitcher
+.
 .TP
 .B F12
 Show all windows on all desktops.
 .TP
 .B F11
 Show windows from the current desktop.
 .SH OPTIONS
+The first option is the command line switch, the resource name follows in parenthesis.
 .TP
-.B -key
+.B -key (key)
 Change the key combination to display all windows (default: F12).
 .P
 .RS
@@ -50,7 +55,7 @@ simpleswitcher -key control+shift+s
 simpleswitcher -key mod1+Tab
 .RE
 .TP
-.B -dkey
+.B -dkey (dkey)
 Change the key combination to display window on the current desktop (default: F11).
 .P
 .RS
@@ -67,77 +72,77 @@ Run simpleswitcher in all-windows mode once then exit. Does not bind any keys.
 .B -dnow
 Run simpleswitcher in current-desktop-windows mode once then exit. Does not bind any keys.
 .TP
-.B -bg
+.B -bg (background)
 Set the background text color (X11 named color or hex #rrggbb) for the menu (default: #222222).
 .P
 .RS
 simpleswitcher -fg "#222222"
 .RE
 .TP
-.B -bc
+.B -bc (bordercolor)
 Set the border color (X11 named color or hex #rrggbb) for the menu (default: #000000).
 .P
 .RS
 simpleswitcher -bc black
 .RE
 .TP
-.B -bw
+.B -bw (borderwidth)
 Set the border width in pixels (default: 1).
 .P
 .RS
 simpleswitcher -bw 1
 .RE
 .TP
-.B -fg
+.B -fg (foreground)
 Set the foreground text color (X11 named color or hex #rrggbb) for the menu (default: #cccccc).
 .P
 .RS
 simpleswitcher -fg "#cccccc"
 .RE
 .TP
-.B -font
+.B -font (font)
 Xft font name for use by the menu (default: mono-14).
 .P
 .RS
 simpleswitcher -font monospace-14:medium
 .RE
 .TP
-.B -hlbg
+.B -hlbg (highlightbg)
 Set the background text color (X11 named color or hex #rrggbb) for the highlighted item in the menu (default: #005577).
 .P
 .RS
 simpleswitcher -fg "#005577"
 .RE
 .TP
-.B -hlfg
+.B -hlfg (highlightfg)
 Set the foreground text color (X11 named color or hex #rrggbb) for the highlighted item in the menu (default: #ffffff).
 .P
 .RS
 simpleswitcher -fg "#ffffff"
 .RE
 .TP
-.B -o
+.B -o (opacity)
 Set the window opacity (0-100).
 .P
 .RS
 simpleswitcher -o "75"
 .RE
 .TP
-.B -lines
+.B -lines (lines)
 Maximum number of entries the menu may show before scrolling (default: 25).
 .P
 .RS
 simpleswitcher -lines 25
 .RE
 .TP
-.B -width
+.B -width (width)
 Set the width of the menu as a percentage of the screen width (default: 60).
 .P
 .RS
 simpleswitcher -width 60
 .RE
 .TP
-.B -release
+.B -release (release)
 Enable or disable the action on modifier release feature
 .br
 (0 or 1, default: 0).
@@ -155,13 +160,14 @@ Works only when a modifier key is specified, e.g. mod1+Tab, otherwise simpleswit
 simpleswitcher -release 0
 .RE
 .TP
-.B -index
+.B -index (startindex)
 First item in list to be selected when simpleswitcher is called (default: 1).
 .P
 .RS
 simpleswitcher -index 1
 .RE
 .SH SEE ALSO
-.BR simpleswitcher (1)
+.BR simpleswitcher (1),
+.BR xrdb (1)
 .SH AUTHOR
 Sean Pringle <sean.pringle@gmail.com>

simpleswitcher.c

@@ -34,6 +34,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <X11/keysym.h>
 #include <X11/XKBlib.h>
 #include <X11/Xft/Xft.h>
+#include <X11/Xresource.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -120,15 +121,19 @@ int find_arg(int argc, char *argv[], char *key)
 	int i; for (i = 0; i < argc && strcasecmp(argv[i], key); i++);
 	return i < argc ? i: -1;
 }
-char* find_arg_str(int argc, char *argv[], char *key, char* def)
+void find_arg_str(int argc, char *argv[], char *key, char ** arg)
 {
 	int i = find_arg(argc, argv, key);
-	return (i > 0 && i < argc-1) ? argv[i+1]: def;
+	if ( i > 0 && i < argc - 1 ) {
+		*arg = argv[i + 1];
+	}
 }
-int find_arg_int(int argc, char *argv[], char *key, int def)
+void find_arg_int(int argc, char *argv[], char *key, unsigned int * arg)
 {
 	int i = find_arg(argc, argv, key);
-	return (i > 0 && i < argc-1) ? strtol(argv[i+1], NULL, 10): def;
+	if (i > 0 && i < argc-1) {
+		*arg = strtol(argv[i+1], NULL, 10);
+	}
 }
 
 unsigned int NumlockMask = 0;
@@ -288,23 +293,57 @@ typedef struct {
 	workarea monitor;
 } client;
 
-#define MENUXFTFONT "mono-14"
-#define MENUWIDTH 50
-#define MENULINES 25
-#define MENUFG "#222222"
-#define MENUBG "#f2f1f0"
-#define MENUBGALT "#e9e8e7"
-#define MENUHLFG "#ffffff"
-#define MENUHLBG "#005577"
-#define MENURETURN 1
-#define MENUMODUP 2
-#define MENUBC "black"
-#define MENURELEASE 0
-#define MENUSTARTIDX 1
-
-char *config_menu_font, *config_menu_fg, *config_menu_bg, *config_menu_hlfg, *config_menu_hlbg, *config_menu_bgalt, *config_menu_bc;
-unsigned int config_menu_width, config_menu_lines, config_focus_mode, config_raise_mode, config_window_placement, config_menu_bw,
-	config_window_opacity, config_menu_mod, config_menu_idx;
+char
+	  *config_menu_key = "F12"
+	, *config_menu_dkey = "F11"
+	, *config_menu_font = "mono-14"
+	, *config_menu_fg = "#222222"
+	, *config_menu_bg = "#f2f1f0"
+	, *config_menu_hlfg = "#ffffff"
+	, *config_menu_hlbg = "#005577"
+	, *config_menu_bgalt = "#e9e8e7"
+	, *config_menu_bc = "black"
+	;
+
+unsigned int
+	  config_menu_width = 50
+	, config_menu_lines = 25
+	, config_focus_mode
+	, config_raise_mode
+	, config_window_placement
+	, config_menu_bw = 1
+	, config_window_opacity = 100
+	, config_menu_mod = 0
+	, config_menu_idx = 1
+	;
+
+#define xrm_String 0
+#define xrm_Number 1
+
+typedef struct
+	{ int type
+	; char * name
+	; union { unsigned int * num; char ** str; }
+	;
+	} XrmOption;
+
+XrmOption xrmOptions[] =
+	{ { xrm_String, "key",         { .str = &config_menu_key       } }
+	, { xrm_String, "dkey",        { .str = &config_menu_dkey      } }
+	, { xrm_Number, "width",       { .num = &config_menu_width     } }
+	, { xrm_Number, "lines",       { .num = &config_menu_lines     } }
+	, { xrm_String, "font",        { .str = &config_menu_font      } }
+	, { xrm_String, "foreground",  { .str = &config_menu_fg        } }
+	, { xrm_String, "background",  { .str = &config_menu_bg        } }
+	, { xrm_String, "alternatebg", { .str = &config_menu_bgalt     } }
+	, { xrm_String, "highlightfg", { .str = &config_menu_hlfg      } }
+	, { xrm_String, "highlightbg", { .str = &config_menu_hlbg      } }
+	, { xrm_String, "bordercolor", { .str = &config_menu_bc        } }
+	, { xrm_Number, "release",     { .num = &config_menu_mod       } }
+	, { xrm_Number, "startindex",  { .num = &config_menu_idx       } }
+	, { xrm_Number, "borderwidth", { .num = &config_menu_bw        } }
+	, { xrm_Number, "opacity",     { .num = &config_window_opacity } }
+	};
 
 // allocate a pixel value for an X named color
 unsigned int color_get(const char *name)
@@ -1030,19 +1069,55 @@ int main(int argc, char *argv[])
 	// X atom values
 	for (i = 0; i < NETATOMS; i++) netatoms[i] = XInternAtom(display, netatom_names[i], False);
 
-	config_menu_width = find_arg_int(ac, av, "-width", MENUWIDTH);
-	config_menu_lines = find_arg_int(ac, av, "-lines", MENULINES);
-	config_menu_font  = find_arg_str(ac, av, "-font", MENUXFTFONT);
-	config_menu_fg    = find_arg_str(ac, av, "-fg", MENUFG);
-	config_menu_bg    = find_arg_str(ac, av, "-bg", MENUBG);
-	config_menu_bgalt = find_arg_str(ac, av, "-bgalt", MENUBGALT);
-	config_menu_hlfg  = find_arg_str(ac, av, "-hlfg", MENUHLFG);
-	config_menu_hlbg  = find_arg_str(ac, av, "-hlbg", MENUHLBG);
-	config_menu_bc    = find_arg_str(ac, av, "-bc", MENUBC);
-	config_menu_mod   = find_arg_int(ac, av, "-release", MENURELEASE);
-	config_menu_idx   = find_arg_int(ac, av, "-index", MENUSTARTIDX);
-	config_menu_bw    = find_arg_int(ac, av, "-bw", 1);
-	config_window_opacity = find_arg_int(ac, av, "-o", 100);
+	XrmInitialize();
+	char * xRMS = XResourceManagerString ( display );
+
+	if ( xRMS != NULL ) {
+		XrmDatabase xDB = XrmGetStringDatabase ( xRMS );
+
+		char * xrmType;
+		XrmValue xrmValue;
+
+		const char * namePrefix = "simpleswitcher";
+		const char * classPrefix = "Simpleswitcher";
+
+		for ( i = 0; i < sizeof ( xrmOptions ) / sizeof ( *xrmOptions ); ++i ) {
+			char * name = (char *) malloc ( ( 1 + strlen ( namePrefix ) + strlen ( xrmOptions[i].name ) ) * sizeof ( char ) );
+			char * class = (char *) malloc ( ( 1 + strlen ( classPrefix ) + strlen ( xrmOptions[i].name ) ) * sizeof ( char ) );
+			sprintf ( name, "%s.%s", namePrefix, xrmOptions[i].name );
+			sprintf ( class, "%s.%s", classPrefix, xrmOptions[i].name );
+
+			if ( XrmGetResource ( xDB, name, class, &xrmType, &xrmValue ) ) {
+
+				if ( xrmOptions[i].type == xrm_String ) {
+					*xrmOptions[i].str = (char *) malloc ( xrmValue.size * sizeof ( char ) );
+					strncpy ( *xrmOptions[i].str, xrmValue.addr, xrmValue.size );
+				} else if ( xrmOptions[i].type == xrm_Number ) {
+					*xrmOptions[i].num = strtol ( xrmValue.addr, NULL, 10 );
+				}
+			}
+
+			free ( name ); free ( class );
+		}
+
+		XFree ( xRMS );
+	}
+
+	find_arg_str(ac, av, "-key",     &config_menu_key       );
+	find_arg_str(ac, av, "-dkey",    &config_menu_dkey      );
+	find_arg_int(ac, av, "-width",   &config_menu_width     );
+	find_arg_int(ac, av, "-lines",   &config_menu_lines     );
+	find_arg_str(ac, av, "-font",    &config_menu_font      );
+	find_arg_str(ac, av, "-fg",      &config_menu_fg        );
+	find_arg_str(ac, av, "-bg",      &config_menu_bg        );
+	find_arg_str(ac, av, "-bgalt",   &config_menu_bgalt     );
+	find_arg_str(ac, av, "-hlfg",    &config_menu_hlfg      );
+	find_arg_str(ac, av, "-hlbg",    &config_menu_hlbg      );
+	find_arg_str(ac, av, "-bc",      &config_menu_bc        );
+	find_arg_int(ac, av, "-release", &config_menu_mod       );
+	find_arg_int(ac, av, "-index",   &config_menu_idx       );
+	find_arg_int(ac, av, "-bw",      &config_menu_bw        );
+	find_arg_int(ac, av, "-o",       &config_window_opacity );
 
 	// flags to run immediately and exit
 	if (find_arg(ac, av, "-now") >= 0)
@@ -1058,10 +1133,10 @@ int main(int argc, char *argv[])
 	// in background mode from here on
 
 	// key combination to display all windows from all desktops
-	parse_key(find_arg_str(ac, av, "-key", "F12"), &all_windows_modmask, &all_windows_keysym);
+	parse_key(config_menu_key, &all_windows_modmask, &all_windows_keysym);
 
 	// key combination to display only window on the current desktop
-	parse_key(find_arg_str(ac, av, "-dkey", "F11"), &desktop_windows_modmask, &desktop_windows_keysym);
+	parse_key(config_menu_dkey, &desktop_windows_modmask, &desktop_windows_keysym);
 
 	// bind key combos
 	grab_modifier(all_windows_modmask, all_windows_modifiers);