From c223d2eee3d27af495088c70e1682de6b361148d Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Thu, 10 Feb 2011 10:58:13 +0000
Subject: [PATCH] glGet() in Android 1.6 is not implemented (blasphemy!), so
 I've disabled appropriate code in on-screen keyboard

---
 .../video/android/SDL_touchscreenkeyboard.c   |   7 ++++++-
 project/res/raw/simpletheme.raw               | Bin 26755 -> 26755 bytes
 project/res/raw/ultimatedroid.raw             | Bin 7210 -> 7210 bytes
 project/themes/touchscreentheme.h             |   4 ++--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c b/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
index 6ea7e7925..73674d012 100644
--- a/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
+++ b/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
@@ -107,6 +107,8 @@ oldGlState;
 static inline void beginDrawingTex()
 {
 	// Save OpenGL state
+	// TODO: this code does not work on 1.6 emulator, and on some devices
+	/*
 	oldGlState.texture2d = glIsEnabled(GL_TEXTURE_2D);
 	glGetIntegerv(GL_TEXTURE_BINDING_2D, &oldGlState.textureId);
 	glGetFloatv(GL_CURRENT_COLOR, &(oldGlState.color[0]));
@@ -117,12 +119,14 @@ static inline void beginDrawingTex()
 	glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, &oldGlState.texFilter1);
 	glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, &oldGlState.texFilter2);
 	// It's very unlikely that some app will use GL_TEXTURE_CROP_RECT_OES, so just skip it
+	*/
 
 	glEnable(GL_TEXTURE_2D);
 }
 
 static inline void endDrawingTex()
 {
+	/*
 	// Restore OpenGL state
 	if( oldGlState.texture2d == GL_FALSE)
 		glDisable(GL_TEXTURE_2D);
@@ -134,6 +138,7 @@ static inline void endDrawingTex()
 	glBlendFunc(oldGlState.blend1, oldGlState.blend2);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, oldGlState.texFilter1);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, oldGlState.texFilter2);
+	*/
 }
 
 static inline void drawCharTex(GLTexture_t * tex, SDL_Rect * src, SDL_Rect * dest, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
@@ -669,7 +674,7 @@ static int setupScreenKeyboardButton( int buttonID, Uint8 * charBuf )
 
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture_w, texture_h, 0, GL_RGBA,
 					format ? GL_UNSIGNED_SHORT_4_4_4_4 : GL_UNSIGNED_SHORT_5_5_5_1, NULL);
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+	//glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 	
 	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA,
 						format ? GL_UNSIGNED_SHORT_4_4_4_4 : GL_UNSIGNED_SHORT_5_5_5_1,
diff --git a/project/res/raw/simpletheme.raw b/project/res/raw/simpletheme.raw
index 0d06b14fb2d1206c34a95ea447935d0cfcda9c64..5232b340109d92481fdc19fa48c5ad8b39346acc 100644
GIT binary patch
delta 18
ZcmZp^$k=?5kzKx<gW<v9;En7x82~~`2KE2|

delta 18
ZcmZp^$k=?5kzKx<gTb3wcq4mF1^_sB1z`XH

diff --git a/project/res/raw/ultimatedroid.raw b/project/res/raw/ultimatedroid.raw
index 4a763e43947b5a043d7d408e2f047b8d108d3931..adbfe42958ee046cb13fee6353859e0379a6ab7e 100644
GIT binary patch
delta 16
XcmZ2wvC4v7zMF&L!QtSI?8-6#F$V=}

delta 16
XcmZ2wvC4v7zMF%=i&=OhyRr-bCoKcj

diff --git a/project/themes/touchscreentheme.h b/project/themes/touchscreentheme.h
index 7c2963d31..a82148344 100644
--- a/project/themes/touchscreentheme.h
+++ b/project/themes/touchscreentheme.h
@@ -1,6 +1,6 @@
 // Touchscreen theme to be included directly into the code witohut Java resources, not used yet
 unsigned char * UltimateDroidTheme[] = { 00 // Dummy byte, skip it
-,1f,8b,08,00,4a,03,13,4d,02,03,ed,9d,4b,9a,e4,28
+,1f,8b,08,00,e0,c3,53,4d,02,03,ed,9d,4b,9a,e4,28
 ,92,80,05,02,3d,fc,99,95,99,5d,b3,98,d9,e6,4c,9d
 ,61,76,be,f5,a8,3e,41,54,64,6d,7a,5f,67,f0,a3,f9
 ,8d,fa,04,95,2d,01,92,00,01,c2,40,1e,81,3c,71,fb
@@ -453,7 +453,7 @@ unsigned char * UltimateDroidTheme[] = { 00 // Dummy byte, skip it
 ,ff,1f,38,f1,e0,af,04,f2,01,00
 };
 unsigned char * SimpleTheme[] = { 00 // Dummy byte, skip it
-,1f,8b,08,00,4b,03,13,4d,02,03,ec,9d,4f,6c,db,46
+,1f,8b,08,00,e0,c3,53,4d,02,03,ec,9d,4f,6c,db,46
 ,be,c7,29,f9,5f,8e,e6,76,13,fb,68,73,93,5a,c7,75
 ,d4,be,f8,1a,3f,36,75,6e,7d,0e,d8,5a,7b,0a,6a,9b
 ,b5,72,da,d4,6e,19,f7,d8,aa,59,ca,a7,a6,5d,35,a5