Tried re-enabling paint for apple2, didn't work, so disabling again. Ok, now onto 1.0.

Author: tschak909

src/apple2/touch.c

@@ -10,7 +10,8 @@
 #include <stdint.h>
 
 /* Scaling tables for touch to convert 320x192 to 512x512 */
-uint16_t scaletx[]={
+
+/* uint16_t scaletx[]={
 0,2,4,5,7,8,10,12,
 13,15,16,18,20,21,23,24,
 26,28,29,31,32,34,36,37,
@@ -50,9 +51,9 @@ uint16_t scaletx[]={
 461,463,464,466,468,469,471,472,
 474,476,477,479,480,482,484,485,
 487,488,490,492,493,495,496,498,
-500,501,503,504,506,508,509,};
+500,501,503,504,506,508,509,}; */
 
-uint16_t scalety[]={
+/* uint16_t scalety[]={
 510,507,504,502,499,496,494,491,
 488,486,483,480,478,475,472,470,
 467,464,462,459,456,454,451,448,
@@ -77,4 +78,4 @@ uint16_t scalety[]={
 62,59,56,54,51,48,46,43,
 40,38,35,32,30,27,24,22,
 19,16,14,11,8,6,3,0,
-};
+}; */

src/screen_base.c

@@ -271,10 +271,10 @@ void screen_background(padRGB* theColor)
  */
 void _screen_paint(unsigned short x, unsigned short y)
 {
-  // Currently we run out of memory on apple2, so this is temporarily disabled.
 #ifndef __APPLE2__
-  static unsigned short xStack[64];
-  static unsigned char yStack[64];
+  // Currently we run out of memory on apple2, so this is temporarily disabled.
+  static unsigned short xStack[256];
+  static unsigned char yStack[192];
   unsigned char stackentry = 1;
   unsigned char spanAbove, spanBelow;
 
@@ -327,7 +327,7 @@ void _screen_paint(unsigned short x, unsigned short y)
       x = xStack[stackentry];
       y = yStack[stackentry];
     }
-  while (stackentry);		
+  while (stackentry);
 #endif
 }
 

src/touch_base.c

@@ -35,6 +35,7 @@ extern uint16_t scalety[];
  */
 void touch_init(void)
 {
+#ifndef __APPLE2__
   if (strcmp(config.driver_mou,"NONE")==0)
     return;
 
@@ -47,15 +48,18 @@ void touch_init(void)
       POKE(0xD001,0);
       /* POKE(0xD002,0); */
       POKE(0xD003,0);
-#endif
+#endif /* __ATARI__ */
     }
+#endif /* __APPLE2__ */
+  
 }
 
 /**
  * touch_allow - Set whether touchpanel is active or not.
  */
 void touch_allow(padBool allow)
 {
+#ifndef __APPLE2__
   /* // If mouse is off screen (due to previously being moved off screen, move onscreen to make visible. */
   /* if (allow) */
   /*   { */
@@ -71,13 +75,15 @@ void touch_allow(padBool allow)
   /* 	} */
   /*   } */
   TouchActive=allow;
+#endif
 }
 
 /**
  * touch_main - Process mouse events and turn into scaled touch events
  */
 void touch_main(void)
 {
+#ifndef __APPLE2__
   uint8_t lastbuttons;
   padPt coord;
 
@@ -95,21 +101,26 @@ void touch_main(void)
       Touch(&coord);
     }
   lastbuttons = mouse_data.buttons;
+#endif 
 }
 
 /**
  * touch_hide() - hide the mouse cursor
  */
 void touch_hide(void)
 {
+#ifndef __APPLE2__
   mouse_move(screen_w,screen_h);
+#endif
 }
 
 /**
  * touch_done() - Stop the mouse driver
  */
 void touch_done(void)
 {
+#ifndef __APPLE2__
   if (mouse_present==true)
     mouse_uninstall();
+#endif
 }