diff options
| author | Adam Jackson <ajax@redhat.com> | 2015-06-02 13:58:30 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2015-07-08 16:41:28 -0400 |
| commit | bdc917a41691250701ccc9a0b087448b50892fa9 (patch) | |
| tree | 5d4bbadab1f2651bbd6db5f29fe65919f2b59a19 | |
| parent | 6f3332b9f411fd7ac9cab0085faa56f6c2ff3323 (diff) | |
rootless: Genericize the config header a bit
ROOTLESS_RESIZE_GRAVITY is an optimization, so let's default it to off
unless the backing window system is known to support it.
ROOTLESS_PROTECT_ALPHA looks like it has different values for xquartz
and win32, but hilariously rootlessGC.c merely checks if it is defined,
not what the value is. It's effectively the more conservative path
anyway, so let's just turn it on.
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | miext/rootless/rootlessConfig.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index d39ae63d2..4c464b9f5 100644 --- a/miext/rootless/rootlessConfig.h +++ b/miext/rootless/rootlessConfig.h @@ -35,28 +35,17 @@ #define _ROOTLESSCONFIG_H #ifdef __APPLE__ +#define ROOTLESS_RESIZE_GRAVITY TRUE +#endif + +/*# define ROOTLESSDEBUG*/ #define ROOTLESS_PROTECT_ALPHA TRUE #define ROOTLESS_REDISPLAY_DELAY 10 -#define ROOTLESS_RESIZE_GRAVITY TRUE -/*# define ROOTLESSDEBUG*/ /* Bit mask for alpha channel with a particular number of bits per pixel. Note that we only care for 32bpp data. Mac OS X uses planar alpha for 16bpp. */ #define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0) -#endif /* __APPLE__ */ - -#if defined(__CYGWIN__) || defined(WIN32) - -#define ROOTLESS_PROTECT_ALPHA NO -#define ROOTLESS_REDISPLAY_DELAY 10 -#undef ROOTLESS_RESIZE_GRAVITY -/*# define ROOTLESSDEBUG*/ - -#define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0) - -#endif /* __CYGWIN__ */ - #endif /* _ROOTLESSCONFIG_H */ |