X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprop.c;h=c2b0b40fba45f40c08602511577c73c406fa03d5;hb=76464a604ee2999b00b806be25722f7fcac1cd9c;hp=d13a0515c8bf581c50e28cb36cb2d57dcfb54f22;hpb=fefbf38726d60995462de8a94f3c361877b5c56c;p=chaz%2Fopenbox diff --git a/openbox/prop.c b/openbox/prop.c index d13a0515..c2b0b40f 100644 --- a/openbox/prop.c +++ b/openbox/prop.c @@ -27,7 +27,7 @@ Atoms prop_atoms; #define CREATE(var, name) (prop_atoms.var = \ XInternAtom(ob_display, name, FALSE)) -void prop_startup() +void prop_startup(void) { CREATE(cardinal, "CARDINAL"); CREATE(window, "WINDOW"); @@ -37,7 +37,7 @@ void prop_startup() CREATE(utf8, "UTF8_STRING"); CREATE(manager, "MANAGER"); - + CREATE(wm_colormap_windows, "WM_COLORMAP_WINDOWS"); CREATE(wm_protocols, "WM_PROTOCOLS"); CREATE(wm_state, "WM_STATE"); @@ -49,6 +49,8 @@ void prop_startup() CREATE(wm_class, "WM_CLASS"); CREATE(wm_window_role, "WM_WINDOW_ROLE"); CREATE(wm_client_machine, "WM_CLIENT_MACHINE"); + CREATE(wm_command, "WM_COMMAND"); + CREATE(wm_client_leader, "WM_CLIENT_LEADER"); CREATE(motif_wm_hints, "_MOTIF_WM_HINTS"); CREATE(sm_client_id, "SM_CLIENT_ID"); @@ -64,6 +66,7 @@ void prop_startup() CREATE(net_current_desktop, "_NET_CURRENT_DESKTOP"); CREATE(net_desktop_names, "_NET_DESKTOP_NAMES"); CREATE(net_active_window, "_NET_ACTIVE_WINDOW"); +/* CREATE(net_restack_window, "_NET_RESTACK_WINDOW");*/ CREATE(net_workarea, "_NET_WORKAREA"); CREATE(net_supporting_wm_check, "_NET_SUPPORTING_WM_CHECK"); CREATE(net_desktop_layout, "_NET_DESKTOP_LAYOUT"); @@ -72,6 +75,8 @@ 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_request_frame_extents, "_NET_REQUEST_FRAME_EXTENTS"); + CREATE(net_restack_window, "_NET_RESTACK_WINDOW"); CREATE(net_startup_id, "_NET_STARTUP_ID"); @@ -85,12 +90,15 @@ void prop_startup() 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_icon_geometry, "_NET_WM_ICON_GEOMETRY"); + 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_wm_user_time_window, "_NET_WM_USER_TIME_WINDOW"); */ + CREATE(kde_net_wm_frame_strut, "_KDE_NET_WM_FRAME_STRUT"); CREATE(net_frame_extents, "_NET_FRAME_EXTENTS"); -/* CREATE(net_wm_ping, "_NET_WM_PING"); */ + CREATE(net_wm_ping, "_NET_WM_PING"); #ifdef SYNC CREATE(net_wm_sync_request, "_NET_WM_SYNC_REQUEST"); CREATE(net_wm_sync_request_counter, "_NET_WM_SYNC_REQUEST_COUNTER"); @@ -127,8 +135,11 @@ void prop_startup() CREATE(net_wm_action_fullscreen, "_NET_WM_ACTION_FULLSCREEN"); CREATE(net_wm_action_change_desktop, "_NET_WM_ACTION_CHANGE_DESKTOP"); CREATE(net_wm_action_close, "_NET_WM_ACTION_CLOSE"); + CREATE(net_wm_action_above, "_NET_WM_ACTION_ABOVE"); + CREATE(net_wm_action_below, "_NET_WM_ACTION_BELOW"); + CREATE(net_wm_state_modal, "_NET_WM_STATE_MODAL"); - CREATE(net_wm_state_sticky, "_NET_WM_STATE_STICKY"); +/* CREATE(net_wm_state_sticky, "_NET_WM_STATE_STICKY");*/ CREATE(net_wm_state_maximized_vert, "_NET_WM_STATE_MAXIMIZED_VERT"); CREATE(net_wm_state_maximized_horz, "_NET_WM_STATE_MAXIMIZED_HORZ"); CREATE(net_wm_state_shaded, "_NET_WM_STATE_SHADED"); @@ -139,7 +150,7 @@ void prop_startup() 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; prop_atoms.net_wm_state_toggle = 2; @@ -154,11 +165,15 @@ void prop_startup() CREATE(kde_wm_change_state, "_KDE_WM_CHANGE_STATE"); CREATE(kde_net_wm_window_type_override,"_KDE_NET_WM_WINDOW_TYPE_OVERRIDE"); +/* CREATE(rootpmapid, "_XROOTPMAP_ID"); CREATE(esetrootid, "ESETROOT_PMAP_ID"); +*/ CREATE(openbox_pid, "_OPENBOX_PID"); - CREATE(openbox_rc, "_OPENBOX_RC"); + CREATE(ob_theme, "_OB_THEME"); + CREATE(ob_config_file, "_OB_CONFIG_FILE"); + CREATE(ob_wm_action_undecorate, "_OB_WM_ACTION_UNDECORATE"); CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED"); CREATE(ob_control, "_OB_CONTROL"); } @@ -302,8 +317,7 @@ gboolean prop_get_string_locale(Window win, Atom prop, gchar **ret) gchar *s; if (get_stringlist(win, prop, &list, &nstr) && nstr) { - s = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1", - NULL, NULL, NULL); + s = g_locale_to_utf8(list[0], -1, NULL, NULL, NULL); XFreeStringList(list); if (s) { *ret = s; @@ -322,7 +336,7 @@ gboolean prop_get_strings_locale(Window win, Atom prop, gchar ***ret) if (get_all(win, prop, prop_atoms.string, 8, (guchar**)&raw, &num)) { p = raw; - while (p < raw + num - 1) { + while (p < raw + num) { ++count; strs = g_slist_append(strs, p); p += strlen(p) + 1; /* next string */ @@ -332,8 +346,7 @@ gboolean prop_get_strings_locale(Window win, Atom prop, gchar ***ret) (*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); + (*ret)[i] = g_locale_to_utf8(it->data, -1, NULL, NULL, NULL); /* make sure translation did not fail */ if (!(*ret)[i]) (*ret)[i] = g_strdup(""); @@ -350,7 +363,7 @@ gboolean prop_get_string_utf8(Window win, Atom prop, gchar **ret) gchar *raw; gchar *str; 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); @@ -372,7 +385,7 @@ gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret) if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) { p = raw; - while (p < raw + num - 1) { + while (p < raw + num) { ++count; strs = g_slist_append(strs, p); p += strlen(p) + 1; /* next string */ @@ -434,6 +447,14 @@ void prop_erase(Window win, Atom prop) void prop_message(Window about, Atom messagetype, glong data0, glong data1, glong data2, glong data3, glong mask) +{ + prop_message_to(RootWindow(ob_display, ob_screen), about, messagetype, + data0, data1, data2, data3, 0, mask); +} + +void prop_message_to(Window to, Window about, Atom messagetype, + glong data0, glong data1, glong data2, + glong data3, glong data4, glong mask) { XEvent ce; ce.xclient.type = ClientMessage; @@ -445,6 +466,6 @@ void prop_message(Window about, Atom messagetype, glong data0, glong data1, ce.xclient.data.l[1] = data1; ce.xclient.data.l[2] = data2; ce.xclient.data.l[3] = data3; - XSendEvent(ob_display, RootWindow(ob_display, ob_screen), FALSE, - mask, &ce); + ce.xclient.data.l[4] = data4; + XSendEvent(ob_display, to, FALSE, mask, &ce); }