X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fx11.h;h=3db9bae3aac2427a7329a46eaf8535e1a1341ef6;hb=601cca5b35649856ff49e1bcb3806592b736662c;hp=cfc40a698ffed2b25ee3eddf51ffbd38387f3d73;hpb=998be01ad92a672b69b11e24d472f6c0c076817f;p=rocksndiamonds.git diff --git a/src/libgame/x11.h b/src/libgame/x11.h index cfc40a69..3db9bae3 100644 --- a/src/libgame/x11.h +++ b/src/libgame/x11.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2000 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -34,14 +34,23 @@ #define TARGET_STRING "X11" #endif +#if defined(PLATFORM_UNIX) +/* This triggers some stuff that is needed because X11 (XSetClipOrigin(), + to be precise) is often very slow when preparing a masked XCopyArea() + for big Pixmaps. + To prevent this, small (tile-sized) mask Pixmaps are created which will + then be set much faster with XSetClipOrigin() and speed things up a lot. */ +#define TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND +#endif + #define FULLSCREEN_STATUS FULLSCREEN_NOT_AVAILABLE /* X11 type definitions */ -typedef struct X11DrawableInfo *Bitmap; -typedef struct X11DrawableInfo *DrawWindow; -typedef struct X11DrawableInfo *DrawBuffer; +typedef struct X11DrawableInfo Bitmap; +typedef struct X11DrawableInfo DrawWindow; +typedef struct X11DrawableInfo DrawBuffer; /* "Pixel" is already defined in X11/Intrinsic.h */ typedef KeySym Key; @@ -59,6 +68,9 @@ typedef XClientMessageEvent ClientMessageEvent; struct X11DrawableInfo { + char *source_filename; + + int width, height; Drawable drawable; Drawable clip_mask; GC gc; /* GC for normal drawing (inheritated from 'window') */ @@ -283,10 +295,18 @@ struct XY #define KSYM_F23 XK_F23 #define KSYM_F24 XK_F24 +#define KSYM_FKEY_FIRST KSYM_F1 +#define KSYM_FKEY_LAST KSYM_F24 +#define KSYM_NUM_FKEYS (KSYM_FKEY_LAST - KSYM_FKEY_FIRST + 1) + /* X11 function definitions */ inline void X11InitVideoDisplay(void); -inline void X11InitVideoBuffer(DrawBuffer *, DrawWindow *); +inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **); + +void X11ZoomBitmap(Bitmap *, Bitmap *); + +Bitmap *X11LoadImage(char *); #endif /* X11_H */