Add resize support to Mac OS X port.

src/allegro/include/allegro/platform/aintosx.h

@@ -79,6 +79,9 @@
 @interface AllegroWindowDelegate : NSObject
 - (BOOL)windowShouldClose: (id)sender;
 - (void)windowDidDeminiaturize: (NSNotification *)aNotification;
+- (void)windowDidResize: (NSNotification *)aNotification;
+- (void)windowDidBecomeKey:(NSNotification *)notification;
+- (void)windowDidResignKey:(NSNotification *)notification;
 @end
 
 
@@ -180,6 +183,7 @@ AL_VAR(int, osx_skip_mouse_move);
 AL_VAR(int, osx_emulate_mouse_buttons);
 AL_VAR(NSTrackingRectTag, osx_mouse_tracking_rect);
 extern AL_METHOD(void, osx_window_close_hook, (void));
+extern AL_METHOD(void, osx_resize_callback, (RESIZE_DISPLAY_EVENT *ev));
 
 
 #endif

src/allegro/src/macosx/qzwindow.m

@@ -34,6 +34,10 @@ static BITMAP* osx_create_video_bitmap(int w, int h);
 static int osx_show_video_bitmap(BITMAP*);
 static void osx_destroy_video_bitmap(BITMAP*);
 static BITMAP* create_video_page(unsigned char*);
+static BITMAP* osx_qz_window_acknowledge_resize(void);
+
+static BITMAP *private_osx_create_screen_data(int w, int h, int color_depth);
+static void private_osx_destroy_screen_data(void);
 
 static pthread_mutex_t vsync_mutex;
 static pthread_cond_t vsync_cond;
@@ -88,7 +92,7 @@ GFX_DRIVER gfx_quartz_window =
    NULL,                         /* AL_METHOD(void, restore_video_state, (void)); */
    NULL,                         /* AL_METHOD(void, set_blender_mode, (int mode, int r, int g, int b, int a)); */
    NULL,                         /* AL_METHOD(int, fetch_mode_list, (void)); */
-   NULL,                         /* acknowledge_resize */
+   osx_qz_window_acknowledge_resize,
    0, 0,                         /* physical (not virtual!) screen size */
    TRUE,                         /* true if video memory is linear */
    0,                            /* bank size, in bytes */
@@ -198,6 +202,32 @@ static void prepare_window_for_animation(int refresh_view)
 
 
 
+- (void)windowDidResize: (NSNotification *)notification
+{
+   NSWindow *window = [notification object];
+   NSSize sz = [window contentRectForFrameRect: [window frame]].size;
+   int old_width = gfx_quartz_window.w;
+   int old_height = gfx_quartz_window.h;
+   int new_width = sz.width;
+   int new_height = sz.height;
+
+   if (osx_resize_callback &&
+       ((old_width != new_width) ||
+        (old_height != new_height))) {
+      RESIZE_DISPLAY_EVENT ev;
+      ev.old_w = old_width;
+      ev.old_h = old_height;
+      ev.new_w = new_width;
+      ev.new_h = new_height;
+      ev.is_maximized = 0;
+      ev.is_restored = 0;
+
+      osx_resize_callback(&ev);
+   }
+}
+
+
+
 /* windowDidBecomeKey:
  * Sent by the default notification center immediately after an NSWindow
  * object has become key.
@@ -477,9 +507,10 @@ static BITMAP *private_osx_qz_window_init(int w, int h, int v_w, int v_h, int co
 	}
 	
 	osx_window = [[AllegroWindow alloc] initWithContentRect: rect
-												  styleMask: NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask
+                                                      styleMask: (NSTitledWindowMask | NSClosableWindowMask |
-													backing: NSBackingStoreBuffered
+                                                                  NSMiniaturizableWindowMask | NSResizableWindowMask)
-													  defer: NO];
+                                                        backing: NSBackingStoreBuffered
+                                                          defer: NO];
 	
 	window_delegate = [[[AllegroWindowDelegate alloc] init] autorelease];
 	[osx_window setDelegate: window_delegate];
@@ -499,17 +530,10 @@ static BITMAP *private_osx_qz_window_init(int w, int h, int v_w, int v_h, int co
 	
 	set_window_title(osx_window_title);
 	[osx_window makeKeyAndOrderFront: nil];
-	
+
-	/* the last flag serves as an end of loop delimiter */
-	dirty_lines = calloc(h + 1, sizeof(char));
-	/* Mark all the window as dirty */
-	memset(dirty_lines, 1, h + 1);
-	
 	setup_direct_shifts();
