Update of /cvsroot/tuxpaint/tuxpaint/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9366
Modified Files:
tuxpaint.c
Log Message:
OLPC XO is 1200x900 (despite having only 50 MB free!)
Index: tuxpaint.c
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint/src/tuxpaint.c,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -d -r1.538 -r1.539
--- tuxpaint.c 21 Mar 2007 02:45:29 -0000 1.538
+++ tuxpaint.c 21 Mar 2007 05:28:23 -0000 1.539
@@ -32,9 +32,15 @@
/* Color depth for Tux Paint to run in, and store canvases in: */
-#if defined(NOKIA_770) || defined(OLPC_XO)
+#if defined(NOKIA_770)
# define VIDEO_BPP 15
-#else
+#endif
+
+#if defined(OLPC_XO)
+# define VIDEO_BPP 15
+#endif
+
+#ifndef VIDEO_BPP
//# define VIDEO_BPP 15 // saves memory
//# define VIDEO_BPP 16 // causes discoloration
//# define VIDEO_BPP 24 // compromise
@@ -889,6 +895,7 @@
{
// This is a bodge, but it seems unlikely that a case-conversion
// will cause a change from one utf16 character into two....
+ // (though at least UTF-8 suffers from this problem)
res[i] = (Uint16) str[i];
}
@@ -5909,12 +5916,19 @@
use_print_config = 0;
mirrorstamps = 0;
disable_stamp_controls = 0;
- // WINDOW_WIDTH = 640;
- // WINDOW_HEIGHT = 480;
+
#ifdef NOKIA_770
WINDOW_WIDTH = 800;
WINDOW_HEIGHT = 480;
-#else
+#endif
+
+#ifdef OLPC_XO
+ // ideally we'd support rotation and 2x scaling
+ WINDOW_WIDTH = 1200;
+ WINDOW_HEIGHT = 900;
+#endif
+
+#ifndef WINDOW_WIDTH
WINDOW_WIDTH = 800;
WINDOW_HEIGHT = 600;
#endif
|
