From 9a448f54b52b32b81d52e86751dc71e38c9b375e Mon Sep 17 00:00:00 2001
From: gsm <406643764@qq.com>
Date: Sat, 28 Oct 2023 22:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=20=20=20=20=20=20=20=20*=20=E7=99=BC=E5=B8=83?=
=?UTF-8?q?=E7=AC=AC2.6.29=E7=89=88=EF=BC=9B=20=20=20=20=20=20=20=20=20*?=
=?UTF-8?q?=20=E4=BF=AE=E5=BE=A9=E7=84=A1=E6=B3=95=E8=AA=BF=E6=95=B4?=
=?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=B0=BA=E5=AF=B8=E7=9A=84=E7=BC=BA=E9=99=B7?=
=?UTF-8?q?=EF=BC=9B=20=20=20=20=20=20=20=20=20*=20=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E9=80=80=E5=87=BAgwm=E5=92=8C=E6=89=93=E9=96=8B=E9=81=8B?=
=?UTF-8?q?=E8=A1=8C=E8=BC=B8=E5=85=A5=E6=A1=86=E7=9A=84=E6=8C=89=E9=8D=B5?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=B6=81=E5=AE=9A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ChangeLog | 5 ++
NEWS | 4 ++
TODO | 3 +
man/en_GB/man1/gwm.1 | 10 ++-
man/zh_CN/man1/gwm.1 | 10 ++-
man/zh_HK/man1/gwm.1 | 10 ++-
po/en_GB/LC_MESSAGES/gwm.po | 118 ++++++++++++++++++------------------
po/zh_CN/LC_MESSAGES/gwm.po | 118 ++++++++++++++++++------------------
src/config.c | 2 +
src/hint.c | 2 +-
10 files changed, 160 insertions(+), 122 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0b0eb9d..440f461 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@
* 。
**************************************************************************/
+2023年 10月 28日 星期六 22:41:03 CST gsm <406643764@qq.com>
+ * 發布第2.6.29版；
+ * 修復無法調整窗口尺寸的缺陷；
+ * 增加退出gwm和打開運行輸入框的按鍵功能綁定。
+
2023年 10月 28日 星期六 19:29:39 CST gsm <406643764@qq.com>
* 發布第2.6.28版；
* 刪除全屏模式；
diff --git a/NEWS b/NEWS
index c1975aa..dd58e5a 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@
* 。
* ************************************************************************/
+第2.6.29版：
+ * 修復無法調整窗口尺寸的缺陷；
+ * 增加退出gwm和打開運行輸入框的按鍵功能綁定。
+
第2.6.28版：
* 刪除全屏模式；
* 響應窗口的全屏請求。
diff --git a/TODO b/TODO
index 822d9e0..b132f01 100644
--- a/TODO
+++ b/TODO
@@ -9,6 +9,9 @@
* 。
* ************************************************************************/
+第2.6.29版的下一步的開發計劃：
+ * 修改窗口聚焦算法，使之更符合ICCCM。
+
第2.6.28版的下一步的開發計劃：
* 修復無法調整窗口尺寸的缺陷。
diff --git a/man/en_GB/man1/gwm.1 b/man/en_GB/man1/gwm.1
index 64514f6..dcdc7b3 100644
--- a/man/en_GB/man1/gwm.1
+++ b/man/en_GB/man1/gwm.1
@@ -12,7 +12,7 @@
./" program. Otherwise, see .
./" ************************************************* ***************************/
-.TH gwm 1 October 2023 "gwm 2.6.28" gwm
+.TH gwm 1 October 2023 "gwm 2.6.29" gwm
.
.SH NAME
.B
@@ -274,6 +274,14 @@ Take full screen screenshots and save to file.
Take a screenshot of the current window and save it to file.
.
.TP
+.B Mod4+r
+Open run entry.
+.
+.TP
+.B Mod4+Delete
+Quit gwm. if you start gwm through startgwm, gwm will be reopened，which equal to refresh gwm。
+.
+.TP
.B Mod4+Shift+number N key
Switch to the Nth virtual desktop.
.
diff --git a/man/zh_CN/man1/gwm.1 b/man/zh_CN/man1/gwm.1
index ff5f1f8..7678c22 100644
--- a/man/zh_CN/man1/gwm.1
+++ b/man/zh_CN/man1/gwm.1
@@ -9,7 +9,7 @@
./" 。
./" ************************************************************************/
-.TH gwm 1 2023年10月 "gwm 2.6.28" gwm
+.TH gwm 1 2023年10月 "gwm 2.6.29" gwm
.
.SH 名称
.B
@@ -268,6 +268,14 @@ gwm启动后会立即尝试执行~/.config/gwm/autostart.sh。
对当前窗口截图并保存到文件。
.
.TP
+.B Mod4+r
+打开运行输入框。
+.
+.TP
+.B Mod4+Delete
+退出gwm。若通过startgwm启动gwm的话，会重新打开gwm，相当于刷新gwm。
+.
+.TP
.B Mod4+Shift+数字N键
切换到第N个虚拟桌面。
.
diff --git a/man/zh_HK/man1/gwm.1 b/man/zh_HK/man1/gwm.1
index 8c9ba2c..efd5827 100644
--- a/man/zh_HK/man1/gwm.1
+++ b/man/zh_HK/man1/gwm.1
@@ -9,7 +9,7 @@
./" 。
./" ************************************************************************/
-.TH gwm 1 2023年10月 "gwm 2.6.28" gwm
+.TH gwm 1 2023年10月 "gwm 2.6.29" gwm
.
.SH 名稱
.B
@@ -271,6 +271,14 @@ gwm啓動後會立即嘗試執行~/.config/gwm/autostart.sh。
對當前窗口截圖並保存到文件。
.
.TP
+.B Mod4+r
+打開運行輸入框。
+.
+.TP
+.B Mod4+Delete
+退出gwm。若通過startgwm啓動gwm的話，會重新打開gwm，相當於刷新gwm。
+.
+.TP
.B Mod4+Shift+數字N鍵
切換到第N個虛擬桌面。
.
diff --git a/po/en_GB/LC_MESSAGES/gwm.po b/po/en_GB/LC_MESSAGES/gwm.po
index fdb1d34..cd9575a 100644
--- a/po/en_GB/LC_MESSAGES/gwm.po
+++ b/po/en_GB/LC_MESSAGES/gwm.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gwm 2.6.28\n"
+"Project-Id-Version: gwm 2.6.29\n"
"Report-Msgid-Bugs-To: 406643764@qq.com\n"
-"POT-Creation-Date: 2023-10-28 19:22+0800\n"
+"POT-Creation-Date: 2023-10-28 22:38+0800\n"
"PO-Revision-Date: 2023-05-05 11:26+0800\n"
"Last-Translator: gsm <406643764@qq.com>\n"
"Language-Team: English (British) <(nothing)>\n"
@@ -18,233 +18,233 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 操作中心按鈕類型 按鈕文字
-#: src/config.c:476
+#: src/config.c:478
msgid "幫助"
msgstr "Help"
-#: src/config.c:477
+#: src/config.c:479
msgid "文件"
msgstr "File"
-#: src/config.c:478
+#: src/config.c:480
msgid "終端模擬器"
msgstr "Terminal"
-#: src/config.c:479
+#: src/config.c:481
msgid "網絡瀏覽器"
msgstr "Web browser"
-#: src/config.c:481
+#: src/config.c:483
msgid "遊戲"
msgstr "Game"
-#: src/config.c:482
+#: src/config.c:484
msgid "播放影音"
msgstr "Start Play"
-#: src/config.c:483
+#: src/config.c:485
msgid "切換播放狀態"
msgstr "Toggle Play"
-#: src/config.c:484
+#: src/config.c:486
msgid "關閉影音"
msgstr "Quit Play"
-#: src/config.c:486
+#: src/config.c:488
msgid "减小音量"
msgstr "Volume down"
-#: src/config.c:487
+#: src/config.c:489
msgid "增大音量"
msgstr "Volume up"
-#: src/config.c:488
+#: src/config.c:490
msgid "最大音量"
msgstr "Volume max"
-#: src/config.c:489
+#: src/config.c:491
msgid "靜音切換"
msgstr "Mute toggle"
-#: src/config.c:491
+#: src/config.c:493
msgid "暫主區開窗"
msgstr "Main next"
-#: src/config.c:492
+#: src/config.c:494
msgid "暫次區開窗"
msgstr "Sec next"
-#: src/config.c:493
+#: src/config.c:495
msgid "暫固定區開窗"
msgstr "Fixed next"
-#: src/config.c:494
+#: src/config.c:496
msgid "暫懸浮層開窗"
msgstr "Float next"
-#: src/config.c:496
+#: src/config.c:498
msgid "增大主區容量"
msgstr "Main area n+"
-#: src/config.c:497
+#: src/config.c:499
msgid "减小主區容量"
msgstr "Main area n-"
-#: src/config.c:498
+#: src/config.c:500
msgid "開關當前窗口標題欄"
msgstr "Toggle cur win titlebar"
-#: src/config.c:499
+#: src/config.c:501
msgid "開關當前窗口邊框"
msgstr "Toggle cur win border"
-#: src/config.c:501
+#: src/config.c:503
msgid "關閉桌面所有窗口"
msgstr "Close all win on desktop"
-#: src/config.c:502
+#: src/config.c:504
msgid "當前窗口截圖"
msgstr "Cur win screenshot"
-#: src/config.c:503
+#: src/config.c:505
msgid "全屏截圖"
msgstr "Full screen screenshot"
-#: src/config.c:504
+#: src/config.c:506
msgid "切換聚焦模式"
msgstr "Toggle focus"
-#: src/config.c:506
+#: src/config.c:508
msgid "開關合成器"
msgstr "Toggle compositor"
-#: src/config.c:507
+#: src/config.c:509
msgid "切換壁紙"
msgstr "Switch wallpaper"
-#: src/config.c:508
+#: src/config.c:510
msgid "切換顏色主題"
msgstr "Switch color theme"
-#: src/config.c:509
+#: src/config.c:511
msgid "退出gwm"
msgstr "Quit gwm"
-#: src/config.c:511
+#: src/config.c:513
msgid "注銷"
msgstr "Logout"
-#: src/config.c:512
+#: src/config.c:514
msgid "重啓"
msgstr "Reboot"
-#: src/config.c:513
+#: src/config.c:515
msgid "關機"
msgstr "Shutdown"
-#: src/config.c:514
+#: src/config.c:516
msgid "運行"
msgstr "Run"
#. 客戶窗口菜單項類型 按鈕文字
-#: src/config.c:523
+#: src/config.c:525
msgid "卷起/放下"
msgstr "Roll up / Put down"
-#: src/config.c:524
+#: src/config.c:526
msgid "縱向最大化"
msgstr "Vertical max"
-#: src/config.c:525
+#: src/config.c:527
msgid "橫向最大化"
msgstr "Horizontal max"
-#: src/config.c:526
+#: src/config.c:528
msgid "最大化至上半屏"
msgstr "Max to top half screen"
-#: src/config.c:527
+#: src/config.c:529
msgid "最大化至下半屏"
msgstr "Max to bottom half screen"
-#: src/config.c:528
+#: src/config.c:530
msgid "最大化至左半屏"
msgstr "Max to left half screen"
-#: src/config.c:529
+#: src/config.c:531
msgid "最大化至右半屏"
msgstr "Max to right half screen"
-#: src/config.c:530
+#: src/config.c:532
msgid "完全最大化"
msgstr "fully max"
#. 構件類型 構件功能提示文字
-#: src/config.c:542
+#: src/config.c:544
msgid "切換到次要區域"
msgstr "To sec area"
-#: src/config.c:543
+#: src/config.c:545
msgid "切換到主要區域"
msgstr "To main area"
-#: src/config.c:544
+#: src/config.c:546
msgid "切換到固定區域"
msgstr "To fixed area"
-#: src/config.c:545
+#: src/config.c:547
msgid "切換到懸浮層"
msgstr "To float layer"
-#: src/config.c:546
+#: src/config.c:548
msgid "切換到圖符區域"
msgstr "To icon area"
-#: src/config.c:547
+#: src/config.c:549
msgid "最大化/還原窗口"
msgstr "Max/Restore window"
-#: src/config.c:548
+#: src/config.c:550
msgid "關閉窗口"
msgstr "Close window"
-#: src/config.c:549
+#: src/config.c:551
msgid "切換到虛擬桌面1"
msgstr "To virtual desktop 1"
-#: src/config.c:550
+#: src/config.c:552
msgid "切換到虛擬桌面2"
msgstr "To virtual desktop 2"
-#: src/config.c:551
+#: src/config.c:553
msgid "切換到虛擬桌面3"
msgstr "To virtual desktop 3"
-#: src/config.c:552
+#: src/config.c:554
msgid "切換到預覽模式"
msgstr "To preview mode"
-#: src/config.c:553
+#: src/config.c:555
msgid "切換到堆疊模式"
msgstr "To stacking mode"
-#: src/config.c:554
+#: src/config.c:556
msgid "切換到平鋪模式"
msgstr "To tiling mode"
-#: src/config.c:555
+#: src/config.c:557
msgid "顯示桌面"
msgstr "Show desktop"
-#: src/config.c:556
+#: src/config.c:558
msgid "打開操作中心"
msgstr "Open action center"
-#: src/config.c:557
+#: src/config.c:559
msgid "打開窗口菜單"
msgstr "Open window menu"
-#: src/config.c:587
+#: src/config.c:589
msgid "請輸入命令，然後按回車執行"
msgstr "Enter the command and press Enter to execute"
diff --git a/po/zh_CN/LC_MESSAGES/gwm.po b/po/zh_CN/LC_MESSAGES/gwm.po
index e9ad8f3..215e41a 100644
--- a/po/zh_CN/LC_MESSAGES/gwm.po
+++ b/po/zh_CN/LC_MESSAGES/gwm.po
@@ -6,9 +6,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gwm 2.6.28\n"
+"Project-Id-Version: gwm 2.6.29\n"
"Report-Msgid-Bugs-To: 406643764@qq.com\n"
-"POT-Creation-Date: 2023-10-28 19:22+0800\n"
+"POT-Creation-Date: 2023-10-28 22:38+0800\n"
"PO-Revision-Date: 2023-05-05 09:56+0800\n"
"Last-Translator: gsm <406643764@qq.com>\n"
"Language-Team: Chinese (simplified) \n"
@@ -18,233 +18,233 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 操作中心按鈕類型 按鈕文字
-#: src/config.c:476
+#: src/config.c:478
msgid "幫助"
msgstr "帮助"
-#: src/config.c:477
+#: src/config.c:479
msgid "文件"
msgstr "文件"
-#: src/config.c:478
+#: src/config.c:480
msgid "終端模擬器"
msgstr "终端模拟器"
-#: src/config.c:479
+#: src/config.c:481
msgid "網絡瀏覽器"
msgstr "网络浏览器"
-#: src/config.c:481
+#: src/config.c:483
msgid "遊戲"
msgstr "游戏"
-#: src/config.c:482
+#: src/config.c:484
msgid "播放影音"
msgstr "播放影音"
-#: src/config.c:483
+#: src/config.c:485
msgid "切換播放狀態"
msgstr "切换播放状态"
-#: src/config.c:484
+#: src/config.c:486
msgid "關閉影音"
msgstr "关闭影音"
-#: src/config.c:486
+#: src/config.c:488
msgid "减小音量"
msgstr "减小音量"
-#: src/config.c:487
+#: src/config.c:489
msgid "增大音量"
msgstr "增大音量"
-#: src/config.c:488
+#: src/config.c:490
msgid "最大音量"
msgstr "最大音量"
-#: src/config.c:489
+#: src/config.c:491
msgid "靜音切換"
msgstr "静音切换"
-#: src/config.c:491
+#: src/config.c:493
msgid "暫主區開窗"
msgstr "暂主区开窗"
-#: src/config.c:492
+#: src/config.c:494
msgid "暫次區開窗"
msgstr "暂次区开窗"
-#: src/config.c:493
+#: src/config.c:495
msgid "暫固定區開窗"
msgstr "暂固定区开窗"
-#: src/config.c:494
+#: src/config.c:496
msgid "暫懸浮層開窗"
msgstr "暂悬浮层开窗"
-#: src/config.c:496
+#: src/config.c:498
msgid "增大主區容量"
msgstr "增大主区容量"
-#: src/config.c:497
+#: src/config.c:499
msgid "减小主區容量"
msgstr "减小主区容量"
-#: src/config.c:498
+#: src/config.c:500
msgid "開關當前窗口標題欄"
msgstr "开关当前窗口标题栏"
-#: src/config.c:499
+#: src/config.c:501
msgid "開關當前窗口邊框"
msgstr "开关当前窗口边框"
-#: src/config.c:501
+#: src/config.c:503
msgid "關閉桌面所有窗口"
msgstr "关闭桌面所有窗口"
-#: src/config.c:502
+#: src/config.c:504
msgid "當前窗口截圖"
msgstr "当前窗口截图"
-#: src/config.c:503
+#: src/config.c:505
msgid "全屏截圖"
msgstr "全屏截图"
-#: src/config.c:504
+#: src/config.c:506
msgid "切換聚焦模式"
msgstr "切换聚焦模式"
-#: src/config.c:506
+#: src/config.c:508
msgid "開關合成器"
msgstr "开关合成器"
-#: src/config.c:507
+#: src/config.c:509
msgid "切換壁紙"
msgstr "切换壁纸"
-#: src/config.c:508
+#: src/config.c:510
msgid "切換顏色主題"
msgstr "切换颜色主题"
-#: src/config.c:509
+#: src/config.c:511
msgid "退出gwm"
msgstr "退出gwm"
-#: src/config.c:511
+#: src/config.c:513
msgid "注銷"
msgstr "注销"
-#: src/config.c:512
+#: src/config.c:514
msgid "重啓"
msgstr "重启"
-#: src/config.c:513
+#: src/config.c:515
msgid "關機"
msgstr "关机"
-#: src/config.c:514
+#: src/config.c:516
msgid "運行"
msgstr "运行"
#. 客戶窗口菜單項類型 按鈕文字
-#: src/config.c:523
+#: src/config.c:525
msgid "卷起/放下"
msgstr "卷起/放下"
-#: src/config.c:524
+#: src/config.c:526
msgid "縱向最大化"
msgstr "纵向最大化"
-#: src/config.c:525
+#: src/config.c:527
msgid "橫向最大化"
msgstr "横向最大化"
-#: src/config.c:526
+#: src/config.c:528
msgid "最大化至上半屏"
msgstr "最大化至上半屏"
-#: src/config.c:527
+#: src/config.c:529
msgid "最大化至下半屏"
msgstr "最大化至下半屏"
-#: src/config.c:528
+#: src/config.c:530
msgid "最大化至左半屏"
msgstr "最大化至左半屏"
-#: src/config.c:529
+#: src/config.c:531
msgid "最大化至右半屏"
msgstr "最大化至右半屏"
-#: src/config.c:530
+#: src/config.c:532
msgid "完全最大化"
msgstr "完全最大化"
#. 構件類型 構件功能提示文字
-#: src/config.c:542
+#: src/config.c:544
msgid "切換到次要區域"
msgstr "切换到次要区域"
-#: src/config.c:543
+#: src/config.c:545
msgid "切換到主要區域"
msgstr "切换到主要区域"
-#: src/config.c:544
+#: src/config.c:546
msgid "切換到固定區域"
msgstr "切换到固定区域"
-#: src/config.c:545
+#: src/config.c:547
msgid "切換到懸浮層"
msgstr "切换到悬浮层"
-#: src/config.c:546
+#: src/config.c:548
msgid "切換到圖符區域"
msgstr "切换到图符区域"
-#: src/config.c:547
+#: src/config.c:549
msgid "最大化/還原窗口"
msgstr "最大化/还原窗口"
-#: src/config.c:548
+#: src/config.c:550
msgid "關閉窗口"
msgstr "关闭窗口"
-#: src/config.c:549
+#: src/config.c:551
msgid "切換到虛擬桌面1"
msgstr "切换到虚拟桌面1"
-#: src/config.c:550
+#: src/config.c:552
msgid "切換到虛擬桌面2"
msgstr "切换到虚拟桌面2"
-#: src/config.c:551
+#: src/config.c:553
msgid "切換到虛擬桌面3"
msgstr "切换到虚拟桌面3"
-#: src/config.c:552
+#: src/config.c:554
msgid "切換到預覽模式"
msgstr "切换到预览模式"
-#: src/config.c:553
+#: src/config.c:555
msgid "切換到堆疊模式"
msgstr "切换到堆叠模式"
-#: src/config.c:554
+#: src/config.c:556
msgid "切換到平鋪模式"
msgstr "切换到平铺模式"
-#: src/config.c:555
+#: src/config.c:557
msgid "顯示桌面"
msgstr "显示桌面"
-#: src/config.c:556
+#: src/config.c:558
msgid "打開操作中心"
msgstr "打开操作中心"
-#: src/config.c:557
+#: src/config.c:559
msgid "打開窗口菜單"
msgstr "打开窗口菜单"
-#: src/config.c:587
+#: src/config.c:589
msgid "請輸入命令，然後按回車執行"
msgstr "请输入命令，然后按回车执行"
diff --git a/src/config.c b/src/config.c
index a4e72b4..d81a68f 100644
--- a/src/config.c
+++ b/src/config.c
@@ -112,6 +112,8 @@ static const Keybind keybind[] =
{WM_KEY, XK_Page_Up, prev_desktop, {0}},
{0, XK_Print, print_screen, {0}},
{WM_KEY, XK_Print, print_win, {0}},
+ {WM_KEY, XK_r, enter_and_run_cmd, {0}},
+ {WM_KEY, XK_Delete, quit_wm, {0}},
DESKTOP_KEYBIND(XK_0, 0),
DESKTOP_KEYBIND(XK_1, 1), /* 注：我的鍵盤按super+左shift+1鍵時產生多鍵衝突 */
DESKTOP_KEYBIND(XK_2, 2),
diff --git a/src/hint.c b/src/hint.c
index 3cdc373..a7da002 100644
--- a/src/hint.c
+++ b/src/hint.c
@@ -97,7 +97,7 @@ void fix_win_size_by_hint(Client *c)
c->w=p->base_width+col*p->width_inc;
if((f & USSize || f & PSize) && p->height)
c->h=p->height;
- else if((f & PBaseSize) && p->height)
+ else if((f & PBaseSize) && p->base_height)
c->h=p->base_height+row*p->height_inc;
if((f & PMinSize) && p->min_width)
c->w=MAX(c->w, p->min_width);