Various Win32 patches from John P.
This commit is contained in:
parent
ef12aa7256
commit
cdc1955354
4 changed files with 22 additions and 9 deletions
|
|
@ -7,7 +7,10 @@ bill@newbreedsoftware.com
|
||||||
http://www.newbreedsoftware.com/tuxpaint/
|
http://www.newbreedsoftware.com/tuxpaint/
|
||||||
|
|
||||||
|
|
||||||
2003.May.8 (0.9.11) [cvs]
|
2003.May.11 (0.9.11) [cvs]
|
||||||
|
* Windows bugfixes.
|
||||||
|
John Popplewell <john@johnnypops.demon.co.uk>
|
||||||
|
|
||||||
* Mac OS X print update. Get to a print dialog by holding Alt/Option when
|
* Mac OS X print update. Get to a print dialog by holding Alt/Option when
|
||||||
clicking "Print." (Similar to how Windows handles it.)
|
clicking "Print." (Similar to how Windows handles it.)
|
||||||
Darrell Walisser <walisser@mac.com>
|
Darrell Walisser <walisser@mac.com>
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
bill@newbreedsoftware.com
|
bill@newbreedsoftware.com
|
||||||
http://www.newbreedsoftware.com/tuxpaint/
|
http://www.newbreedsoftware.com/tuxpaint/
|
||||||
|
|
||||||
June 14, 2002 - April 5, 2003
|
June 14, 2002 - May 11, 2003
|
||||||
|
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
@ -337,6 +337,8 @@ Options
|
||||||
|--------------------+------------------+---------|
|
|--------------------+------------------+---------|
|
||||||
|greek | | |
|
|greek | | |
|
||||||
|--------------------+------------------+---------|
|
|--------------------+------------------+---------|
|
||||||
|
|hebrew | | |
|
||||||
|
|--------------------+------------------+---------|
|
||||||
|hungarian |magyar | |
|
|hungarian |magyar | |
|
||||||
|--------------------+------------------+---------|
|
|--------------------+------------------+---------|
|
||||||
|icelandic |islenska | |
|
|icelandic |islenska | |
|
||||||
|
|
@ -513,6 +515,8 @@ Options
|
||||||
|---------------+-------------------+--------------------|
|
|---------------+-------------------+--------------------|
|
||||||
|fr_FR@euro |Franc,ais |French |
|
|fr_FR@euro |Franc,ais |French |
|
||||||
|---------------+-------------------+--------------------|
|
|---------------+-------------------+--------------------|
|
||||||
|
|he_IL (*) | |Hebrew |
|
||||||
|
|---------------+-------------------+--------------------|
|
||||||
|hu_HU |Magyar |Hungarian |
|
|hu_HU |Magyar |Hungarian |
|
||||||
|---------------+-------------------+--------------------|
|
|---------------+-------------------+--------------------|
|
||||||
|id_ID |Bahasa Indonesia |Indonesian |
|
|id_ID |Bahasa Indonesia |Indonesian |
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ New Breed Software</p>
|
||||||
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
|
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
|
||||||
<a href="http://www.newbreedsoftware.com/tuxpaint/">http://www.newbreedsoftware.com/tuxpaint/</a></p>
|
<a href="http://www.newbreedsoftware.com/tuxpaint/">http://www.newbreedsoftware.com/tuxpaint/</a></p>
|
||||||
|
|
||||||
<p>June 14, 2002 - April 25, 2003</p>
|
<p>June 14, 2002 - May 11, 2003</p>
|
||||||
</center>
|
</center>
|
||||||
|
|
||||||
<hr size=2 noshade>
|
<hr size=2 noshade>
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,12 @@
|
||||||
bill@newbreedsoftware.com
|
bill@newbreedsoftware.com
|
||||||
http://www.newbreedsoftware.com/tuxpaint/
|
http://www.newbreedsoftware.com/tuxpaint/
|
||||||
|
|
||||||
June 14, 2002 - April 26, 2003
|
June 14, 2002 - May 11, 2003
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#define VER_VERSION "0.9.11"
|
#define VER_VERSION "0.9.11"
|
||||||
#define VER_DATE "2003.04.26"
|
#define VER_DATE "2003.05.11"
|
||||||
|
|
||||||
|
|
||||||
/* #define DEBUG */
|
/* #define DEBUG */
|
||||||
|
|
@ -122,6 +122,7 @@ extern char* g_win32_getlocale(void);
|
||||||
#define strncasecmp strnicmp
|
#define strncasecmp strnicmp
|
||||||
#define snprintf _snprintf
|
#define snprintf _snprintf
|
||||||
#define S_ISDIR(i) ((i&_S_IFDIR)!=0)
|
#define S_ISDIR(i) ((i&_S_IFDIR)!=0)
|
||||||
|
#define alloca _alloca
|
||||||
|
|
||||||
#endif /* WIN32 */
|
#endif /* WIN32 */
|
||||||
|
|
||||||
|
|
@ -215,7 +216,7 @@ void win32_perror(const char *str)
|
||||||
#define clamp(lo,value,hi) (min(max(value,lo),hi))
|
#define clamp(lo,value,hi) (min(max(value,lo),hi))
|
||||||
|
|
||||||
|
|
||||||
#define RENDER_TEXT TTF_RenderUTF8_Blended
|
#define RENDER_TEXT TTF_RenderText_Blended
|
||||||
|
|
||||||
|
|
||||||
/* Possible languages: */
|
/* Possible languages: */
|
||||||
|
|
@ -2025,7 +2026,7 @@ void mainloop(void)
|
||||||
{
|
{
|
||||||
if (((unsigned char *) event.user.data1)[0] == '=')
|
if (((unsigned char *) event.user.data1)[0] == '=')
|
||||||
{
|
{
|
||||||
draw_tux_text(TUX_GREAT, event.user.data1 + 1, 1, 0);
|
draw_tux_text(TUX_GREAT, (char *) event.user.data1 + 1, 1, 0);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -3560,7 +3561,7 @@ void setup(int argc, char * argv[])
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
fprintf(stderr, "Note: printcfg option only applies to Windows!\n");
|
fprintf(stderr, "Note: printcfg option only applies to Windows!\n");
|
||||||
#endif
|
#endif
|
||||||
use_print_config = 0;
|
use_print_config = 1;
|
||||||
}
|
}
|
||||||
else if (strstr(argv[i], "--printdelay=") == argv[i])
|
else if (strstr(argv[i], "--printdelay=") == argv[i])
|
||||||
{
|
{
|
||||||
|
|
@ -4070,7 +4071,6 @@ void setup(int argc, char * argv[])
|
||||||
"trails in fullscreen mode. Disabling fancy cursors.\n"
|
"trails in fullscreen mode. Disabling fancy cursors.\n"
|
||||||
"(You can do this yourself with 'nofancycursors' option,\n"
|
"(You can do this yourself with 'nofancycursors' option,\n"
|
||||||
"to avoid this warning in the future.)\n");
|
"to avoid this warning in the future.)\n");
|
||||||
}
|
|
||||||
no_fancy_cursors = 1;
|
no_fancy_cursors = 1;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -10851,7 +10851,13 @@ escape_string_type escape_strings[] = {
|
||||||
unsigned char * unescape(char * str)
|
unsigned char * unescape(char * str)
|
||||||
{
|
{
|
||||||
int i, j, len, esclen, inside_escape;
|
int i, j, len, esclen, inside_escape;
|
||||||
|
|
||||||
|
#ifndef WIN32
|
||||||
char outstr[strlen(str + 1)], escapestr[strlen(str + 1)];
|
char outstr[strlen(str + 1)], escapestr[strlen(str + 1)];
|
||||||
|
#else
|
||||||
|
char *outstr = alloca( strlen(str + 1) );
|
||||||
|
char *escapestr = alloca( strlen(str + 1) );
|
||||||
|
#endif
|
||||||
|
|
||||||
inside_escape = 0;
|
inside_escape = 0;
|
||||||
len = 0;
|
len = 0;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue