summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2009-10-27 09:17:40 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2009-10-27 09:17:40 +0000
commit7ad851238b299d8ee9b247615fc75eb527eb9918 (patch)
tree1ebf33f82bec281eb5c4e8137939b276ea5a4b0a
parent0f3ff4e34bd2e54f5f28ab6a03e0781bd28cc54b (diff)
downloadpcsxr-7ad851238b299d8ee9b247615fc75eb527eb9918.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@33235 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--ChangeLog6
-rw-r--r--plugins/dfinput/xkb.c13
-rw-r--r--po/zh_CN.po10
3 files changed, 13 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 60228fa0..3959ccea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+October 27, 2009 Wei Mingzhi <weimingzhi@gmail.com>
+
+ * plugins/dfinput/xkb.c: Use XkbSetDetectableAutoRepeat() instead of
+ disabling autorepeat globally.
+ * po/zh_CN.po: Updated.
+
October 26, 2009 Wei Mingzhi <weimingzhi@gmail.com>
* plugins/dfinput/cfg.c: Fixed a bug which caused the settings for analog
diff --git a/plugins/dfinput/xkb.c b/plugins/dfinput/xkb.c
index 62f7fc06..4ac6f868 100644
--- a/plugins/dfinput/xkb.c
+++ b/plugins/dfinput/xkb.c
@@ -24,14 +24,14 @@ void InitKeyboard() {
wmprotocols = XInternAtom(g.Disp, "WM_PROTOCOLS", 0);
wmdelwindow = XInternAtom(g.Disp, "WM_DELETE_WINDOW", 0);
- XAutoRepeatOff(g.Disp);
+ XkbSetDetectableAutoRepeat(g.Disp, 1, NULL);
g.PadState[0].KeyStatus = 0xFFFF;
g.PadState[1].KeyStatus = 0xFFFF;
}
void DestroyKeyboard() {
- XAutoRepeatOn(g.Disp);
+ XkbSetDetectableAutoRepeat(g.Disp, 0, NULL);
}
void CheckKeyboard() {
@@ -83,15 +83,6 @@ void CheckKeyboard() {
return;
}
break;
-
- case FocusOut:
- XAutoRepeatOn(g.Disp);
- break;
-
- case FocusIn:
- XAutoRepeatOff(g.Disp);
- break;
}
}
}
-
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 96a761d3..50683e05 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: pcsxr 1.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-10-25 21:49+0800\n"
-"PO-Revision-Date: 2009-10-25 21:55+0700\n"
+"PO-Revision-Date: 2009-10-27 17:17+0700\n"
"Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
"Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
"MIME-Version: 1.0\n"
@@ -2701,19 +2701,19 @@ msgstr "开始键"
#: ../plugins/dfinput/cfg-gtk2.c:67
msgid "L-Stick X"
-msgstr "左旋钮 X"
+msgstr "左摇杆 X"
#: ../plugins/dfinput/cfg-gtk2.c:68
msgid "L-Stick Y"
-msgstr "左旋钮 Y"
+msgstr "左摇杆 Y"
#: ../plugins/dfinput/cfg-gtk2.c:69
msgid "R-Stick X"
-msgstr "右旋钮 X"
+msgstr "右摇杆 X"
#: ../plugins/dfinput/cfg-gtk2.c:70
msgid "R-Stick Y"
-msgstr "右旋钮 Y"
+msgstr "右摇杆 Y"
#: ../plugins/dfinput/cfg-gtk2.c:98
msgid "Centered"