From 53da032ea75662b25f2b05dae8c159ed69e06424 Mon Sep 17 00:00:00 2001 From: Darrin Chandler Date: Tue, 11 Aug 2009 16:43:30 +0000 Subject: [PATCH] Switch config quirks from '|' to '+' to be consistent with other config items. With previous conf_load changes, space within [] are allowed, so class and name can appear as-is. Switch config file and man page to match. Old behavior still allowed for compat with existing configs out there, but not documented anywhere. Prodding by marco for the first bit, at least. --- scrotwm.1 | 28 +++++++++------------------- scrotwm.c | 3 ++- scrotwm.conf | 20 ++++++++++---------- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/scrotwm.1 b/scrotwm.1 index 9ddf6fd..2eeebf3 100644 --- a/scrotwm.1 +++ b/scrotwm.1 @@ -376,9 +376,9 @@ TRANSSZ .It Firefox:Dialog FLOAT .It Gimp:gimp -FLOAT | ANYWHERE +FLOAT + ANYWHERE .It MPlayer:xv -FLOAT | FULLSCREEN +FLOAT + FULLSCREEN .It OpenOffice.org 2.4:VCLSalFrame FLOAT .It OpenOffice.org 3.1:VCLSalFrame @@ -386,15 +386,15 @@ FLOAT .It pcb:pcb FLOAT .It xine:Xine Window -FLOAT | ANYWHERE +FLOAT + ANYWHERE .It xine:xine Panel -FLOAT | ANYWHERE +FLOAT + ANYWHERE .It xine:xine Video Fullscreen Window -FULLSCREEN | FLOAT +FULLSCREEN + FLOAT .It Xitk:Xitk Combo -FLOAT | ANYWHERE +FLOAT + ANYWHERE .It Xitk:Xine Window -FLOAT | ANYWHERE +FLOAT + ANYWHERE .It XTerm:xterm XTERM_FONTADJ .El @@ -418,7 +418,7 @@ Remove border to allow window to use full screen size. .Pp Custom quirks in the configuration file are specified as follows: .Pp -.Dl quirk[:] = [ | ... ] +.Dl quirk[:] = [ + ... ] .Pp .Aq class and @@ -428,20 +428,10 @@ specify the window to which the quirk(s) apply, and is one of the quirks from the list above. For example: .Bd -literal -offset indent -quirk[MPlayer:xv] = FLOAT | FULLSCREEN # let mplayer play +quirk[MPlayer:xv] = FLOAT + FULLSCREEN # let mplayer play quirk[pcb:pcb] = NONE # remove existing quirk .Ed .Pp -Note that spaces in -.Aq class -or -.Aq name -must be replaced by an underscore in the configuration. -The config entry for "xine:Xine Panel" would be: -.Bd -literal -offset indent -quirk[xine:Xine_Panel] = FLOAT -.Ed -.Pp You can obtain .Aq class and diff --git a/scrotwm.c b/scrotwm.c index ca4a07a..98e0490 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -2381,7 +2381,8 @@ const char *quirkname[] = { "FULLSCREEN", }; -#define SWM_Q_WS "\n| \t" +/* SWM_Q_WS: retain '|' for back compat for now (2009-08-11) */ +#define SWM_Q_WS "\n|+ \t" int parsequirks(char *qstr, unsigned long *quirk) { diff --git a/scrotwm.conf b/scrotwm.conf index c0d06d0..3fe26c5 100644 --- a/scrotwm.conf +++ b/scrotwm.conf @@ -92,16 +92,16 @@ dialog_ratio = 0.6 # quirks # remove with: quirk[class:name] = NONE -#quirk[MPlayer:xv] = FLOAT | FULLSCREEN -#quirk[OpenOffice.org_2.4:VCLSalFrame] = FLOAT -#quirk[OpenOffice.org_3.0:VCLSalFrame] = FLOAT +#quirk[MPlayer:xv] = FLOAT + FULLSCREEN +#quirk[OpenOffice.org 2.4:VCLSalFrame] = FLOAT +#quirk[OpenOffice.org 3.0:VCLSalFrame] = FLOAT #quirk[Firefox-bin:firefox-bin] = TRANSSZ #quirk[Firefox:Dialog] = FLOAT -#quirk[Gimp:gimp] = FLOAT | ANYWHERE -#quirk[XTerm:xterm] = XTERM_FONTADJ -#quirk[xine:Xine_Window] = FLOAT | ANYWHERE -#quirk[Xitk:Xitk_Combo] = FLOAT | ANYWHERE -#quirk[xine:xine_Panel] = FLOAT | ANYWHERE -#quirk[Xitk:Xine_Window] = FLOAT | ANYWHERE -#quirk[xine:xine_Video_Fullscreen_Window] = FULLSCREEN | FLOAT +#quirk[Gimp:gimp] = FLOAT + ANYWHERE +#quirk[XTerm:xterm] = XTERM FONTADJ +#quirk[xine:Xine Window] = FLOAT + ANYWHERE +#quirk[Xitk:Xitk Combo] = FLOAT + ANYWHERE +#quirk[xine:xine Panel] = FLOAT + ANYWHERE +#quirk[Xitk:Xine Window] = FLOAT + ANYWHERE +#quirk[xine:xine Video Fullscreen Window] = FULLSCREEN + FLOAT #quirk[pcb:pcb] = FLOAT -- 1.7.10.4