X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprop.c;h=69fa4b801a80a83c356318b01a1c47a2a909920a;hb=064901801e8ceb7b07dbd0d27b4fecd600f7c766;hp=a97b66dc3748fc5831790a6773bcb7397c722241;hpb=693c88ca35a19b50ee52860800bcb861c035f7da;p=chaz%2Fopenbox diff --git a/openbox/prop.c b/openbox/prop.c index a97b66dc..69fa4b80 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"); @@ -45,6 +67,9 @@ void prop_startup() CREATE(net_close_window, "_NET_CLOSE_WINDOW"); 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"); @@ -54,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"); @@ -69,15 +95,18 @@ void prop_startup() CREATE(net_wm_window_type_dialog, "_NET_WM_WINDOW_TYPE_DIALOG"); CREATE(net_wm_window_type_normal, "_NET_WM_WINDOW_TYPE_NORMAL"); - CREATE(net_wm_moveresize_size_topleft, "_NET_WM_MOVERESIZE_SIZE_TOPLEFT"); - CREATE(net_wm_moveresize_size_topright, - "_NET_WM_MOVERESIZE_SIZE_TOPRIGHT"); - CREATE(net_wm_moveresize_size_bottomleft, - "_NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT"); - CREATE(net_wm_moveresize_size_bottomright, - "_NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT"); - CREATE(net_wm_moveresize_move, "_NET_WM_MOVERESIZE_MOVE"); - + prop_atoms.net_wm_moveresize_size_topleft = 0; + prop_atoms.net_wm_moveresize_size_top = 1; + prop_atoms.net_wm_moveresize_size_topright = 2; + prop_atoms.net_wm_moveresize_size_right = 3; + prop_atoms.net_wm_moveresize_size_bottomright = 4; + prop_atoms.net_wm_moveresize_size_bottom = 5; + prop_atoms.net_wm_moveresize_size_bottomleft = 6; + prop_atoms.net_wm_moveresize_size_left = 7; + prop_atoms.net_wm_moveresize_move = 8; + prop_atoms.net_wm_moveresize_size_keyboard = 9; + prop_atoms.net_wm_moveresize_move_keyboard = 10; + CREATE(net_wm_action_move, "_NET_WM_ACTION_MOVE"); CREATE(net_wm_action_resize, "_NET_WM_ACTION_RESIZE"); CREATE(net_wm_action_minimize, "_NET_WM_ACTION_MINIMIZE"); @@ -111,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"); @@ -123,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 @@ -131,16 +158,16 @@ void prop_startup() #include /* 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, @@ -156,16 +183,16 @@ static gboolean get(Window win, Atom prop, Atom type, int 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, @@ -182,7 +209,7 @@ static gboolean get_prealloc(Window win, Atom prop, Atom type, int size, ((guint16*)data)[i] = ((guint16*)xdata)[i]; break; case 32: - ((guint32*)data)[i] = ((guint32*)xdata)[i]; + ((guint32*)data)[i] = ((gulong*)xdata)[i]; break; default: g_assert_not_reached(); /* unhandled size */ @@ -194,14 +221,14 @@ static gboolean get_prealloc(Window win, Atom prop, Atom type, int 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, @@ -221,7 +248,7 @@ static gboolean get_all(Window win, Atom prop, Atom type, int size, ((guint16*)*data)[i] = ((guint16*)xdata)[i]; break; case 32: - ((guint32*)*data)[i] = ((guint32*)xdata)[i]; + ((guint32*)*data)[i] = ((gulong*)xdata)[i]; break; default: g_assert_not_reached(); /* unhandled size */ @@ -234,7 +261,7 @@ static gboolean get_all(Window win, Atom prop, Atom type, int size, 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; @@ -258,73 +285,99 @@ gboolean prop_get_array32(Window win, Atom prop, Atom type, guint32 **ret, 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_locale_to_utf8(list[0], -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) { - char *raw, *p; - guint num, i; + GSList *strs = NULL, *it; + gchar *raw, *p; + guint num, i, count = 0; - if (get_all(win, prop, prop_atoms.string, 8, (guchar**)&raw, &num)){ - *ret = g_new(char*, num + 1); - (*ret)[num] = NULL; /* null terminated list */ + if (get_all(win, prop, prop_atoms.string, 8, (guchar**)&raw, &num)) { p = raw; - for (i = 0; i < num; ++i) { - (*ret)[i] = g_locale_to_utf8(p, -1, NULL, NULL, NULL); + while (p < raw + num - 1) { + ++count; + strs = g_slist_append(strs, p); + p += strlen(p) + 1; /* next string */ + } + + *ret = g_new0(gchar*, count + 1); + (*ret)[count] = NULL; /* null terminated list */ + + 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 */ - if (!(*ret)[i]) { - g_strfreev(*ret); /* free what we did so far */ - break; /* the force is not strong with us */ - } - p = strchr(p, '\0'); + if (!(*ret)[i]) + (*ret)[i] = g_strdup(""); } g_free(raw); - if (i == num) - return TRUE; + g_slist_free(strs); + return TRUE; } 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; + gchar *raw; + gchar *str; guint num; if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) { - *ret = g_strndup(raw, num); /* grab the first string from the list */ + str = g_strndup(raw, num); /* grab the first string from the list */ g_free(raw); - return TRUE; + if (g_utf8_validate(str, -1, NULL)) { + *ret = str; + return TRUE; + } + g_free(str); } return FALSE; } -gboolean prop_get_strings_utf8(Window win, Atom prop, char ***ret) +gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret) { - char *raw, *p; - guint num, i; + GSList *strs = NULL, *it; + gchar *raw, *p; + guint num, i, count = 0; if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) { - *ret = g_new(char*, num + 1); - (*ret)[num] = NULL; /* null terminated list */ p = raw; - for (i = 0; i < num; ++i) { - (*ret)[i] = g_strdup(p); - p = strchr(p, '\0'); + while (p < raw + num - 1) { + ++count; + strs = g_slist_append(strs, p); + p += strlen(p) + 1; /* next string */ + } + + *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)) + (*ret)[i] = g_strdup(it->data); + else + (*ret)[i] = g_strdup(""); } g_free(raw); + g_slist_free(strs); return TRUE; } return FALSE; @@ -343,24 +396,25 @@ void prop_set_array32(Window win, Atom prop, Atom type, guint32 *val, (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; - guint i; + gchar **s; str = g_string_sized_new(0); - for (i = 0; strs[i]; ++i) { - str = g_string_append(str, strs[i]); + for (s = strs; *s; ++s) { + str = g_string_append(str, *s); str = g_string_append_c(str, '\0'); } 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) @@ -368,8 +422,8 @@ 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; @@ -381,6 +435,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); }