all repos — openbox @ a92c209fc1845cf3f3acdfa3f9e8f0930fd53eb3

openbox fork - make it a bit more like ryudo

Merge branch 'backport' into work
Mikael Magnusson mikachu@gmail.com
commit

a92c209fc1845cf3f3acdfa3f9e8f0930fd53eb3

parent

b89cc5859068fd5543dc9e7da3f469fb0c0a7a1c

5 files changed, 46 insertions(+), 36 deletions(-)

jump to
M data/xsession/openbox-session.indata/xsession/openbox-session.in

@@ -7,7 +7,7 @@ echo "See the openbox-session(1) manpage for help."

exit fi -AUTOSTART="$HOME/.config/openbox/autostart.sh" +AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh" GLOBALAUTOSTART="@configdir@/openbox/autostart.sh" if test -e $AUTOSTART; then
M openbox/client.copenbox/client.c

@@ -80,7 +80,6 @@ static void client_get_area(ObClient *self);

static void client_get_desktop(ObClient *self); static void client_get_state(ObClient *self); static void client_get_shaped(ObClient *self); -static void client_get_mwm_hints(ObClient *self); static void client_get_colormap(ObClient *self); static void client_set_desktop_recursive(ObClient *self, guint target,

@@ -1409,7 +1408,7 @@ client_direct_parent(c));

} } -static void client_get_mwm_hints(ObClient *self) +void client_get_mwm_hints(ObClient *self) { guint num; guint32 *hints;
M openbox/client.hopenbox/client.h

@@ -632,6 +632,8 @@ void client_setup_decor_and_functions(ObClient *self, gboolean reconfig);

/*! Sets the window's type and transient flag */ void client_get_type_and_transientness(ObClient *self); +/*! Gets the motif wm hints */ +void client_get_mwm_hints(ObClient *self); /*! Returns a client's icon set, or its parents (recursively) if it doesn't have one
M openbox/event.copenbox/event.c

@@ -1526,6 +1526,13 @@ /* make sure the client's sizes are within its bounds, but only

reconfigure the window if it needs to. emacs will update its normal hints every time it receives a conigurenotify */ client_reconfigure(client, FALSE); + } else if (msgtype == OBT_PROP_ATOM(MOTIF_WM_HINTS)) { + client_get_mwm_hints(client); + /* This can override some mwm hints */ + client_get_type_and_transientness(client); + + /* Apply the changes to the window */ + client_setup_decor_and_functions(client, TRUE); } else if (msgtype == XA_WM_HINTS) { client_update_wmhints(client); } else if (msgtype == XA_WM_TRANSIENT_FOR) {
M po/sk.popo/sk.po

@@ -2,18 +2,20 @@ # Translation of openbox.pot to Slovak.

# Copyright (C) 2006 Mikael Magnusson # This file is distributed under the same license as the Openbox 3 package. # Jozef Říha <jose1711@gmail.com>, 2006, 2007. +# František Eliáš <elias.frantisek@gmail.com>, 2009. # msgid "" msgstr "" -"Project-Id-Version: Openbox-3.4.3\n" +"Project-Id-Version: Openbox-3.4.8\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" -"PO-Revision-Date: 2007-12-7 13:43Central Europe Daylight Time\n" -"Last-Translator: Jozef Riha <jose1711@gmail.com\n" +"POT-Creation-Date: 2009-07-16 21:05+0200\n" +"PO-Revision-Date: 2009-07-16 17:30+0200\n" +"Last-Translator: Frantisek Elias <elias.frantisek@gmail.com>\n" "Language-Team: Slovak <sk@sk.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" #: openbox/actions.c:149 #, c-format

@@ -22,15 +24,15 @@ msgstr "Vyžiadaná neplatná akcia \"%s\". Takáto akcia neexistuje."

#: openbox/actions/execute.c:128 msgid "No" -msgstr "" +msgstr "Nie" #: openbox/actions/execute.c:129 msgid "Yes" -msgstr "" +msgstr "Áno" #: openbox/actions/execute.c:133 msgid "Execute" -msgstr "" +msgstr "Spustiť" #: openbox/actions/execute.c:142 #, c-format

@@ -38,21 +40,21 @@ msgid "Failed to convert the path \"%s\" from utf8"

msgstr "Nepodarilo sa skonvertovať cestu \"%s\" z utf8" #: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/client.c:3466 msgid "Cancel" -msgstr "" +msgstr "Zrušiť" #: openbox/actions/exit.c:53 msgid "Exit" -msgstr "" +msgstr "Ukončiť" #: openbox/actions/exit.c:56 msgid "Are you sure you want to exit Openbox?" -msgstr "" +msgstr "Určite chcete ukončiť Openbox?" #: openbox/actions/exit.c:57 msgid "Exit Openbox" -msgstr "" +msgstr "Ukončiť Openbox" #. TRANSLATORS: Don't translate the word "SessionLogout" as it's the #. name of the action you write in rc.xml

@@ -64,45 +66,45 @@ msgstr ""

#: openbox/actions/session.c:65 openbox/actions/session.c:70 msgid "Log Out" -msgstr "" +msgstr "Odhlásiť sa" #: openbox/actions/session.c:69 msgid "Are you sure you want to log out?" -msgstr "" +msgstr "Naozaj sa chcete odhlásiť?" -#: openbox/client.c:2012 +#: openbox/client.c:2013 msgid "Unnamed Window" -msgstr "" +msgstr "Nepomenované okno" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2027 openbox/client.c:2059 msgid "Killing..." -msgstr "" +msgstr "Ukončujem proces..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2029 openbox/client.c:2061 msgid "Not Responding" -msgstr "" +msgstr "Neodpovedá" -#: openbox/client.c:3454 +#: openbox/client.c:3455 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "" -#: openbox/client.c:3456 +#: openbox/client.c:3457 msgid "End Process" -msgstr "" +msgstr "Ukončiť proces" -#: openbox/client.c:3460 +#: openbox/client.c:3461 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" -msgstr "" +msgstr "Zdá sa, že okno \"%s\" neodpovedá. Chcete ho odpojiť z X serveru?" -#: openbox/client.c:3462 +#: openbox/client.c:3463 msgid "Disconnect" -msgstr "" +msgstr "Odpojiť" #: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 msgid "Go there..."

@@ -188,7 +190,7 @@ #: openbox/client_menu.c:415

msgid "_Close" msgstr "Z_avrieť" -#: openbox/config.c:781 +#: openbox/config.c:782 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Neplatné tlačidlo \"%s\" špecifikované v konfiguračnom súbore"

@@ -217,7 +219,7 @@ #, c-format

msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Pokus o sprístupnenie menu \"%s\", ale to neexistuje" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:370 openbox/menu.c:371 msgid "More..." msgstr "Viac..."

@@ -379,7 +381,7 @@ "Prosim hlaste chyby na %s\n"

#: openbox/openbox.c:617 msgid "--config-file requires an argument\n" -msgstr "" +msgstr "--config-file vyzaduje parameter\n" #: openbox/openbox.c:660 #, c-format

@@ -405,7 +407,7 @@ #. TRANSLATORS: If you need to specify a different order of the

#. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:419 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. "

@@ -416,7 +418,7 @@ "Overriding the Openbox configuration."

msgstr[0] "" msgstr[1] "" -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "plocha %i"

@@ -472,7 +474,7 @@ msgstr "Chyba X: %s"

#: openbox/prompt.c:200 msgid "OK" -msgstr "" +msgstr "OK" #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Nepodarilo sa spustiť \"%s\": %s"