save rules in current format

Author: bbidulock

.indent.pro

@@ -271,3 +271,4 @@
 -Tbfunc_t
 -Tabq_item_t
 -TXClassHint
+-TRule

doc/adwm-rules.5.in

@@ -202,7 +202,7 @@ title bar;
 resize grips;
 .It Cm border
 decorative border; and
-.It Cm button.<button>
+.It Cm but.<button>
 buttons to display where
 .Cm <button>
 may be one of the following:
@@ -358,7 +358,7 @@ floating, even on tiled layouts.  When false, the client will be started
 tiled.
 .Pp
 This is the equivalent of the current
-.Cm is.floater
+.Cm skip.arrange
 setting (see
 .Sx SETTINGS ,
 above).
@@ -379,7 +379,7 @@ resize grips by default, using the current syntax:
 .Pp
 Example:
 .Dl Li "Adwm*" Ns Cm rule0.prop Ns Li : Ar ^Mplayer:
-.Dl Li "Adwm*" Ns Cm rule0.is.floater Ns Li : Ar 1
+.Dl Li "Adwm*" Ns Cm rule0.skip.arrange Ns Li : Ar 1
 .Dl Li "Adwm*" Ns Cm rule0.has.title Ns Li : Ar 1
 .Dl Li "Adwm*" Ns Cm rule0.has.grips Ns Li : Ar 1
 .Pp

src/adwm.h

@@ -932,6 +932,8 @@ typedef union {
 	unsigned skip;
 } SkipUnion;
 
