X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprop.c;h=16ab60cbed7dbb5b8faf599e69231f460e2340c2;hb=6f5292c87ece138a2b80d102ba0919b105b1839a;hp=f3afc6faa66af667abd7f55b6a35ac9677c76e72;hpb=7837faa3402faf2eff48adc5024509deb2be98ac;p=chaz%2Fopenbox

diff --git a/openbox/prop.c b/openbox/prop.c
index f3afc6fa..16ab60cb 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   prop.c for the Openbox window manager
+   Copyright (c) 2003        Ben 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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "prop.h"
 #include "openbox.h"
 
@@ -16,6 +34,8 @@ void prop_startup()
     CREATE(atom, "ATOM");
     CREATE(string, "STRING");
     CREATE(utf8, "UTF8_STRING");
+
+    CREATE(manager, "MANAGER");
      
     CREATE(wm_colormap_windows, "WM_COLORMAP_WINDOWS");
     CREATE(wm_protocols, "WM_PROTOCOLS");
@@ -29,6 +49,8 @@ void prop_startup()
     CREATE(wm_window_role, "WM_WINDOW_ROLE");
     CREATE(motif_wm_hints, "_MOTIF_WM_HINTS");
 
+    CREATE(sm_client_id, "SM_CLIENT_ID");
+
     CREATE(net_supported, "_NET_SUPPORTED");
     CREATE(net_client_list, "_NET_CLIENT_LIST");
     CREATE(net_client_list_stacking, "_NET_CLIENT_LIST_STACKING");
@@ -47,6 +69,8 @@ void prop_startup()
     CREATE(net_wm_moveresize, "_NET_WM_MOVERESIZE");
     CREATE(net_moveresize_window, "_NET_MOVERESIZE_WINDOW");
 
+    CREATE(net_startup_id, "_NET_STARTUP_ID");
+
     CREATE(net_wm_name, "_NET_WM_NAME");
     CREATE(net_wm_visible_name, "_NET_WM_VISIBLE_NAME");
     CREATE(net_wm_icon_name, "_NET_WM_ICON_NAME");
@@ -55,6 +79,7 @@ void prop_startup()
     CREATE(net_wm_window_type, "_NET_WM_WINDOW_TYPE");
     CREATE(net_wm_state, "_NET_WM_STATE");
     CREATE(net_wm_strut, "_NET_WM_STRUT");
+    CREATE(net_wm_strut_partial, "_NET_WM_STRUT_PARTIAL");
     CREATE(net_wm_icon, "_NET_WM_ICON");
 /*   CREATE(net_wm_pid, "_NET_WM_PID"); */
     CREATE(net_wm_allowed_actions, "_NET_WM_ALLOWED_ACTIONS");
@@ -115,11 +140,9 @@ void prop_startup()
     prop_atoms.net_wm_bottomright = 2;
     prop_atoms.net_wm_bottomleft = 3;
 
-    CREATE(kde_net_system_tray_windows, "_KDE_NET_SYSTEM_TRAY_WINDOWS");
-    CREATE(kde_net_wm_system_tray_window_for,
-	   "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR");
-    CREATE(kde_net_wm_window_type_override,
-	   "_KDE_NET_WM_WINDOW_TYPE_OVERRIDE");
+    CREATE(kde_net_wm_frame_strut, "_KDE_NET_WM_FRAME_STRUT");
+    CREATE(kde_wm_change_state, "_KDE_WM_CHANGE_STATE");
+    CREATE(kde_net_wm_window_type_override,"_KDE_NET_WM_WINDOW_TYPE_OVERRIDE");
 
     CREATE(kwm_win_icon, "KWM_WIN_ICON");
   
@@ -127,7 +150,7 @@ void prop_startup()
     CREATE(esetrootid, "ESETROOT_PMAP_ID");
 
     CREATE(openbox_pid, "_OPENBOX_PID");
-    CREATE(openbox_premax, "_OPENBOX_PREMAX");
+    CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
 }
 
 #include <X11/Xutil.h>
@@ -282,7 +305,7 @@ gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret)
     char *raw, *p;
     guint num, i, count = 0;
 
-    if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) {
+    if (get_all(win, prop, prop_atoms.string, 8, (guchar**)&raw, &num)) {
 
         p = raw;
         while (p < raw + num - 1) {
@@ -294,7 +317,7 @@ gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret)
         *ret = g_new0(char*, count + 1);
         (*ret)[count] = NULL; /* null terminated list */
 
-        for (it = strs; it; it = g_slist_next(it)) {
+        for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) {
             (*ret)[i] = g_convert(it->data, -1, "UTF-8", "ISO-8859-1",
                                   NULL, NULL, NULL);
             /* make sure translation did not fail */
@@ -343,7 +366,7 @@ gboolean prop_get_strings_utf8(Window win, Atom prop, char ***ret)
 
         *ret = g_new0(char*, count + 1);
 
-        for (it = strs; it; it = g_slist_next(it)) {
+        for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) {
             if (g_utf8_validate(it->data, -1, NULL))
                 (*ret)[i] = g_strdup(it->data);
             else
@@ -387,6 +410,7 @@ void prop_set_strings_utf8(Window win, Atom prop, char **strs)
     }
     XChangeProperty(ob_display, win, prop, prop_atoms.utf8, 8,
                     PropModeReplace, (guchar*)str->str, str->len);
+    g_string_free(str, TRUE);
 }
 
 void prop_erase(Window win, Atom prop)
@@ -395,7 +419,7 @@ void prop_erase(Window win, Atom prop)
 }
 
 void prop_message(Window about, Atom messagetype, long data0, long data1,
-		  long data2, long data3)
+		  long data2, long data3, long mask)
 {
     XEvent ce;
     ce.xclient.type = ClientMessage;
@@ -407,6 +431,6 @@ void prop_message(Window about, Atom messagetype, long data0, long data1,
     ce.xclient.data.l[1] = data1;
     ce.xclient.data.l[2] = data2;
     ce.xclient.data.l[3] = data3;
-    XSendEvent(ob_display, ob_root, FALSE,
-	       SubstructureNotifyMask | SubstructureRedirectMask, &ce);
+    XSendEvent(ob_display, RootWindow(ob_display, ob_screen), FALSE,
+	       mask, &ce);
 }