Undefine LARGE_CURSOR_FULLSCREEN_BUG, which makes custom cursors work

fullscreen on Windows (if the default 'windib' driver is used).
Conditionally compile the printcommand and altprintcommand stuff.
This commit is contained in:
John Popplewell 2007-06-30 04:01:58 +00:00
parent bedbdc7cd7
commit 0a570c4758

View file

@ -85,7 +85,7 @@
/* Disable fancy cursors in fullscreen mode, to avoid SDL bug: */ /* Disable fancy cursors in fullscreen mode, to avoid SDL bug: */
/* (This bug is still around, as of SDL 1.2.9, October 2005) */ /* (This bug is still around, as of SDL 1.2.9, October 2005) */
/* (Is it still in SDL 1.2.11 in May 2007, though!? -bjk) */ /* (Is it still in SDL 1.2.11 in May 2007, though!? -bjk) */
#define LARGE_CURSOR_FULLSCREEN_BUG //#define LARGE_CURSOR_FULLSCREEN_BUG
// control the color selector // control the color selector
#define COLORSEL_DISABLE 0 // disable and draw the (greyed out) colors #define COLORSEL_DISABLE 0 // disable and draw the (greyed out) colors
@ -845,10 +845,10 @@ static int starter_mirrored, starter_flipped, starter_personal;
static int recording, playing; static int recording, playing;
static char *playfile; static char *playfile;
static FILE *demofi; static FILE *demofi;
static const char *printcommand = PRINTCOMMAND;
static const char *altprintcommand = ALTPRINTCOMMAND;
#if !defined(WIN32) && !defined(__APPLE__) && !defined(__BEOS__) #if !defined(WIN32) && !defined(__APPLE__) && !defined(__BEOS__)
static const char *printcommand = PRINTCOMMAND;
static const char *altprintcommand = ALTPRINTCOMMAND;
char *papersize = NULL; char *papersize = NULL;
#endif #endif
@ -15876,6 +15876,7 @@ static void parse_options(FILE * fi)
#endif #endif
use_print_config = 0; use_print_config = 0;
} }
#if !defined(WIN32) && !defined(__APPLE__) && !defined(__BEOS__)
else if (strstr(str, "printcommand=") == str) else if (strstr(str, "printcommand=") == str)
{ {
printcommand = strdup(str + 13); printcommand = strdup(str + 13);
@ -15884,6 +15885,7 @@ static void parse_options(FILE * fi)
{ {
altprintcommand = strdup(str + 16); altprintcommand = strdup(str + 16);
} }
#endif
else if (strcmp(str, "saveover=yes") == 0) else if (strcmp(str, "saveover=yes") == 0)
{ {
promptless_save = SAVE_OVER_ALWAYS; promptless_save = SAVE_OVER_ALWAYS;