pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implemented Cocoa window support

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401978
This commit is contained in:
Sam Lantinga 2006-07-24 05:03:02 +00:00
parent 44f7f92b8a
commit 56c1ba8073
10 changed files with 679 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/Makefile.in
View file

@ -107,8 +107,8 @@ testwin$(EXE): $(srcdir)/testwin.c
testwm$(EXE): $(srcdir)/testwm.c
$(CC) -o $@ $? $(CFLAGS) $(LIBS)
testwm2$(EXE): $(srcdir)/testwm.c
$(CC) -o $@ $? $(CFLAGS) $(LIBS)
testwm2$(EXE): $(srcdir)/testwm2.c $(srcdir)/common.c
$(CC) -o $@ $(srcdir)/testwm2.c $(srcdir)/common.c $(CFLAGS) $(LIBS)
threadwin$(EXE): $(srcdir)/threadwin.c
$(CC) -o $@ $? $(CFLAGS) $(LIBS)

8
test/common.c
View file

@ -660,8 +660,9 @@ CommonInit(CommonState * state)
return SDL_FALSE;
}
if (state->renderdriver
|| !(state->window_flags & SDL_WINDOW_OPENGL)) {
if (!state->skip_renderer
&& (state->renderdriver
|| !(state->window_flags & SDL_WINDOW_OPENGL))) {
m = -1;
if (state->renderdriver) {
SDL_RendererInfo info;
@ -784,6 +785,9 @@ PrintEvent(SDL_Event * event)
fprintf(stderr, "Window %d lost keyboard focus",
event->window.windowID);
break;
case SDL_WINDOWEVENT_CLOSE:
fprintf(stderr, "Window %d closed", event->window.windowID);
break;
default:
fprintf(stderr, "Window %d got unknown event %d",
event->window.windowID, event->window.event);

1
test/common.h
View file

@ -33,6 +33,7 @@ typedef struct
/* Renderer info */
const char *renderdriver;
Uint32 render_flags;
SDL_bool skip_renderer;
/* Audio info */
const char *audiodriver;

86
test/testwm2.c
View file

@ -1,98 +1,56 @@
/* Simple program: Move N sprites around on the screen as fast as possible */
#include "SDL.h"
#include <stdlib.h>
#include <stdio.h>
#define NUM_WINDOWS 2
#define WINDOW_W 640
#define WINDOW_H 480
#include "common.h"
static int num_windows;
static SDL_WindowID *windows;
static CommonState *state;
/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
static void
quit(int rc)
{
if (windows) {
SDL_free(windows);
}
SDL_Quit();
CommonQuit(state);
exit(rc);
}
int
main(int argc, char *argv[])
{
int window_w, window_h;
int i, done;
SDL_Event event;
/* Initialize SDL */
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
return (1);
/* Initialize test framework */
state = CommonCreateState(argv, SDL_INIT_VIDEO);
if (!state) {
return 1;
}
state->skip_renderer = SDL_TRUE;
for (i = 1; i < argc;) {
int consumed;
num_windows = NUM_WINDOWS;
window_w = WINDOW_W;
window_h = WINDOW_H;
while (argc > 1) {
if (strcmp(argv[argc - 1], "-width") == 0) {
window_w = atoi(argv[argc]);
--argc;
} else if (strcmp(argv[argc - 1], "-height") == 0) {
window_h = atoi(argv[argc]);
--argc;
} else {
fprintf(stderr, "Usage: %s [-width] [-height]\n", argv[0]);
consumed = CommonArg(state, i);
if (consumed == 0) {
consumed = -1;
}
if (consumed < 0) {
fprintf(stderr, "Usage: %s %s", argv[0], CommonUsage(state));
quit(1);
}
i += consumed;
}
/* Create the windows */
windows = (SDL_WindowID *) SDL_malloc(num_windows * sizeof(*windows));
if (!windows) {
fprintf(stderr, "Out of memory!\n");
if (!CommonInit(state)) {
quit(2);
}
for (i = 0; i < num_windows; ++i) {
char title[32];
int x, y;
SDL_snprintf(title, sizeof(title), "testwm %d", i + 1);
if (i == 0) {
x = SDL_WINDOWPOS_CENTERED;
y = SDL_WINDOWPOS_CENTERED;
} else {
x = SDL_WINDOWPOS_UNDEFINED;
y = SDL_WINDOWPOS_UNDEFINED;
}
windows[i] =
SDL_CreateWindow(title, x, y, window_w, window_h,
SDL_WINDOW_SHOWN);
if (!windows[i]) {
fprintf(stderr, "Couldn't create window: %s\n", SDL_GetError());
quit(2);
}
}
/* Loop, blitting sprites and waiting for a keystroke */
/* Main render loop */
done = 0;
while (!done) {
/* Check for events */
while (SDL_PollEvent(&event)) {
switch (event.type) {
case SDL_KEYDOWN:
/* Any keypress quits the app... */
case SDL_QUIT:
done = 1;
break;
default:
break;
}
CommonEvent(state, &event, &done);
}
}
quit(0);
}