+extern char *skip_fields[32];		/* see parse.h */
+
 typedef union {
 	struct {
 		unsigned border:1;
@@ -953,6 +955,8 @@ typedef union {
 	unsigned has;
 } HasUnion;
 
+extern char *has_fields[32];		/* see parse.h */
+
 typedef union {
 	struct {
 		unsigned transient:1;
@@ -989,6 +993,8 @@ typedef union {
 	unsigned is;
 } IsUnion;
 
+extern char *is_fields[32];		/* see parse.h */
+
 typedef union {
 	struct {
 		unsigned move:1;
@@ -1019,6 +1025,8 @@ typedef union {
 	unsigned can;
 } CanUnion;
 
+extern char *can_fields[32];		/* see parse.h */
+
 typedef union {
 	struct {
 		unsigned struts:1;
@@ -1031,6 +1039,8 @@ typedef union {
 	unsigned with;
 } WithUnion;
 
+extern char *with_fields[32];		/* see parse.h */
+
 struct Appl {
 	Appl *next;			/* next in list */
 	char *appid;			/* application id (unique) */
@@ -1475,6 +1485,22 @@ struct AScreen {
 typedef struct {
 	char *prop;
 	char *tags;
+	struct {
+		IsUnion is;
+		IsUnion set;
+	} is;
+	struct {
+		SkipUnion skip;
+		SkipUnion set;
+	} skip;
+	struct {
+		HasUnion has;
+		HasUnion set;
+	} has;
+	struct {
+		CanUnion can;
+		CanUnion set;
+	} can;
 	Bool isfloating;
 	Bool hastitle;
 	regex_t *propregex;

src/parse.c

@@ -802,12 +802,123 @@ initkeys(Bool reload)
 	}
 }
 
+char *skip_fields[32] = {
+	"taskbar",
+	"pager",
+	"winlist",
+	"cycle",
+	"focus",
+	"arrange",
+	"sloppy",
+	NULL,
+};
+
+char *has_fields[32] = {
+	"border",
+	"grips",
+	"title",
+	"but.menu",
+	"but.min",
+	"but.max",
+	"but.close",
+	"but.size",
+	"but.shade",
+	"but.stick",
+	"but.fill",
+	"but.floats",
+	"but.half",
+	NULL,
+};
+
+char *is_fields[32] = {
+	NULL /* "transient" */,
+	NULL /* "grptrans" */,
+	NULL /* "banned" */,
+	"max",
+	"floater",
+	"maxv",
+	"maxh",
+	"lhalf",
+	"rhalf",
+	"shaded",
+	"icon",
+	"fill",
+	NULL /* "modal" */,
+	"above",
+	"below",
+	NULL /* "attn" */,
+	"sticky",
+	"undec",
+	NULL /* "closing" */,
+	NULL /* "killing" */,
+	NULL /* "pinging" */,
+	"hidden",
+	"bastard",
+	"full",
+	NULL /* "focused" */,
+	NULL /* "selected" */,
+	"dockapp",
+	NULL /* "moveresize" */,
+	NULL /* "managed" */,
+	NULL /* "saving" */,
+	NULL,
+};
+
+char *can_fields[32] = {
+	"move",
+	"size",
+	"sizev",
+	"sizeh",
+	"min",
+	"max",
+	"maxv",
+	"maxh",
+	"close",
+	"shade",
+	"stick",
+	"full",
+	"above",
+	"below",
+	"fill",
+	"fillh",
+	"fillv",
+	"floats",
+	"hide",
+	"tag",
+	"arrange",
+	"undec",
+	"select",
+	"focus",
+	NULL,
+};
+
+char *with_fields[32] = {
+	NULL /* "struts" */,
+	NULL /* "time" */,
+	NULL /* "boundary" */,
+	NULL /* "clipping" */,
+	NULL /* "wshape" */,
+	NULL /* "bshape" */,
+	NULL,
+};
+
 static void
-parserule(const char *s, Rule * r)
+parserule(const char *s, Rule *r)
 {
+	Bool isfloating = False;
+	Bool hastitle = False;
+
 	r->prop = emallocz(128);
 	r->tags = emallocz(64);
-	sscanf(s, "%s %s %d %d", r->prop, r->tags, &r->isfloating, &r->hastitle);
+	sscanf(s, "%s %s %d %d", r->prop, r->tags, &isfloating, &hastitle);
+
+	/* set current equivalents to old format */
+	r->skip.skip.arrange = isfloating;
+	r->skip.set.arrange = 1;
+	r->has.has.title = hastitle;
+	r->has.has.grips = hastitle;
+	r->has.set.title = 1;
+	r->has.set.grips = 1;
 }
 
 static void

src/parse.h

@@ -3,6 +3,12 @@
 #ifndef __LOCAL_PARSE_H__
 #define __LOCAL_PARSE_H__
 
+extern char *skip_fields[32];
+extern char *has_fields[32];
+extern char *is_fields[32];
+extern char *can_fields[32];
+extern char *with_fields[32];
+
 void initrules(Bool reload);
 void initkeys(Bool reload);
 void freekeys(void);

src/save.c

@@ -449,8 +449,54 @@ save(Bool permanent)
 		Rule *r;
 
 		if ((r = rules[i])) {
+			int f;
+			unsigned mask;
+#if 0
+			/* old deprecated format */
 			snprintf(line, sizeof(line), "Adwm.rule%u:\t\t%s %s %d %d\n", i, r->prop, r->tags, r->isfloating, r->hastitle);
 			XrmPutLineResource(&srdb, line);
+#else
+			if (r->prop) {
+				snprintf(line, sizeof(line), "Adwm.rule%u.prop:\t\t%s\n", i, r->prop);
+				XrmPutLineResource(&srdb, line);
+			}
+			if (r->tags) {
+				snprintf(line, sizeof(line), "Adwm.rule%u.tags:\t\t%s\n", i, r->tags);
+				XrmPutLineResource(&srdb, line);
+			}
+			if (r->is.set.is) {
+				for (f = 0, mask = 1; f < 32; f++, mask <<= 1) {
+					if ((r->is.set.is & mask) && is_fields[f]) {
+						snprintf(line, sizeof(line), "Adwm.rule%u.is.%s:\t\t%d\n", i, is_fields[f], (r->is.is.is & mask) ?  1 : 0);
+						XrmPutLineResource(&srdb, line);
+					}
+				}
+			}
+			if (r->skip.set.skip) {
+				for (f = 0, mask = 1; f < 32; f++, mask <<= 1) {
+					if ((r->skip.set.skip & mask) && skip_fields[f]) {
+						snprintf(line, sizeof(line), "Adwm.rule%u.skip.%s:\t\t%d\n", i, skip_fields[f], (r->skip.skip.skip & mask) ?  1 : 0);
+						XrmPutLineResource(&srdb, line);
+					}
+				}
+			}
+			if (r->has.set.has) {
+				for (f = 0, mask = 1; f < 32; f++, mask <<= 1) {
+					if ((r->has.set.has & mask) && has_fields[f]) {
+						snprintf(line, sizeof(line), "Adwm.rule%u.has.%s:\t\t%d\n", i, has_fields[f], (r->has.has.has & mask) ?  1 : 0);
+						XrmPutLineResource(&srdb, line);
+					}
+				}
+			}
+			if (r->can.set.can) {
+				for (f = 0, mask = 1; f < 32; f++, mask <<= 1) {
+					if ((r->can.set.can & mask) && can_fields[f]) {
+						snprintf(line, sizeof(line), "Adwm.rule%u.can.%s:\t\t%d\n", i, can_fields[f], (r->can.can.can & mask) ?  1 : 0);
+						XrmPutLineResource(&srdb, line);
+					}
+				}
+			}
+#endif
 		}
 	}