-	
+
-	gfx_quartz_window.w = w;
+        private_osx_create_screen_data(w, h, color_depth);
-	gfx_quartz_window.h = h;
-	gfx_quartz_window.vid_mem = w * h * BYTES_PER_PIXEL(color_depth);
 	
 	requested_color_depth = color_depth;
 	colorconv_blitter=NULL;   
@@ -517,24 +541,7 @@ static BITMAP *private_osx_qz_window_init(int w, int h, int v_w, int v_h, int co
 	CFNumberGetValue(CFDictionaryGetValue(mode, kCGDisplayBitsPerPixel), kCFNumberSInt32Type, &desktop_depth);
 	CFNumberGetValue(CFDictionaryGetValue(mode, kCGDisplayRefreshRate), kCFNumberSInt32Type, &refresh_rate);
 	_set_current_refresh_rate(refresh_rate);
-	
+
-	pseudo_screen_pitch = w * BYTES_PER_PIXEL(color_depth);
-	pseudo_screen_addr = _AL_MALLOC(h * pseudo_screen_pitch);
-	pseudo_screen = _make_bitmap(w, h, (unsigned long) pseudo_screen_addr, &gfx_quartz_window, color_depth, pseudo_screen_pitch);
-	if (!pseudo_screen) {
-		return NULL;
-	}
-	current_video_page = pseudo_screen;
-	first_page = NULL;
-	/* create a new special vtable for the pseudo screen */
-	memcpy(&_special_vtable, &_screen_vtable, sizeof(GFX_VTABLE));
-	_special_vtable.acquire = osx_qz_acquire_win;
-	_special_vtable.release = osx_qz_release_win;
-	_special_vtable.unwrite_bank = osx_qz_unwrite_line_win;
-	memcpy(&_unspecial_vtable, _get_vtable(color_depth), sizeof(GFX_VTABLE));
-	pseudo_screen->read_bank = osx_qz_write_line_win;
-	pseudo_screen->write_bank = osx_qz_write_line_win;
-	pseudo_screen->vtable = &_special_vtable;
 	uszprintf(driver_desc, sizeof(driver_desc), uconvert_ascii("Cocoa window using QuickDraw view, %d bpp %s", tmp1),
 			  color_depth, uconvert_ascii(color_depth == desktop_depth ? "in matching" : "in fast emulation", tmp2));
 	gfx_quartz_window.desc = driver_desc;
@@ -542,11 +549,6 @@ static BITMAP *private_osx_qz_window_init(int w, int h, int v_w, int v_h, int co
 	update_region = NewRgn();
 	temp_region = NewRgn();
 	
-	osx_mouse_tracking_rect = [qd_view addTrackingRect: rect
-												 owner: NSApp
-											  userData: nil
-										  assumeInside: YES];
-	
 	osx_keyboard_focused(FALSE, 0);
 	clear_keybuf();
 	osx_gfx_mode = OSX_GFX_WINDOW;
@@ -589,18 +591,9 @@ static void osx_qz_window_exit(BITMAP *bmp)
       [osx_window close];
       osx_window = NULL;
    }
-   
+
-   if (pseudo_screen_addr) {
+   private_osx_destroy_screen_data();
-      free(pseudo_screen_addr);
+
-      pseudo_screen_addr = NULL;
-   }
-   
- 
-   if (dirty_lines) {
-      free(dirty_lines);
-      dirty_lines = NULL;
-   }
-   
    if (colorconv_blitter) {
       _release_colorconv_blitter(colorconv_blitter);
       colorconv_blitter = NULL;
@@ -811,6 +804,86 @@ static void osx_destroy_video_bitmap(BITMAP* bm)
 	}
 	// Otherwise it wasn't a video page
 }
