actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cosmetic changes only

Browse Source
This commit is contained in:
Glenn Maynard
2005-12-28 03:30:37 +00:00
parent fe3a68d5cd
commit bc372e308b
2 changed files with 84 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/InputHandler/InputHandler_X11.cpp
+13 -15
View File
@@ -51,8 +51,7 @@ static RageKeySym XSymToKeySym( int key )
switch( key ) switch( key )
{ {
/* These are needed because of the way X registers /* These are needed because of the way X registers the keypad. */
the keypad. */
case XK_KP_Insert: return KEY_KP_C0; case XK_KP_Insert: return KEY_KP_C0;
case XK_KP_End: return KEY_KP_C1; case XK_KP_End: return KEY_KP_C1;
case XK_KP_Down: return KEY_KP_C2; case XK_KP_Down: return KEY_KP_C2;
@@ -128,7 +127,8 @@ InputHandler_X11::InputHandler_X11()
state.auto_repeat_mode = AutoRepeatModeOff; state.auto_repeat_mode = AutoRepeatModeOff;
XChangeKeyboardControl( X11Helper::Dpy, KBAutoRepeatMode, &state ); XChangeKeyboardControl( X11Helper::Dpy, KBAutoRepeatMode, &state );
X11Helper::Go(); X11Helper::Go();
X11Helper::OpenMask(KeyPressMask); X11Helper::OpenMask(KeyReleaseMask); X11Helper::OpenMask( KeyPressMask );
X11Helper::OpenMask( KeyReleaseMask );
} }
InputHandler_X11::~InputHandler_X11() InputHandler_X11::~InputHandler_X11()
@@ -136,7 +136,8 @@ InputHandler_X11::~InputHandler_X11()
XKeyboardControl state; XKeyboardControl state;
state.auto_repeat_mode = AutoRepeatModeDefault; state.auto_repeat_mode = AutoRepeatModeDefault;
XChangeKeyboardControl( X11Helper::Dpy, KBAutoRepeatMode, &state ); XChangeKeyboardControl( X11Helper::Dpy, KBAutoRepeatMode, &state );
X11Helper::CloseMask(KeyPressMask); X11Helper::CloseMask(KeyReleaseMask); X11Helper::CloseMask( KeyPressMask );
X11Helper::CloseMask( KeyReleaseMask );
X11Helper::Stop(); X11Helper::Stop();
} }
@@ -145,34 +146,31 @@ void InputHandler_X11::Update()
XEvent event; XEvent event;
if( X11Helper::Win ) if( X11Helper::Win )
while(XCheckTypedWindowEvent(X11Helper::Dpy, {
X11Helper::Win, KeyPress, &event) ) while( XCheckTypedWindowEvent(X11Helper::Dpy, X11Helper::Win, KeyPress, &event) )
{ {
LOG->Trace( "key: sym %i, key %i, state true", LOG->Trace( "key: sym %i, key %i, state true",
XLookupKeysym(&event.xkey,0), XSymToKeySym(XLookupKeysym(&event.xkey,0)) ); XLookupKeysym(&event.xkey,0), XSymToKeySym(XLookupKeysym(&event.xkey,0)) );
DeviceInput di( DEVICE_KEYBOARD, DeviceInput di( DEVICE_KEYBOARD, XSymToKeySym(XLookupKeysym(&event.xkey,0)) );
XSymToKeySym(XLookupKeysym(&event.xkey,0)) );
ButtonPressed(di, true); ButtonPressed(di, true);
} }
while(XCheckTypedWindowEvent(X11Helper::Dpy,
X11Helper::Win, KeyRelease, &event) ) while( XCheckTypedWindowEvent(X11Helper::Dpy, X11Helper::Win, KeyRelease, &event) )
{ {
LOG->Trace( "key: sym %i, key %i, state false", LOG->Trace( "key: sym %i, key %i, state false",
XLookupKeysym(&event.xkey,0), XSymToKeySym(XLookupKeysym(&event.xkey,0)) ); XLookupKeysym(&event.xkey,0), XSymToKeySym(XLookupKeysym(&event.xkey,0)) );
DeviceInput di( DEVICE_KEYBOARD, DeviceInput di( DEVICE_KEYBOARD, XSymToKeySym(XLookupKeysym(&event.xkey,0)) );
XSymToKeySym(XLookupKeysym(&event.xkey,0)) );
ButtonPressed( di, false ); ButtonPressed( di, false );
}
} }
InputHandler::UpdateTimer(); InputHandler::UpdateTimer();
} }
void InputHandler_X11::GetDevicesAndDescriptions( void InputHandler_X11::GetDevicesAndDescriptions( vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut )
vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut)
{ {
vDevicesOut.push_back( DEVICE_KEYBOARD ); vDevicesOut.push_back( DEVICE_KEYBOARD );
vDescriptionsOut.push_back( "Keyboard" ); vDescriptionsOut.push_back( "Keyboard" );
stepmania/src/arch/InputHandler/InputHandler_X11.h
+2 -2
View File
@@ -1,8 +1,8 @@
/* InputHandler_X11 - X-based keyboard input handler. */
#ifndef INPUT_HANDLER_X11_H #ifndef INPUT_HANDLER_X11_H
#define INPUT_HANDLER_X11_H #define INPUT_HANDLER_X11_H
/* Get keyboard (and possibly pointer in the future) input through X. */
#include "InputHandler.h" #include "InputHandler.h"
class InputHandler_X11: public InputHandler class InputHandler_X11: public InputHandler