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) {
XDeleteProperty(ob_display, win, 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)
{
XEvent ce;
ce.xclient.type = ClientMessage;