X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprop.h;h=f4d7f8b63c6933135b1c9397ac48a396e77850ab;hb=564b727966ef1a38309d45b2ab040c3deeb658a4;hp=00649acc761424bbbc9f6f8b219bd50f8454d209;hpb=16f46c296d1fcd3f27fc62a18e71c55fb3fd3e88;p=chaz%2Fopenbox

diff --git a/openbox/prop.h b/openbox/prop.h
index 00649acc..f4d7f8b6 100644
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    prop.h for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -49,13 +50,16 @@ typedef struct Atoms {
     Atom wm_icon_name;
     Atom wm_class;
     Atom wm_window_role;
+    Atom wm_client_machine;
     Atom motif_wm_hints;
 
     /* SM atoms */
     Atom sm_client_id;
 
     /* NETWM atoms */
-     
+
+    Atom net_wm_full_placement;
+
     /* root window properties */
     Atom net_supported;
     Atom net_client_list;
@@ -91,8 +95,15 @@ typedef struct Atoms {
     Atom net_wm_icon;
 /*  Atom net_wm_pid; */
     Atom net_wm_allowed_actions;
+    Atom net_wm_user_time;
+    Atom net_frame_extents;
+
     /* application protocols */
-/*  Atom   Atom net_wm_ping; */
+/*  Atom net_wm_ping; */
+#ifdef SYNC
+    Atom net_wm_sync_request;
+    Atom net_wm_sync_request_counter;
+#endif
 
     Atom net_wm_window_type_desktop;
     Atom net_wm_window_type_dock;
@@ -114,12 +125,12 @@ typedef struct Atoms {
     Atom net_wm_moveresize_move;
     Atom net_wm_moveresize_size_keyboard;
     Atom net_wm_moveresize_move_keyboard;
+    Atom net_wm_moveresize_cancel;
 
     Atom net_wm_action_move;
     Atom net_wm_action_resize;
     Atom net_wm_action_minimize;
     Atom net_wm_action_shade;
-    Atom net_wm_action_stick;
     Atom net_wm_action_maximize_horz;
     Atom net_wm_action_maximize_vert;
     Atom net_wm_action_fullscreen;
@@ -137,6 +148,7 @@ typedef struct Atoms {
     Atom net_wm_state_fullscreen;
     Atom net_wm_state_above;
     Atom net_wm_state_below;
+    Atom net_wm_state_demands_attention;
 
     Atom net_wm_state_add;
     Atom net_wm_state_remove;
@@ -151,19 +163,18 @@ typedef struct Atoms {
 
     /* Extra atoms */
 
-    Atom kde_net_system_tray_windows;
-    Atom kde_net_wm_system_tray_window_for;
+    Atom kde_wm_change_state;
     Atom kde_net_wm_window_type_override;
 
-    Atom kwm_win_icon;
-
     Atom rootpmapid;
     Atom esetrootid;
 
     /* Openbox specific atoms */
      
     Atom openbox_pid;
-    Atom openbox_premax;
+    Atom openbox_rc;
+    Atom ob_wm_state_undecorated;
+    Atom ob_control;
 } Atoms;
 Atoms prop_atoms;
 
@@ -172,21 +183,21 @@ void prop_startup();
 gboolean prop_get32(Window win, Atom prop, Atom type, guint32 *ret);
 gboolean prop_get_array32(Window win, Atom prop, Atom type, guint32 **ret,
                           guint *nret);
-gboolean prop_get_string_locale(Window win, Atom prop, char **ret);
-gboolean prop_get_string_utf8(Window win, Atom prop, char **ret);
-gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret);
-gboolean prop_get_strings_utf8(Window win, Atom prop, char ***ret);
+gboolean prop_get_string_locale(Window win, Atom prop, gchar **ret);
+gboolean prop_get_string_utf8(Window win, Atom prop, gchar **ret);
+gboolean prop_get_strings_locale(Window win, Atom prop, gchar ***ret);
+gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret);
 
-void prop_set32(Window win, Atom prop, Atom type, guint32 val);
-void prop_set_array32(Window win, Atom prop, Atom type, guint32 *val,
+void prop_set32(Window win, Atom prop, Atom type, gulong val);
+void prop_set_array32(Window win, Atom prop, Atom type, gulong *val,
                       guint num);
-void prop_set_string_utf8(Window win, Atom prop, char *val);
-void prop_set_strings_utf8(Window win, Atom prop, char **strs);
+void prop_set_string_utf8(Window win, Atom prop, const gchar *val);
+void prop_set_strings_utf8(Window win, Atom prop, gchar **strs);
 
 void prop_erase(Window win, Atom prop);
 
-void prop_message(Window about, Atom messagetype, long data0, long data1,
-		  long data2, long data3, long mask);
+void prop_message(Window about, Atom messagetype, glong data0, glong data1,
+                  glong data2, glong data3, glong mask);
 
 #define PROP_GET32(win, prop, type, ret) \
     (prop_get32(win, prop_atoms.prop, prop_atoms.type, ret))