projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed drawing envelope request to be always on top of tile cursor
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.h
diff --git
a/src/libgame/sdl.h
b/src/libgame/sdl.h
index c49894f6836deb17a4ad7f0a883cfbc3da74a3fb..f279ebc4121309254fe5149827b1434671c141f6 100644
(file)
--- a/
src/libgame/sdl.h
+++ b/
src/libgame/sdl.h
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// sdl.h
// ============================================================================
// ----------------------------------------------------------------------------
// sdl.h
// ============================================================================
@@
-17,13
+17,13
@@
#include <SDL_mixer.h>
#include <SDL_net.h>
#include <SDL_thread.h>
#include <SDL_mixer.h>
#include <SDL_net.h>
#include <SDL_thread.h>
-#if defined(PLATFORM_WIN
32
)
+#if defined(PLATFORM_WIN
DOWS
)
#include <SDL_syswm.h>
#endif
// definitions needed for "system.c"
#include <SDL_syswm.h>
#endif
// definitions needed for "system.c"
-#define SURFACE_FLAGS (
0
)
+#define SURFACE_FLAGS (
SDL_WINDOW_RESIZABLE
)
#define SET_TRANSPARENT_PIXEL (SDL_TRUE)
#define UNSET_TRANSPARENT_PIXEL (SDL_FALSE)
#define SET_TRANSPARENT_PIXEL (SDL_TRUE)
#define UNSET_TRANSPARENT_PIXEL (SDL_FALSE)
@@
-350,6
+350,12
@@
typedef struct UserEventInfo UserEvent;
#define KSYM_FKEY_LAST KSYM_F12
#define KSYM_NUM_FKEYS (KSYM_FKEY_LAST - KSYM_FKEY_FIRST + 1)
#define KSYM_FKEY_LAST KSYM_F12
#define KSYM_NUM_FKEYS (KSYM_FKEY_LAST - KSYM_FKEY_FIRST + 1)
+#define KSYM_RAW(k) (((k) >= KSYM_a && \
+ (k) <= KSYM_z) || \
+ ((k) >= KSYM_0 && \
+ (k) <= KSYM_9) || \
+ (k) == KSYM_space)
+
#define KSYM_PRINTABLE(k) (((k) >= KSYM_space && \
(k) <= KSYM_z) || \
(k) == KSYM_Adiaeresis || \
#define KSYM_PRINTABLE(k) (((k) >= KSYM_space && \
(k) <= KSYM_z) || \
(k) == KSYM_Adiaeresis || \
@@
-380,8
+386,13
@@
typedef struct UserEventInfo UserEvent;
KMOD_Meta | \
KMOD_Alt)
KMOD_Meta | \
KMOD_Alt)
+#define KMOD_TextInput (KMOD_Shift | KMOD_Alt_R)
+
+
// SDL function definitions
// SDL function definitions
+void SDLSetAlpha(SDL_Surface *, boolean, int);
+const char *SDLGetRendererName(void);
boolean SDLSetNativeSurface(SDL_Surface **);
SDL_Surface *SDLGetNativeSurface(SDL_Surface *);
void SDLCreateBitmapTextures(Bitmap *);
boolean SDLSetNativeSurface(SDL_Surface **);
SDL_Surface *SDLGetNativeSurface(SDL_Surface *);
void SDLCreateBitmapTextures(Bitmap *);
@@
-417,7
+428,6
@@
void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
Pixel SDLGetPixel(Bitmap *, int, int);
void SDLPutPixel(Bitmap *, int, int, Pixel);
Pixel SDLGetPixel(Bitmap *, int, int);
void SDLPutPixel(Bitmap *, int, int, Pixel);
-void SDLInvertArea(Bitmap *, int, int, int, int, Uint32);
void SDLCopyInverseMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
Bitmap *SDLZoomBitmap(Bitmap *, int, int);
void SDLCopyInverseMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
Bitmap *SDLZoomBitmap(Bitmap *, int, int);