+
+
+
+static BITMAP* osx_qz_window_acknowledge_resize(void)
+{
+   int color_depth = bitmap_color_depth(screen);
+   int w = [osx_window contentRectForFrameRect: [osx_window frame]].size.width;
+   int h = [osx_window contentRectForFrameRect: [osx_window frame]].size.height;
+   BITMAP* new_screen;
+
+   _unix_lock_mutex(osx_window_mutex);
+
+   /* destroy the screen */
+   private_osx_destroy_screen_data();
+
+   /* change the size of the view */
+   [qd_view setFrameSize: NSMakeSize(w, h)];
+
+   /* re-create the screen */
+   new_screen = private_osx_create_screen_data(w, h, color_depth);
+
+   _unix_unlock_mutex(osx_window_mutex);
+   return new_screen;
+}
+
+
+
+static BITMAP *private_osx_create_screen_data(int w, int h, int color_depth)
+{
+   /* the last flag serves as an end of loop delimiter */
+   dirty_lines = calloc(h + 1, sizeof(char));
+   /* Mark all the window as dirty */
+   memset(dirty_lines, 1, h + 1);
+
+   gfx_quartz_window.w = w;
+   gfx_quartz_window.h = h;
+   gfx_quartz_window.vid_mem = w * h * BYTES_PER_PIXEL(color_depth);
+
+   pseudo_screen_pitch = w * BYTES_PER_PIXEL(color_depth);
+   pseudo_screen_addr = _AL_MALLOC(h * pseudo_screen_pitch);
+   pseudo_screen = _make_bitmap(w, h, (unsigned long) pseudo_screen_addr, &gfx_quartz_window, color_depth, pseudo_screen_pitch);
+   if (!pseudo_screen) {
+      return NULL;
+   }
+   current_video_page = pseudo_screen;
+   first_page = NULL;
+   /* create a new special vtable for the pseudo screen */
+   memcpy(&_special_vtable, &_screen_vtable, sizeof(GFX_VTABLE));
+   _special_vtable.acquire = osx_qz_acquire_win;
+   _special_vtable.release = osx_qz_release_win;
+   _special_vtable.unwrite_bank = osx_qz_unwrite_line_win;
+   memcpy(&_unspecial_vtable, _get_vtable(color_depth), sizeof(GFX_VTABLE));
+   pseudo_screen->read_bank = osx_qz_write_line_win;
+   pseudo_screen->write_bank = osx_qz_write_line_win;
+   pseudo_screen->vtable = &_special_vtable;
+
+   osx_mouse_tracking_rect = [qd_view addTrackingRect: NSMakeRect(0, 0, w, h)
+                                                owner: NSApp
+                                             userData: nil
+                                         assumeInside: YES];
+
+   return pseudo_screen;
+}
+
+
+
+static void private_osx_destroy_screen_data(void)
+{
+   if (pseudo_screen_addr) {
+      free(pseudo_screen_addr);
+      pseudo_screen_addr = NULL;
+   }
+
+   if (dirty_lines) {
+      free(dirty_lines);
+      dirty_lines = NULL;
+   }
+}
+
+
 /* Local variables:       */
 /* c-basic-offset: 3      */
 /* indent-tabs-mode: nil  */

src/allegro/src/macosx/system.m

@@ -50,6 +50,7 @@ static void osx_sys_get_executable_name(char *, int);
 static int osx_sys_find_resource(char *, AL_CONST char *, int);
 static void osx_sys_set_window_title(AL_CONST char *);
 static int osx_sys_set_close_button_callback(void (*proc)(void));
+static int osx_sys_set_resize_callback(void (*proc)(RESIZE_DISPLAY_EVENT *ev));
 static int osx_sys_set_display_switch_mode(int mode);
 static void osx_sys_get_gfx_safe_mode(int *driver, struct GFX_MODE *mode);
 static int osx_sys_desktop_color_depth(void);
@@ -66,6 +67,7 @@ NSCursor *osx_blank_cursor = NULL;
 AllegroWindow *osx_window = NULL;
 char osx_window_title[ALLEGRO_MESSAGE_SIZE];
 void (*osx_window_close_hook)(void) = NULL;
+void (*osx_resize_callback)(RESIZE_DISPLAY_EVENT *ev) = NULL;
 int osx_gfx_mode = OSX_GFX_NONE;
 int osx_emulate_mouse_buttons = FALSE;
 int osx_window_first_expose = FALSE;
@@ -98,7 +100,7 @@ SYSTEM_DRIVER system_macosx =
    osx_sys_find_resource,
    osx_sys_set_window_title,
    osx_sys_set_close_button_callback,
-   NULL,  /* set_resize_callback */
+   osx_sys_set_resize_callback,
    osx_sys_message,
    NULL,  /* AL_METHOD(void, assert, (AL_CONST char *msg)); */
    NULL,  /* AL_METHOD(void, save_console_state, (void)); */
@@ -576,6 +578,14 @@ static int osx_sys_set_close_button_callback(void (*proc)(void))
 
 
 
+static int osx_sys_set_resize_callback(void (*proc)(RESIZE_DISPLAY_EVENT *ev))
+{
+  osx_resize_callback = proc;
+  return 0;
+}
+
+
+
 /* osx_sys_set_display_switch_mode:
  *  Sets the current display switch mode.
  */