Fixed bug 1137, updated the keyboard demo with latest rendering API changes.
authorSam Lantinga <slouken@libsdl.org>
Sun, 20 Feb 2011 14:22:27 -0800
changeset 5364 fec676157db5
parent 5363 96799a165806
child 5365 db3c6ebcc954
Fixed bug 1137, updated the keyboard demo with latest rendering API changes.
Xcode-iPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj
Xcode-iPhoneOS/Demos/src/keyboard.c
--- a/Xcode-iPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj	Sun Feb 20 14:16:11 2011 -0800
+++ b/Xcode-iPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj	Sun Feb 20 14:22:27 2011 -0800
@@ -975,11 +975,7 @@
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\\\\\\\"$(SRCROOT)\\\\\\\"",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PREBINDING = NO;
 				PRODUCT_NAME = Keyboard;
 				SDKROOT = iphoneos;
@@ -998,11 +994,7 @@
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\\\\\\\"$(SRCROOT)\\\\\\\"",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PREBINDING = NO;
 				PRODUCT_NAME = Fireworks;
 				SDKROOT = iphoneos;
--- a/Xcode-iPhoneOS/Demos/src/keyboard.c	Sun Feb 20 14:16:11 2011 -0800
+++ b/Xcode-iPhoneOS/Demos/src/keyboard.c	Sun Feb 20 14:22:27 2011 -0800
@@ -23,6 +23,7 @@
 void cleanup(void);
 void drawBlank(int x, int y);
 
+static SDL_Renderer *renderer;
 static int numChars = 0;        /* number of characters we've typed so far */
 static SDL_bool lastCharWasColon = 0;   /* we use this to detect sequences such as :) */
 static SDL_Color bg_color = { 50, 50, 100, 255 };       /* color of background */
@@ -157,7 +158,7 @@
         { GLYPH_SIZE_IMAGE * index, 0, GLYPH_SIZE_IMAGE, GLYPH_SIZE_IMAGE };
     SDL_Rect dstRect = { x, y, GLYPH_SIZE_SCREEN, GLYPH_SIZE_SCREEN };
     drawBlank(x, y);
-    SDL_RenderCopy(texture, &srcRect, &dstRect);
+    SDL_RenderCopy(renderer, texture, &srcRect, &dstRect);
 }
 
 /*  draws the cursor icon at the current end position of the text */
@@ -174,9 +175,9 @@
 drawBlank(int x, int y)
 {
     SDL_Rect rect = { x, y, GLYPH_SIZE_SCREEN, GLYPH_SIZE_SCREEN };
-    SDL_SetRenderDrawColor(bg_color.r, bg_color.g, bg_color.b,
+    SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b,
                            bg_color.unused);
-    SDL_RenderFill(&rect);
+    SDL_RenderFillRect(renderer, &rect);
 }
 
 /* moves backwards one character, erasing the last one put down */
@@ -219,7 +220,7 @@
         SDL_BlitSurface(surface, NULL, converted, NULL);
         /* create our texture */
         texture =
-            SDL_CreateTextureFromSurface(SDL_PIXELFORMAT_ABGR8888, converted);
+            SDL_CreateTextureFromSurface(renderer, converted);
         if (texture == 0) {
             printf("texture creation failed: %s\n", SDL_GetError());
         } else {
@@ -248,16 +249,16 @@
     /* create window */
     window = SDL_CreateWindow("iPhone keyboard test", 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0);
     /* create renderer */
-    SDL_CreateRenderer(window, 0, 0);
+    renderer = SDL_CreateRenderer(window, -1, 0);
 
     /* load up our font */
     loadFont();
 
     /* draw the background, we'll just paint over it */
-    SDL_SetRenderDrawColor(bg_color.r, bg_color.g, bg_color.b,
+    SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b,
                            bg_color.unused);
-    SDL_RenderFill(NULL);
-    SDL_RenderPresent();
+    SDL_RenderFillRect(renderer, NULL);
+    SDL_RenderPresent(renderer);
 
     int done = 0;
     /* loop till we get SDL_Quit */
@@ -293,7 +294,7 @@
             }
             /* check if the key was a colon */
             /* draw our updates to the screen */
-            SDL_RenderPresent();
+            SDL_RenderPresent(renderer);
             break;
 #ifdef __IPHONEOS__
         case SDL_MOUSEBUTTONUP: