sdl-ios-xcode: Xcode-iPhoneOS/Demos/src/rectangles.c annotate

annotate Xcode-iPhoneOS/Demos/src/rectangles.c @ 4425:a3e71b957215

Fixed bug #961 Kalle Olavi Niemitalo 2010-02-28 09:15:50 PST It seems the SDLK_LMETA and SDLK_RMETA constants have been removed from SDL 1.3. I grepped for them in the SDL source tree and these were the only hits: ./include/SDL_compat.h:230:#define SDLK_LSUPER SDLK_LMETA ./include/SDL_compat.h:231:#define SDLK_RSUPER SDLK_RMETA ./src/video/bwindow/SDL_BWin.h:194: keymap[0x66] = SDLK_LMETA; ./src/video/bwindow/SDL_BWin.h:195: keymap[0x67] = SDLK_RMETA; I don't know how compatible SDL 1.3 is supposed to be with applications designed for SDL 1.2. However, as you can see, SDL itself is still trying to use the removed constants, and that is clearly a bug. Because SDL_compat.h defines KMOD_LMETA as KMOD_LGUI, I suppose it should also define SDLK_LMETA as SDLK_LGUI, and SDLK_RMETA likewise.

author	Sam Lantinga <slouken@libsdl.org>
date	Tue, 09 Mar 2010 06:07:48 +0000
parents	64ce267332c6
children	78db79f5a4e2

rev	line source
3277 20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 * rectangles.c
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	3 * written by Holmes Futrell
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4 * use however you want
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 */
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 #include "SDL.h"
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 #include <time.h>
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9 #include "common.h"
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 void
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 render(void)
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 {
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 Uint8 r, g, b;
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 /* Come up with a random rectangle */
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 SDL_Rect rect;
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18 rect.w = randomInt(64, 128);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 rect.h = randomInt(64, 128);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 rect.x = randomInt(0, SCREEN_WIDTH);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 rect.y = randomInt(0, SCREEN_HEIGHT);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23 /* Come up with a random color */
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 r = randomInt(50, 255);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25 g = randomInt(50, 255);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26 b = randomInt(50, 255);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28 /* Fill the rectangle in the color */
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 SDL_SetRenderDrawColor(r, g, b, 255);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 SDL_RenderFill(&rect);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 /* update screen */
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33 SDL_RenderPresent();
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 }
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37 int
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38 main(int argc, char *argv[])
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 {
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3277 diff changeset	41 SDL_Window *window;
3277 20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42 int done;
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43 SDL_Event event;
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 /* initialize SDL */
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46 if (SDL_Init(SDL_INIT_VIDEO) < 0) {
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47 fatalError("Could not initialize SDL");
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48 }
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50 /* seed random number generator */
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 srand(time(NULL));
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	53 /* create window and renderer */
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3277 diff changeset	54 window =
3277 20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 SDL_CreateWindow(NULL, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT,
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56 SDL_WINDOW_SHOWN);
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3277 diff changeset	57 if (window == 0) {
3277 20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58 fatalError("Could not initialize Window");
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59 }
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3277 diff changeset	60 if (SDL_CreateRenderer(window, -1, 0) != 0) {
3277 20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61 fatalError("Could not create renderer");
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62 }
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 /* Fill screen with black */
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65 SDL_SetRenderDrawColor(0, 0, 0, 255);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 SDL_RenderFill(NULL);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68 /* Enter render loop, waiting for user to quit */
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	69 done = 0;
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 while (!done) {
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71 while (SDL_PollEvent(&event)) {
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 if (event.type == SDL_QUIT) {
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 done = 1;
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 }
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75 }
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76 render();
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77 SDL_Delay(1);
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 }
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	79
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	80 /* shutdown SDL */
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81 SDL_Quit();
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83 return 0;
20326ba2bda2 This name inconsistency has been bugging me for a while... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 }

Mercurial > sdl-ios-xcode

annotate Xcode-iPhoneOS/Demos/src/rectangles.c @ 4425:a3e71b957215