Implemented Cocoa window support

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401978

src/video/SDL_video.c

@@ -1282,7 +1282,6 @@ SDL_DestroyWindow(SDL_WindowID windowID)
             if (window->title) {
                 SDL_free(window->title);
             }
-            SDL_free(window);
             if (j != display->num_windows - 1) {
                 SDL_memcpy(&display->windows[i],
                            &display->windows[i + 1],

src/video/cocoa/SDL_cocoavideo.h

@@ -34,8 +34,8 @@
 #include "SDL_cocoamouse.h"
 /*
 #include "SDL_cocoaopengl.h"
-#include "SDL_cocoawindow.h"
 */
+#include "SDL_cocoawindow.h"
 
 /* Private display data */
 

src/video/cocoa/SDL_cocoavideo.m

@@ -73,7 +73,6 @@ Cocoa_CreateDevice(int devindex)
     device->SetDisplayMode = Cocoa_SetDisplayMode;
     device->PumpEvents = Cocoa_PumpEvents;
 
-    /*
     device->CreateWindow = Cocoa_CreateWindow;
     device->CreateWindowFrom = Cocoa_CreateWindowFrom;
     device->SetWindowTitle = Cocoa_SetWindowTitle;
@@ -88,6 +87,7 @@ Cocoa_CreateDevice(int devindex)
     device->SetWindowGrab = Cocoa_SetWindowGrab;
     device->DestroyWindow = Cocoa_DestroyWindow;
     device->GetWindowWMInfo = Cocoa_GetWindowWMInfo;
+    /*
 #ifdef SDL_VIDEO_OPENGL
     device->GL_LoadLibrary = Cocoa_GL_LoadLibrary;
     device->GL_GetProcAddress = Cocoa_GL_GetProcAddress;

src/video/cocoa/SDL_cocoawindow.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_cocoawindow_h
+#define _SDL_cocoawindow_h
+
+typedef struct SDL_WindowData SDL_WindowData;
+
+@interface Cocoa_WindowListener:NSResponder {
+    SDL_WindowData *_data;
+}
+
+-(void) listen:(SDL_WindowData *) data;
+-(void) close;
+
+/* Window delegate functionality */
+-(BOOL) windowShouldClose:(id) sender;
+-(void) windowDidExpose:(NSNotification *) aNotification;
+-(void) windowDidMove:(NSNotification *) aNotification;
+-(void) windowDidResize:(NSNotification *) aNotification;
+-(void) windowDidMiniaturize:(NSNotification *) aNotification;
+-(void) windowDidDeminiaturize:(NSNotification *) aNotification;
+-(void) windowDidBecomeKey:(NSNotification *) aNotification;
+-(void) windowDidResignKey:(NSNotification *) aNotification;
+-(void) windowDidHide:(NSNotification *) aNotification;
+-(void) windowDidUnhide:(NSNotification *) aNotification;
+
+/* Window event handling */
+-(void) mouseDown:(NSEvent *) theEvent;
+-(void) rightMouseDown:(NSEvent *) theEvent;
+-(void) otherMouseDown:(NSEvent *) theEvent;
+-(void) mouseUp:(NSEvent *) theEvent;
+-(void) rightMouseUp:(NSEvent *) theEvent;
+-(void) otherMouseUp:(NSEvent *) theEvent;
+-(void) mouseMoved:(NSEvent *) theEvent;
+-(void) scrollWheel:(NSEvent *) theEvent;
+-(void) mouseEntered:(NSEvent *) theEvent;
+-(void) mouseExited:(NSEvent *) theEvent;
+-(void) keyDown:(NSEvent *) theEvent;
+-(void) keyUp:(NSEvent *) theEvent;
+@end struct SDL_WindowData
+{
+    SDL_WindowID windowID;
+    NSWindow *window;
+    BOOL created;
+    Cocoa_WindowListener *listener;
+    struct SDL_VideoData *videodata;
+};
+
+extern int Cocoa_CreateWindow(_THIS, SDL_Window * window);
+extern int Cocoa_CreateWindowFrom(_THIS, SDL_Window * window,
+                                  const void *data);
+extern void Cocoa_SetWindowTitle(_THIS, SDL_Window * window);
+extern void Cocoa_SetWindowPosition(_THIS, SDL_Window * window);
+extern void Cocoa_SetWindowSize(_THIS, SDL_Window * window);
+extern void Cocoa_ShowWindow(_THIS, SDL_Window * window);
+extern void Cocoa_HideWindow(_THIS, SDL_Window * window);
+extern void Cocoa_RaiseWindow(_THIS, SDL_Window * window);
+extern void Cocoa_MaximizeWindow(_THIS, SDL_Window * window);
+extern void Cocoa_MinimizeWindow(_THIS, SDL_Window * window);
+extern void Cocoa_RestoreWindow(_THIS, SDL_Window * window);
+extern void Cocoa_SetWindowGrab(_THIS, SDL_Window * window);
+extern void Cocoa_DestroyWindow(_THIS, SDL_Window * window);
+extern SDL_bool Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window,
+                                      struct SDL_SysWMinfo *info);
+
+#endif /* _SDL_cocoawindow_h */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/win32/SDL_win32window.h

@@ -24,9 +24,6 @@
 #ifndef _SDL_win32window_h
 #define _SDL_win32window_h
 
-#include "../SDL_sysvideo.h"
-#include "SDL_win32video.h"
-
 typedef struct
 {
     SDL_WindowID windowID;

test/Makefile.in

@@ -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)

test/common.c

@@ -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);

test/common.h

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

test/testwm2.c

-/* 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]);
-            quit(1);
-        }
+        consumed = CommonArg(state, i);
+        if (consumed == 0) {
+            consumed = -1;
         }
-
-    /* Create the windows */
-    windows = (SDL_WindowID *) SDL_malloc(num_windows * sizeof(*windows));
-    if (!windows) {
-        fprintf(stderr, "Out of memory!\n");
-        quit(2);
+        if (consumed < 0) {
+            fprintf(stderr, "Usage: %s %s", argv[0], CommonUsage(state));
+            quit(1);
         }
-    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;
+        i += consumed;
     }
-        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());
+    if (!CommonInit(state)) {
         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);
 }