X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fprop.h;h=52c1de1eee68b89f56e4d515939ee074be5f13f3;hb=965ed8907a5dd81d5ffbc93b67a672fa78833854;hp=d11a73550205ef3fcde942fad05d3e2d7bb1b038;hpb=0fcf5ead0fb38710e6277da8b59c6ad19f907092;p=chaz%2Fopenbox

diff --git a/obt/prop.h b/obt/prop.h
index d11a7355..52c1de1e 100644
--- 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,13 +209,15 @@ 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_ROLE,
+    OBT_PROP_OB_NAME,
+    OBT_PROP_OB_CLASS,
 
     OBT_PROP_NUM_ATOMS
 } ObtPropAtom;
 
-void obt_prop_startup();
-
 Atom obt_prop_atom(ObtPropAtom a);
 
 gboolean obt_prop_get32(Window win, Atom prop, Atom type, guint32 *ret);
@@ -225,8 +231,10 @@ gboolean obt_prop_get_strings_utf8(Window win, Atom prop, gchar ***ret);
 void obt_prop_set32(Window win, Atom prop, Atom type, gulong val);
 void obt_prop_set_array32(Window win, Atom prop, Atom type, gulong *val,
                           guint num);
+void obt_prop_set_string_locale(Window win, Atom prop, const gchar *val);
 void obt_prop_set_string_utf8(Window win, Atom prop, const gchar *val);
-void obt_prop_set_strings_utf8(Window win, Atom prop, gchar **strs);
+void obt_prop_set_strings_locale(Window win, Atom prop, const gchar **strs);
+void obt_prop_set_strings_utf8(Window win, Atom prop, const gchar **strs);
 
 void obt_prop_erase(Window win, Atom prop);
 
@@ -254,10 +262,10 @@ void obt_prop_message_to(Window to, Window about, Atom messagetype,
 #define OBT_PROP_SETA32(win, prop, type, val, num) \
     (obt_prop_set_array32(win, OBT_PROP_ATOM(prop), OBT_PROP_ATOM(type), \
                           val, num))
-#define OBT_PROP_SETS(win, prop, val) \
-    (obt_prop_set_string_utf8(win, OBT_PROP_ATOM(prop), val))
-#define OBT_PROP_SETSS(win, prop, strs) \
-    (obt_prop_set_strings_utf8(win, OBT_PROP_ATOM(prop), strs))
+#define OBT_PROP_SETS(win, prop, type, val) \
+    (obt_prop_set_string_##type(win, OBT_PROP_ATOM(prop), val))
+#define OBT_PROP_SETSS(win, prop, type, strs) \
+    (obt_prop_set_strings_##type(win, OBT_PROP_ATOM(prop), strs))
 
 #define OBT_PROP_ERASE(win, prop) (obt_prop_erase(win, OBT_PROP_ATOM(prop)))
 
@@ -267,10 +275,10 @@ void obt_prop_message_to(Window to, Window about, Atom messagetype,
                       data0, data1, data2, data3, data4, \
                       SubstructureNotifyMask | SubstructureRedirectMask))
 
-#define OBT_PROP_MSG(to, about, msgtype, data0, data1, data2, data3, \
-                     data4, mask) \
-    (obt_prop_message_to(to, OBT_PROP_ATOM(msgtype), \
-                      data0, data1, data2, data3, data4, mask))
+#define OBT_PROP_MSG_TO(to, about, msgtype, data0, data1, data2, data3, \
+                        data4, mask) \
+    (obt_prop_message_to(to, about, OBT_PROP_ATOM(msgtype), \
+                         data0, data1, data2, data3, data4, mask))
 
 G_END_DECLS