Merge branch 'backport' into work

[chaz/openbox] / obt / prop.h

diff --git a/obt/prop.h b/obt/prop.h
index 4de3111dbec5f9e3c4b17798298c0bcc30201825..0a471cd501cbbe20db9d01bdd934ace8aded590c 100644 (file)
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -51,7 +51,9 @@ typedef enum {
     OBT_PROP_WM_CLIENT_MACHINE,
     OBT_PROP_WM_COMMAND,
     OBT_PROP_WM_CLIENT_LEADER,
+    OBT_PROP_WM_TRANSIENT_FOR,
     OBT_PROP_MOTIF_WM_HINTS,
+    OBT_PROP_MOTIF_WM_INFO,
 
     /* SM atoms */
     OBT_PROP_SM_CLIENT_ID,
@@ -84,6 +86,8 @@ typedef enum {
     OBT_PROP_NET_WM_BOTTOMRIGHT,
     OBT_PROP_NET_WM_BOTTOMLEFT,
 
+    OBT_PROP_NET_WM_WINDOW_TYPE_POPUP_MENU,
+
     OBT_PROP_PRIVATE_PADDING1,
     OBT_PROP_PRIVATE_PADDING2,
     OBT_PROP_PRIVATE_PADDING3,
@@ -205,7 +209,13 @@ typedef enum {
     OBT_PROP_OB_WM_STATE_UNDECORATED,
     OBT_PROP_OPENBOX_PID, /* this is depreecated in favour of ob_control */
     OBT_PROP_OB_THEME,
+    OBT_PROP_OB_CONFIG_FILE,
     OBT_PROP_OB_CONTROL,
+    OBT_PROP_OB_VERSION,
+    OBT_PROP_OB_APP_ROLE,
+    OBT_PROP_OB_APP_NAME,
+    OBT_PROP_OB_APP_CLASS,
+    OBT_PROP_OB_APP_TYPE,
 
     OBT_PROP_NUM_ATOMS
 } ObtPropAtom;