From f91faacc530e74b203425f1e4706edbec1f6a962 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Mon, 17 Apr 2017 09:18:36 +0200 Subject: [PATCH] onepad: remove autorepeat deadcode a9af374 onepad: don't touch autorepeat setup --- plugins/onepad/Linux/linux.cpp | 3 --- plugins/onepad/keyboard.cpp | 14 -------------- plugins/onepad/keyboard.h | 2 -- plugins/onepad/onepad.cpp | 1 - plugins/onepad/onepad.h | 1 - 5 files changed, 21 deletions(-) diff --git a/plugins/onepad/Linux/linux.cpp b/plugins/onepad/Linux/linux.cpp index 30e9e3745a..c5b0abeb0a 100644 --- a/plugins/onepad/Linux/linux.cpp +++ b/plugins/onepad/Linux/linux.cpp @@ -70,14 +70,11 @@ s32 _PADopen(void *pDsp) GSdsp = *(Display **)pDsp; GSwin = (Window) * (((u32 *)pDsp) + 1); - SetAutoRepeat(false); return 0; } void _PADclose() { - SetAutoRepeat(true); - s_vgamePad.clear(); } diff --git a/plugins/onepad/keyboard.cpp b/plugins/onepad/keyboard.cpp index 154a2d8d7e..5a70c297f6 100644 --- a/plugins/onepad/keyboard.cpp +++ b/plugins/onepad/keyboard.cpp @@ -38,18 +38,6 @@ char *KeysymToChar(int keysym) } #endif -void SetAutoRepeat(bool autorep) -{ -#if defined(__unix__) - if (toggleAutoRepeat) { - if (autorep) - XAutoRepeatOn(GSdsp); - else - XAutoRepeatOff(GSdsp); - } -#endif -} - #if defined(__unix__) static bool s_grab_input = false; static bool s_Shift = false; @@ -128,11 +116,9 @@ static void AnalyzeKeyEvent(keyEvent &evt) break; case FocusIn: - //XAutoRepeatOff(GSdsp); break; case FocusOut: - //XAutoRepeatOn(GSdsp); s_Shift = false; break; diff --git a/plugins/onepad/keyboard.h b/plugins/onepad/keyboard.h index 5c1690d8b3..63878f2e5e 100644 --- a/plugins/onepad/keyboard.h +++ b/plugins/onepad/keyboard.h @@ -41,6 +41,4 @@ extern HWND GShwnd; #endif -extern void SetAutoRepeat(bool autorep); - #endif diff --git a/plugins/onepad/onepad.cpp b/plugins/onepad/onepad.cpp index 0cc0226594..a0fa4be149 100644 --- a/plugins/onepad/onepad.cpp +++ b/plugins/onepad/onepad.cpp @@ -44,7 +44,6 @@ keyEvent event; static keyEvent s_event; std::string s_strIniPath("inis/"); std::string s_strLogPath("logs/"); -bool toggleAutoRepeat = false; const u32 version = PS2E_PAD_VERSION; const u32 revision = 2; diff --git a/plugins/onepad/onepad.h b/plugins/onepad/onepad.h index ed6e668c30..7bc3637217 100644 --- a/plugins/onepad/onepad.h +++ b/plugins/onepad/onepad.h @@ -118,7 +118,6 @@ enum gamePadValues { extern FILE *padLog; extern void initLogging(); -extern bool toggleAutoRepeat; #define PAD_LOG __Log //#define PAD_LOG __LogToConsole