add the _NET_WM_USER_TIME property support. When focus_new is enabled, don't focus...

[chaz/openbox] / openbox / prop.c

diff --git a/openbox/prop.c b/openbox/prop.c
index 69fa4b801a80a83c356318b01a1c47a2a909920a..686404d43889986851d8ceb1c88f6a58b37e91d4 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    prop.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -83,6 +84,8 @@ void prop_startup()
     CREATE(net_wm_icon, "_NET_WM_ICON");
 /*   CREATE(net_wm_pid, "_NET_WM_PID"); */
     CREATE(net_wm_allowed_actions, "_NET_WM_ALLOWED_ACTIONS");
+    CREATE(net_wm_user_time, "_NET_WM_USER_TIME");
+    CREATE(net_frame_extents, "_NET_FRAME_EXTENTS");
 
 /*   CREATE(net_wm_ping, "_NET_WM_PING"); */
   
@@ -128,6 +131,7 @@ void prop_startup()
     CREATE(net_wm_state_fullscreen, "_NET_WM_STATE_FULLSCREEN");
     CREATE(net_wm_state_above, "_NET_WM_STATE_ABOVE");
     CREATE(net_wm_state_below, "_NET_WM_STATE_BELOW");
+    CREATE(net_wm_state_demands_attention, "_NET_WM_STATE_DEMANDS_ATTENTION");
   
     prop_atoms.net_wm_state_add = 1;
     prop_atoms.net_wm_state_remove = 0;
@@ -140,17 +144,15 @@ void prop_startup()
     prop_atoms.net_wm_bottomright = 2;
     prop_atoms.net_wm_bottomleft = 3;
 
-    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");
-  
     CREATE(rootpmapid, "_XROOTPMAP_ID");
     CREATE(esetrootid, "ESETROOT_PMAP_ID");
 
     CREATE(openbox_pid, "_OPENBOX_PID");
     CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
+    CREATE(ob_control, "_OB_CONTROL");
 }
 
 #include <X11/Xutil.h>
@@ -170,14 +172,14 @@ static gboolean get(Window win, Atom prop, Atom type, gint size,
     glong num32 = 32 / size * num; /\* num in 32-bit elements *\/
 
     res = XGetWindowProperty(display, win, prop, 0l, num32,
-                            FALSE, type, &ret_type, &ret_size,
-                            &ret_items, &bytes_left, &xdata);
+                             FALSE, type, &ret_type, &ret_size,
+                             &ret_items, &bytes_left, &xdata);
     if (res == Success && ret_items && xdata) {
-       if (ret_size == size && ret_items >= num) {
-           *data = g_memdup(xdata, num * (size / 8));
-           ret = TRUE;
-       }
-       XFree(xdata);
+        if (ret_size == size && ret_items >= num) {
+            *data = g_memdup(xdata, num * (size / 8));
+            ret = TRUE;
+        }
+        XFree(xdata);
     }
     return ret;
 }
@@ -195,28 +197,28 @@ static gboolean get_prealloc(Window win, Atom prop, Atom type, gint size,
     glong num32 = 32 / size * num; /* num in 32-bit elements */
 
     res = XGetWindowProperty(ob_display, win, prop, 0l, num32,
-                            FALSE, type, &ret_type, &ret_size,
-                            &ret_items, &bytes_left, &xdata);
+                             FALSE, type, &ret_type, &ret_size,
+                             &ret_items, &bytes_left, &xdata);
     if (res == Success && ret_items && xdata) {
-       if (ret_size == size && ret_items >= num) {
-           guint i;
-           for (i = 0; i < num; ++i)
-               switch (size) {
-               case 8:
-                   data[i] = xdata[i];
-                   break;
-               case 16:
-                   ((guint16*)data)[i] = ((guint16*)xdata)[i];
-                   break;
-               case 32:
-                   ((guint32*)data)[i] = ((gulong*)xdata)[i];
-                   break;
-               default:
-                   g_assert_not_reached(); /* unhandled size */
-               }
-           ret = TRUE;
-       }
-       XFree(xdata);
+        if (ret_size == size && ret_items >= num) {
+            guint i;
+            for (i = 0; i < num; ++i)
+                switch (size) {
+                case 8:
+                    data[i] = xdata[i];
+                    break;
+                case 16:
+                    ((guint16*)data)[i] = ((gushort*)xdata)[i];
+                    break;
+                case 32:
+                    ((guint32*)data)[i] = ((gulong*)xdata)[i];
+                    break;
+                default:
+                    g_assert_not_reached(); /* unhandled size */
+                }
+            ret = TRUE;
+        }
+        XFree(xdata);
     }
     return ret;
 }
