From c00e5e5fa1f9a15212d5d8aba09b0ae95c69119b Mon Sep 17 00:00:00 2001 From: Ryoichiro Suzuki Date: Tue, 4 Mar 2008 16:33:43 +0100 Subject: [PATCH 1/8] Update japanese translation. --- po/ja.po | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/po/ja.po b/po/ja.po index 876d117c..56203866 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Openbox 3.4.6.1\n" +"Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-03-03 02:10+0100\n" -"PO-Revision-Date: 2008-03-02 17:18+0100\n" +"POT-Creation-Date: 2008-03-04 16:31+0100\n" +"PO-Revision-Date: 2008-03-04 16:32+0100\n" "Last-Translator: Ryoichiro Suzuki \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "はい" #: openbox/actions/execute.c:133 msgid "Execute" -msgstr "" +msgstr "実行する" #: openbox/actions/execute.c:142 #, c-format @@ -55,21 +55,23 @@ msgstr "Openbox を終了してもよろしいですか？" #: openbox/actions/exit.c:57 msgid "Exit Openbox" -msgstr "" +msgstr "Openbox を終了する" #: openbox/actions/session.c:41 msgid "" "The SessionLogout action is not available since Openbox was built without " "session management support" msgstr "" +"Openbox がセッション管理の機能なしに作られたので SessionLogout アクションは利" +"用できません。" #: openbox/actions/session.c:63 openbox/actions/session.c:68 msgid "Log Out" -msgstr "" +msgstr "ログアウト" #: openbox/actions/session.c:67 msgid "Are you sure you want to log out?" -msgstr "" +msgstr "ログアウトしてもよろしいですか？" #: openbox/client.c:2004 msgid "Unnamed Window" @@ -269,10 +271,13 @@ msgid "" "configuration files. See stdout for more information. The last error seen " "was in file \"%s\" line %d, with message: %s" msgstr "" +"Openbox の設定ファイルを解析中に XML の構文エラーが見つかりました。詳しい情報" +"は標準出力を見て下さい。最後に見つかったエラーは\"%s\"ファイルの%d 行目で、説" +"明はこうです：%s" #: openbox/openbox.c:382 msgid "Openbox Syntax Error" -msgstr "" +msgstr "Openbox 構文エラー" #: openbox/openbox.c:382 msgid "Close" @@ -328,7 +333,7 @@ msgid "" "Passing messages to a running Openbox instance:\n" msgstr "" "\n" -"実行中の Openbox にメッセージを送ります:\n" +"実行中の Openbox に命令を送ります:\n" #: openbox/openbox.c:543 msgid " --reconfigure Reload Openbox's configuration\n" @@ -423,19 +428,19 @@ msgstr "デスクトップ%i" msgid "Unable to make directory \"%s\": %s" msgstr "ディレクトリ\"%s\"を作れません: %s" -#: openbox/session.c:452 +#: openbox/session.c:467 #, c-format msgid "Unable to save the session to \"%s\": %s" msgstr "セッションを\"%s\"に保存できません: %s" -#: openbox/session.c:584 +#: openbox/session.c:599 #, c-format msgid "Error while saving the session to \"%s\": %s" msgstr "セッションを\"%s\"に保存中にエラーが起きました: %s" -#: openbox/session.c:821 +#: openbox/session.c:836 msgid "Not connected to a session manager" -msgstr "" +msgstr "セッションマネージャに接続されていません。" #: openbox/startupnotify.c:243 #, c-format From c150f557ce36d68edb3704babd90c41d9a279a61 Mon Sep 17 00:00:00 2001 From: Og Maciel Date: Tue, 4 Mar 2008 22:22:46 +0100 Subject: [PATCH 2/8] Update brazilian portuguese translation. --- po/pt_BR.po | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 47d4a435..7fa48579 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Openbox 3.4.6.1\n" +"Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-03-03 02:10+0100\n" -"PO-Revision-Date: 2008-02-28 17:26-0500\n" +"POT-Creation-Date: 2008-03-04 22:06+0100\n" +"PO-Revision-Date: 2008-03-04 16:07-0500\n" "Last-Translator: Og Maciel \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgstr "Sim" #: openbox/actions/execute.c:133 msgid "Execute" -msgstr "" +msgstr "Executar" #: openbox/actions/execute.c:142 #, c-format @@ -54,21 +54,23 @@ msgstr "Você tem certeza que deseja sair do Openbox?" #: openbox/actions/exit.c:57 msgid "Exit Openbox" -msgstr "" +msgstr "Sair do Openbox" #: openbox/actions/session.c:41 msgid "" "The SessionLogout action is not available since Openbox was built without " "session management support" msgstr "" +"A ação SessionLogout não está disponível já que o Openbox foi compilado sem " +"suporte de gerenciamento de sessões" #: openbox/actions/session.c:63 openbox/actions/session.c:68 msgid "Log Out" -msgstr "" +msgstr "Sair" #: openbox/actions/session.c:67 msgid "Are you sure you want to log out?" -msgstr "" +msgstr "Você tem certeza que deseja sair?" #: openbox/client.c:2004 msgid "Unnamed Window" @@ -273,10 +275,13 @@ msgid "" "configuration files. See stdout for more information. The last error seen " "was in file \"%s\" line %d, with message: %s" msgstr "" +"Um ou mais erros de sintaxe de XML foram encontrados ao analisar os arquivos " +"de configuração do Openbox. Veja a saída padrão para mais informação. O " +"último erro relatado foi no arquivo \"%s\" linha %d, com a mensagem: %s" #: openbox/openbox.c:382 msgid "Openbox Syntax Error" -msgstr "" +msgstr "Erro de Sintaxe do Openbox" #: openbox/openbox.c:382 msgid "Close" @@ -434,19 +439,19 @@ msgstr "área de trabalho %i" msgid "Unable to make directory \"%s\": %s" msgstr "Não foi possível criar o diretório \"%s\": %s" -#: openbox/session.c:452 +#: openbox/session.c:467 #, c-format msgid "Unable to save the session to \"%s\": %s" msgstr "Não foi possível salvar a sessão em \"%s\": %s" -#: openbox/session.c:584 +#: openbox/session.c:599 #, c-format msgid "Error while saving the session to \"%s\": %s" msgstr "Erro enquanto salvando a sessão em \"%s\": %s" -#: openbox/session.c:821 +#: openbox/session.c:836 msgid "Not connected to a session manager" -msgstr "" +msgstr "Não está conectado à um gerente de sessões" #: openbox/startupnotify.c:243 #, c-format From e3530560f41aeff52acaf852f11ee7ae4ec07647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=AA=E4=BB=BB=E8=AB=AD?= Date: Wed, 5 Mar 2008 18:12:11 +0100 Subject: [PATCH 3/8] Update traditional chinese translation. --- po/zh_TW.po | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a0c1d089..8fc2569a 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Openbox 3.4.6.1\n" +"Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-03-03 02:10+0100\n" -"PO-Revision-Date: 2008-02-17 23:29+0800\n" +"POT-Creation-Date: 2008-03-05 18:10+0100\n" +"PO-Revision-Date: 2008-03-06 01:01+0800\n" "Last-Translator: 洪任諭 \n" "Language-Team: Chinese (traditional) \n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgstr "是" #: openbox/actions/execute.c:133 msgid "Execute" -msgstr "" +msgstr "執行" #: openbox/actions/execute.c:142 #, c-format @@ -42,37 +42,38 @@ msgstr "轉換路徑「%s」自 utf8 時失敗" #: openbox/actions/exit.c:52 openbox/actions/session.c:62 #: openbox/client.c:3460 msgid "Cancel" -msgstr "" +msgstr "取消" #: openbox/actions/exit.c:53 msgid "Exit" -msgstr "" +msgstr "離開" #: openbox/actions/exit.c:56 msgid "Are you sure you want to exit Openbox?" -msgstr "" +msgstr "你確定要離開 Openbox？" #: openbox/actions/exit.c:57 msgid "Exit Openbox" -msgstr "" +msgstr "離開 Openbox" #: openbox/actions/session.c:41 msgid "" "The SessionLogout action is not available since Openbox was built without " "session management support" msgstr "" +"SessionLogout 動作無法使用，因為 Openbox 在編譯時沒有使用作業階段管理支援" #: openbox/actions/session.c:63 openbox/actions/session.c:68 msgid "Log Out" -msgstr "" +msgstr "登出" #: openbox/actions/session.c:67 msgid "Are you sure you want to log out?" -msgstr "" +msgstr "你確定要登出嗎？" #: openbox/client.c:2004 msgid "Unnamed Window" -msgstr "" +msgstr "未命名視窗" #: openbox/client.c:2018 openbox/client.c:2050 msgid "Killing..." @@ -91,7 +92,7 @@ msgstr "視窗「%s」似乎已經停止回應。 你想送出 \"%s\" 訊息強 #: openbox/client.c:3451 msgid "End Process" -msgstr "" +msgstr "結束 Process" #: openbox/client.c:3455 #, c-format @@ -102,7 +103,7 @@ msgstr "視窗「%s」似乎已經停止回應。 你想從 X 伺服器將它 #: openbox/client.c:3457 msgid "Disconnect" -msgstr "" +msgstr "斷線" #: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 msgid "Go there..." @@ -267,10 +268,12 @@ msgid "" "configuration files. See stdout for more information. The last error seen " "was in file \"%s\" line %d, with message: %s" msgstr "" +"解析 Openbox 設定檔 XML 語法時發現一個或多個錯誤。 查看 stdout 以獲得更多資" +"訊。 最後一個發現的錯誤在檔案 \"%s\" 第 %d 行。訊息：%s" #: openbox/openbox.c:382 msgid "Openbox Syntax Error" -msgstr "" +msgstr "Openbox 語法錯誤" #: openbox/openbox.c:382 msgid "Close" @@ -420,19 +423,19 @@ msgstr "桌面 %i" msgid "Unable to make directory \"%s\": %s" msgstr "無法製作目錄「%s」：%s" -#: openbox/session.c:452 +#: openbox/session.c:467 #, c-format msgid "Unable to save the session to \"%s\": %s" msgstr "無法儲存執行階段到「%s」：%s" -#: openbox/session.c:584 +#: openbox/session.c:599 #, c-format msgid "Error while saving the session to \"%s\": %s" msgstr "當儲存執行階段「%s」時發生錯誤：%s" -#: openbox/session.c:821 +#: openbox/session.c:836 msgid "Not connected to a session manager" -msgstr "" +msgstr "沒有連接到作業階段管理員" #: openbox/startupnotify.c:243 #, c-format From 232cbb9eb7cc8580e5911b5cfff197408b7d8616 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 5 Mar 2008 20:12:45 +0100 Subject: [PATCH 4/8] Don't leak auto-scaled RGBA textures. --- render/image.c | 1 + 1 file changed, 1 insertion(+) diff --git a/render/image.c b/render/image.c index 6fbd8a8e..be3e46be 100644 --- a/render/image.c +++ b/render/image.c @@ -294,6 +294,7 @@ void RrImageDrawRGBA(RrPixel32 *target, RrTextureRGBA *rgba, DrawRGBA(target, target_w, target_h, scaled->data, scaled->width, scaled->height, rgba->alpha, area); + RrImagePicFree(scaled); } else DrawRGBA(target, target_w, target_h, From c4e55ad27e886c592fa033e63d83724fda636952 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 6 Mar 2008 02:34:27 -0500 Subject: [PATCH 5/8] ignore the gdm-control binary --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8397f121..38043304 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ po/remove-potcdate.sed *.gmo render/obrender-3.0.pc tools/gnome-panel-control/gnome-panel-control +tools/gdm-control/gdm-control version.h .libs .deps @@ -90,3 +91,4 @@ tests/title tests/urgent tests/usertimewin data/autostart.sh +<+ From 3606a4af6f75b5e35ce540bf083b776a097d096f Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 6 Mar 2008 02:35:26 -0500 Subject: [PATCH 6/8] when a window pops up a child, don't avoid focusing it because you were working in its parent window before this. that's probably what made the window appear in the first place --- openbox/client.c | 24 ++++++++++++++++++++++-- openbox/client.h | 12 +++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index 82976f6a..f55af2b8 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -495,7 +495,10 @@ void client_manage(Window window, ObPrompt *prompt) if (activate) { gboolean raise = FALSE; gboolean relative_focused = FALSE; + gboolean parent_focused = FALSE; + parent_focused = (focus_client != NULL && + client_search_focus_parent(self)); relative_focused = (focus_client != NULL && client_search_focus_tree_full(self) != NULL && client_search_focus_group_full(self) != NULL); @@ -534,7 +537,8 @@ void client_manage(Window window, ObPrompt *prompt) else if (focus_client) { /* If the user is working in another window right now, then don't steal focus */ - if (event_last_user_time && launch_time && + if (!parent_focused && + event_last_user_time && launch_time && event_time_after(event_last_user_time, launch_time) && event_last_user_time != launch_time && event_time_after(event_last_user_time, @@ -543,7 +547,8 @@ void client_manage(Window window, ObPrompt *prompt) activate = FALSE; ob_debug_type(OB_DEBUG_FOCUS, "Not focusing the window because the user is " - "working in another window\n"); + "working in another window that is not " + "its parent\n"); } /* If the new window is a transient (and its relatives aren't focused) */ @@ -4049,6 +4054,21 @@ ObClient *client_search_focus_parent(ObClient *self) return NULL; } +ObClient *client_search_focus_parent_full(ObClient *self) +{ + GSList *it; + ObClient *ret = NULL; + + for (it = self->parents; it; it = g_slist_next(it)) { + if (client_focused(it->data)) + ret = it->data; + else + ret = client_search_focus_parent_full(it->data); + if (ret) break; + } + return ret; +} + ObClient *client_search_parent(ObClient *self, ObClient *search) { GSList *it; diff --git a/openbox/client.h b/openbox/client.h index c2461cb9..a3d50b0e 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -643,12 +643,18 @@ RrImage* client_icon(ObClient *self); transient for */ gboolean client_has_parent(ObClient *self); -/*! Searches a client's direct parents for a focused window. The function does - not check for the passed client, only for *ONE LEVEL* of its parents. - If no focused parentt is found, NULL is returned. +/*! Searches a client's immediate parents for a focused window. The function + does not check for the passed client, only for *ONE LEVEL* of its parents. + If no focused parent is found, NULL is returned. */ ObClient *client_search_focus_parent(ObClient *self); +/*! Searches a client's parents for a focused window. The function + does not check for the passed client, but searches through all of its + parents. If no focused parent is found, NULL is returned. +*/ +ObClient *client_search_focus_parent_full(ObClient *self); + /*! Searches a client's transients for a focused window. The function does not check for the passed client, only for its transients. If no focused transient is found, NULL is returned. From 07f5240d8c6d4fc6d70d396c4205a42f87ee7a95 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 6 Mar 2008 02:43:32 -0500 Subject: [PATCH 7/8] fix the check for if a relative is focused on map --- openbox/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index f55af2b8..0bb1d11d 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -500,8 +500,8 @@ void client_manage(Window window, ObPrompt *prompt) parent_focused = (focus_client != NULL && client_search_focus_parent(self)); relative_focused = (focus_client != NULL && - client_search_focus_tree_full(self) != NULL && - client_search_focus_group_full(self) != NULL); + (client_search_focus_tree_full(self) != NULL || + client_search_focus_group_full(self) != NULL)); /* This is focus stealing prevention */ From ae0971659fdd41fc7e9ccb6ca2b2536f96c09061 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 6 Mar 2008 02:44:58 -0500 Subject: [PATCH 8/8] don't set variables twice --- openbox/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index 0bb1d11d..585379ec 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -494,8 +494,8 @@ void client_manage(Window window, ObPrompt *prompt) activate ? "yes" : "no"); if (activate) { gboolean raise = FALSE; - gboolean relative_focused = FALSE; - gboolean parent_focused = FALSE; + gboolean relative_focused; + gboolean parent_focused; parent_focused = (focus_client != NULL && client_search_focus_parent(self));