Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Cleanup from the Android commit

  • Loading branch information
slouken committed Aug 22, 2010
1 parent 9d8976e commit 6169c3167e5c34019f74de5330ca9a54ca124bb5
Showing with 3 additions and 14 deletions.
  1. +0 −11 src/SDL_compat.c
  2. +3 −3 src/events/SDL_keyboard.c
@@ -639,29 +639,18 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)

/* If we're in OpenGL mode, just create a stub surface and we're done! */
if (flags & SDL_OPENGL) {

printf("1\n");

SDL_VideoContext = SDL_GL_CreateContext(SDL_VideoWindow);
if (!SDL_VideoContext) {
return NULL;
}


printf("2\n");

if (SDL_GL_MakeCurrent(SDL_VideoWindow, SDL_VideoContext) < 0) {
return NULL;
}

printf("3\n");
SDL_VideoSurface =
SDL_CreateRGBSurfaceFrom(NULL, width, height, bpp, 0, 0, 0, 0, 0);
if (!SDL_VideoSurface) {
return NULL;
}

printf("4\n");
SDL_VideoSurface->flags |= surface_flags;
SDL_PublicSurface = SDL_VideoSurface;
return SDL_PublicSurface;
@@ -729,7 +729,7 @@ SDL_SendKeyboardKey(Uint8 state, SDL_scancode scancode)
break;
default:
/* Invalid state -- bail */
return 2;
return 0;
}

/* Drop events that don't change state */
@@ -738,14 +738,14 @@ SDL_SendKeyboardKey(Uint8 state, SDL_scancode scancode)
#if 0
printf("Keyboard event didn't change state - dropped!\n");
#endif
return 3;
return 0;
}

/* Update internal keyboard state */
keyboard->keystate[scancode] = state;

/* Post the event, if desired */
posted = 4;
posted = 0;
if (SDL_GetEventState(type) == SDL_ENABLE) {
SDL_Event event;
event.key.type = type;

0 comments on commit 6169c31

Please sign in to comment.