@@ -232,31 +234,31 @@ static gboolean get_all(Window win, Atom prop, Atom type, gint size,
     gulong ret_items, bytes_left;
 
     res = XGetWindowProperty(ob_display, win, prop, 0l, G_MAXLONG,
-                            FALSE, type, &ret_type, &ret_size,
-                            &ret_items, &bytes_left, &xdata);
+                             FALSE, type, &ret_type, &ret_size,
+                             &ret_items, &bytes_left, &xdata);
     if (res == Success) {
-       if (ret_size == size && ret_items > 0) {
-           guint i;
-
-           *data = g_malloc(ret_items * (size / 8));
-           for (i = 0; i < ret_items; ++i)
-               switch (size) {
-               case 8:
-                   (*data)[i] = xdata[i];
-                   break;
-               case 16:
-                   ((guint16*)*data)[i] = ((guint16*)xdata)[i];
-                   break;
-               case 32:
-                   ((guint32*)*data)[i] = ((gulong*)xdata)[i];
-                   break;
-               default:
-                   g_assert_not_reached(); /* unhandled size */
-               }
-           *num = ret_items;
-           ret = TRUE;
-       }
-       XFree(xdata);
+        if (ret_size == size && ret_items > 0) {
+            guint i;
+
+            *data = g_malloc(ret_items * (size / 8));
+            for (i = 0; i < ret_items; ++i)
+                switch (size) {
+                case 8:
+                    (*data)[i] = xdata[i];
+                    break;
+                case 16:
+                    ((guint16*)*data)[i] = ((gushort*)xdata)[i];
+                    break;
+                case 32:
+                    ((guint32*)*data)[i] = ((gulong*)xdata)[i];
+                    break;
+                default:
+                    g_assert_not_reached(); /* unhandled size */
+                }
+            *num = ret_items;
+            ret = TRUE;
+        }
+        XFree(xdata);
     }
     return ret;
 }
@@ -328,9 +330,9 @@ gboolean prop_get_strings_locale(Window win, Atom prop, gchar ***ret)
             if (!(*ret)[i])
                 (*ret)[i] = g_strdup("");
         }
-       g_free(raw);
+        g_free(raw);
         g_slist_free(strs);
-       return TRUE;
+        return TRUE;
     }
     return FALSE;
 }
@@ -342,8 +344,8 @@ gboolean prop_get_string_utf8(Window win, Atom prop, gchar **ret)
     guint num;
      
     if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) {
-       str = g_strndup(raw, num); /* grab the first string from the list */
-       g_free(raw);
+        str = g_strndup(raw, num); /* grab the first string from the list */
+        g_free(raw);
         if (g_utf8_validate(str, -1, NULL)) {
             *ret = str;
             return TRUE;
@@ -376,20 +378,20 @@ gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret)
             else
                 (*ret)[i] = g_strdup("");
         }
-       g_free(raw);
+        g_free(raw);
         g_slist_free(strs);
-       return TRUE;
+        return TRUE;
     }
     return FALSE;
 }
 
-void prop_set32(Window win, Atom prop, Atom type, guint32 val)
+void prop_set32(Window win, Atom prop, Atom type, gulong val)
 {
     XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace,
                     (guchar*)&val, 1);
 }
 
-void prop_set_array32(Window win, Atom prop, Atom type, guint32 *val,
+void prop_set_array32(Window win, Atom prop, Atom type, gulong *val,
                       guint num)
 {
     XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace,
@@ -423,7 +425,7 @@ void prop_erase(Window win, Atom prop)
 }
 
 void prop_message(Window about, Atom messagetype, glong data0, glong data1,
-                 glong data2, glong data3, glong mask)
+                  glong data2, glong data3, glong mask)
 {
     XEvent ce;
     ce.xclient.type = ClientMessage;
@@ -436,5 +438,5 @@ void prop_message(Window about, Atom messagetype, glong data0, glong data1,
     ce.xclient.data.l[2] = data2;
     ce.xclient.data.l[3] = data3;
     XSendEvent(ob_display, RootWindow(ob_display, ob_screen), FALSE,
-              mask, &ce);
+               mask, &ce);
 }