From 84e64b9ce3b8ec9e68ec52231f1f41d757635eb6 Mon Sep 17 00:00:00 2001
From: Johan Malm <jgm323@gmail.com>
Date: Thu, 15 Sep 2022 22:03:52 +0100
Subject: [PATCH] config: s/OSD/OnScreenDisplay/ in <theme><font place="OSD">

...to comply with Openbox 3.6 spec [1]

"OSD" is still honoured to maintain backward compatibility.

[1]: http://openbox.org/wiki/Help:Configuration#Theme
---
 docs/labwc-config.5.scd | 2 +-
 docs/rc.xml.all         | 2 +-
 src/config/rcxml.c      | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index db0a40c9..c5a2680d 100644
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -126,7 +126,7 @@ The rest of this man page describes configuration options.
 	Places can be any of:
 	- ActiveWindow - titlebar of active window
 	- MenuItem - menu item (currently only root menu)
-	- OSD - items in the on screen display
+	- OnScreenDisplay - items in the on screen display
 	If no place attribute is provided, the setting will be applied to all
 	places.
 
diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 12610e79..c3363404 100644
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -31,7 +31,7 @@
       <slant>normal</slant>
       <weight>normal</weight>
     </font>
-    <font place="OSD">
+    <font place="OnScreenDisplay">
       <name>sans</name>
       <size>10</size>
       <slant>normal</slant>
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 155a4527..886f29b5 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -298,7 +298,8 @@ enum_font_place(const char *place)
 		return FONT_PLACE_ACTIVEWINDOW;
 	} else if (!strcasecmp(place, "MenuItem")) {
 		return FONT_PLACE_MENUITEM;
-	} else if (!strcasecmp(place, "OSD")) {
+	} else if (!strcasecmp(place, "OnScreenDisplay")
+			|| !strcasecmp(place, "OSD")) {
 		return FONT_PLACE_OSD;
 	}
 	return FONT_PLACE_UNKNOWN;