marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Mac build broken in b11564168, attempt 2

install-platforms
Julius Michaelis 2018-01-19 13:01:26 +01:00
parent 914d3798a4
commit 9d61cc9bc9
3 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/C4KeyboardInput.cpp
View File

@ -608,6 +608,12 @@ bool C4KeyEventData::operator ==(const struct C4KeyEventData &cmp) const
}
bool KEY_IsModifier(C4KeyCode k) {
return k == K_CONTROL_L || k == K_SHIFT_L || k == K_ALT_L ||
k == K_CONTROL_R || k == K_SHIFT_R || k == K_ALT_R;
}
/* ----------------- C4CustomKey------------------ */
C4CustomKey::C4CustomKey(const C4KeyCodeEx &DefCode, const char *szName, C4KeyScope Scope, C4KeyboardCallbackInterface *pCallback, unsigned int uiPriority)

9
src/gui/C4KeyboardInput.h
View File

@ -18,8 +18,6 @@
#ifndef INC_C4KeyboardInput
#define INC_C4KeyboardInput
#include "platform/C4Window.h"
// key context classifications
enum C4KeyScope
{
@ -180,12 +178,7 @@ inline uint8_t Key_GetMouseEvent(C4KeyCode key)
return ((uint32_t)key) & uint8_t(0xff);
}
inline constexpr bool KEY_IsModifier(C4KeyCode k) {
return k == K_CONTROL_L || k == K_SHIFT_L || k == K_ALT_L ||
k == K_CONTROL_R || k == K_SHIFT_R || k == K_ALT_R;
}
bool KEY_IsModifier(C4KeyCode k);
#ifdef _WIN32
#define TOUPPERIFX11(key) (key)

48
src/platform/C4Window.h
View File

@ -19,34 +19,32 @@
#ifndef INC_STDWINDOW
#define INC_STDWINDOW
#include "C4ForbidLibraryCompilation.h"
#if 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)
#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;
// 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 "platform/C4windowswrapper.h"
#ifndef MK_ALT
#define MK_ALT 0x20 // as defined in oleidl.h
#endif
#else
#if !defined(MK_SHIFT)
#define MK_SHIFT 0
#endif
#if !defined(MK_CONTROL)
#define MK_CONTROL 0
#endif
#if !defined(MK_ALT)
#define MK_ALT 0
#endif
#include "platform/C4windowswrapper.h"
#ifndef MK_ALT
#define MK_ALT 0x20 // as defined in oleidl.h
#endif
#endif
#if !defined(USE_COCOA)
#if defined(USE_WIN32_WINDOWS) || defined(USE_CONSOLE) || defined(USE_SDL_MAINLOOP)
#define K_ESCAPE 1
#define K_1 2
#define K_2 3
@ -159,7 +157,7 @@
#define K_NUM0 K_INSERT
#define K_DECIMAL K_DELETE
#define K_DIVIDE K_SLASH
#elif defined(USE_X11) || defined(USE_CONSOLE - Do not forget guard include when reenabling this comment)
#elif defined(USE_X11) || defined(USE_CONSOLE)
*/
#define K_NUM7 71
#define K_NUM8 72
@ -195,7 +193,7 @@
#define K_PRINT 99
#define K_CENTER 76
#else // !defined(USE_COCOA)
#elif defined(USE_COCOA)
#import "platform/ObjectiveCAssociated.h"
// FIXME
// declare as extern variables and initialize them in StdMacWindow.mm so as to not include objc headers