forked from Mirrors/openclonk
Move modifier key masks to the keycode definitions
parent
544c1cbb4b
commit
c9c8b0c408
|
@ -27,40 +27,6 @@
|
|||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
#if defined(USE_GTK)
|
||||
#ifdef _WIN32
|
||||
#undef MK_CONTROL
|
||||
#undef MK_SHIFT
|
||||
#endif
|
||||
// from X.h:
|
||||
//#define ShiftMask (1<<0)
|
||||
//#define ControlMask (1<<2)
|
||||
#define MK_CONTROL (1<<2)
|
||||
#define MK_SHIFT (1<<0)
|
||||
#define MK_ALT (1<<3)
|
||||
#elif defined(USE_SDL_MAINLOOP)
|
||||
#include <SDL.h>
|
||||
#define MK_SHIFT (KMOD_LSHIFT | KMOD_RSHIFT)
|
||||
#define MK_CONTROL (KMOD_LCTRL | KMOD_RCTRL)
|
||||
#define MK_ALT (KMOD_LALT | KMOD_RALT)
|
||||
#elif defined(USE_CONSOLE)
|
||||
#ifndef _WIN32
|
||||
#define MK_SHIFT 0
|
||||
#define MK_CONTROL 0
|
||||
#endif
|
||||
#define MK_ALT 0
|
||||
#elif defined(USE_COCOA)
|
||||
// declare as extern variables and initialize them in StdMacWindow.mm so as to not include objc headers
|
||||
extern int MK_SHIFT;
|
||||
extern int MK_CONTROL;
|
||||
extern int MK_ALT;
|
||||
#elif defined(USE_WIN32_WINDOWS)
|
||||
#include <C4windowswrapper.h>
|
||||
#ifndef MK_ALT
|
||||
#define MK_ALT 0x20 // as defined in oleidl.h
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_WIN32_WINDOWS
|
||||
class CStdMessageProc : public StdSchedulerProc
|
||||
{
|
||||
|
|
|
@ -21,6 +21,40 @@
|
|||
|
||||
#include <StdBuf.h>
|
||||
|
||||
#if defined(USE_GTK)
|
||||
#ifdef _WIN32
|
||||
#undef MK_CONTROL
|
||||
#undef MK_SHIFT
|
||||
#endif
|
||||
// from X.h:
|
||||
//#define ShiftMask (1<<0)
|
||||
//#define ControlMask (1<<2)
|
||||
#define MK_CONTROL (1<<2)
|
||||
#define MK_SHIFT (1<<0)
|
||||
#define MK_ALT (1<<3)
|
||||
#elif defined(USE_SDL_MAINLOOP)
|
||||
#include <SDL.h>
|
||||
#define MK_SHIFT (KMOD_LSHIFT | KMOD_RSHIFT)
|
||||
#define MK_CONTROL (KMOD_LCTRL | KMOD_RCTRL)
|
||||
#define MK_ALT (KMOD_LALT | KMOD_RALT)
|
||||
#elif defined(USE_CONSOLE)
|
||||
#ifndef _WIN32
|
||||
#define MK_SHIFT 0
|
||||
#define MK_CONTROL 0
|
||||
#endif
|
||||
#define MK_ALT 0
|
||||
#elif defined(USE_COCOA)
|
||||
// declare as extern variables and initialize them in StdMacWindow.mm so as to not include objc headers
|
||||
extern int MK_SHIFT;
|
||||
extern int MK_CONTROL;
|
||||
extern int MK_ALT;
|
||||
#elif defined(USE_WIN32_WINDOWS)
|
||||
#include <C4windowswrapper.h>
|
||||
#ifndef MK_ALT
|
||||
#define MK_ALT 0x20 // as defined in oleidl.h
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(USE_WIN32_WINDOWS) || defined(USE_GTK) || defined(USE_CONSOLE)
|
||||
#define K_ESCAPE 1
|
||||
#define K_1 2
|
||||
|
|
Loading…
Reference in New Issue