+/* -*- 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"
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");
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");
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");
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");
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");
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>
#include <string.h>
/* this just isn't used... and it also breaks on 64bit, watch out
-static gboolean get(Window win, Atom prop, Atom type, int size,
+static gboolean get(Window win, Atom prop, Atom type, gint size,
guchar **data, gulong num)
{
gboolean ret = FALSE;
- int res;
+ gint res;
guchar *xdata = NULL;
Atom ret_type;
- int ret_size;
+ gint ret_size;
gulong ret_items, bytes_left;
- long num32 = 32 / size * num; /\* num in 32-bit elements *\/
+ glong num32 = 32 / size * num; /\* num in 32-bit elements *\/
res = XGetWindowProperty(display, win, prop, 0l, num32,
FALSE, type, &ret_type, &ret_size,
}
*/
-static gboolean get_prealloc(Window win, Atom prop, Atom type, int size,
+static gboolean get_prealloc(Window win, Atom prop, Atom type, gint size,
guchar *data, gulong num)
{
gboolean ret = FALSE;
- int res;
+ gint res;
guchar *xdata = NULL;
Atom ret_type;
- int ret_size;
+ gint ret_size;
gulong ret_items, bytes_left;
- long num32 = 32 / size * num; /* num in 32-bit elements */
+ glong num32 = 32 / size * num; /* num in 32-bit elements */
res = XGetWindowProperty(ob_display, win, prop, 0l, num32,
FALSE, type, &ret_type, &ret_size,
return ret;
}
-static gboolean get_all(Window win, Atom prop, Atom type, int size,
+static gboolean get_all(Window win, Atom prop, Atom type, gint size,
guchar **data, guint *num)
{
gboolean ret = FALSE;
- int res;
+ gint res;
guchar *xdata = NULL;
Atom ret_type;
- int ret_size;
+ gint ret_size;
gulong ret_items, bytes_left;
res = XGetWindowProperty(ob_display, win, prop, 0l, G_MAXLONG,
return ret;
}
-static gboolean get_stringlist(Window win, Atom prop, char ***list, int *nstr)
+static gboolean get_stringlist(Window win, Atom prop, gchar ***list, gint *nstr)
{
XTextProperty tprop;
gboolean ret = FALSE;
return get_all(win, prop, type, 32, (guchar**)ret, nret);
}
-gboolean prop_get_string_locale(Window win, Atom prop, char **ret)
+gboolean prop_get_string_locale(Window win, Atom prop, gchar **ret)
{
- char **list;
- int nstr;
+ gchar **list;
+ gint nstr;
+ gchar *s;
if (get_stringlist(win, prop, &list, &nstr) && nstr) {
- *ret = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1",
- NULL, NULL, NULL);
+ s = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1",
+ NULL, NULL, NULL);
XFreeStringList(list);
- if (*ret) return TRUE;
+ if (s) {
+ *ret = s;
+ return TRUE;
+ }
}
return FALSE;
}
-gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret)
+gboolean prop_get_strings_locale(Window win, Atom prop, gchar ***ret)
{
GSList *strs = NULL, *it;
- char *raw, *p;
+ gchar *raw, *p;
guint num, i, count = 0;
if (get_all(win, prop, prop_atoms.string, 8, (guchar**)&raw, &num)) {
p += strlen(p) + 1; /* next string */
}
- *ret = g_new0(char*, count + 1);
+ *ret = g_new0(gchar*, count + 1);
(*ret)[count] = NULL; /* null terminated list */
for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) {
return FALSE;
}
-gboolean prop_get_string_utf8(Window win, Atom prop, char **ret)
+gboolean prop_get_string_utf8(Window win, Atom prop, gchar **ret)
{
- char *raw;
- char *str;
+ gchar *raw;
+ gchar *str;
guint num;
if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) {
return FALSE;
}
-gboolean prop_get_strings_utf8(Window win, Atom prop, char ***ret)
+gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret)
{
GSList *strs = NULL, *it;
- char *raw, *p;
+ gchar *raw, *p;
guint num, i, count = 0;
if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) {
p += strlen(p) + 1; /* next string */
}
- *ret = g_new0(char*, count + 1);
+ *ret = g_new0(gchar*, count + 1);
for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) {
if (g_utf8_validate(it->data, -1, NULL))
(guchar*)val, num);
}
-void prop_set_string_utf8(Window win, Atom prop, char *val)
+void prop_set_string_utf8(Window win, Atom prop, gchar *val)
{
XChangeProperty(ob_display, win, prop, prop_atoms.utf8, 8,
PropModeReplace, (guchar*)val, strlen(val));
}
-void prop_set_strings_utf8(Window win, Atom prop, char **strs)
+void prop_set_strings_utf8(Window win, Atom prop, gchar **strs)
{
GString *str;
- char **s;
+ gchar **s;
str = g_string_sized_new(0);
for (s = strs; *s; ++s) {
}
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)
XDeleteProperty(ob_display, win, prop);
}
-void prop_message(Window about, Atom messagetype, long data0, long data1,
- long data2, long data3)
+void prop_message(Window about, Atom messagetype, glong data0, glong data1,
+ glong data2, glong data3, glong mask)
{
XEvent ce;
ce.xclient.type = ClientMessage;
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);
}
projects / chaz / openbox / blobdiff