summaryrefslogtreecommitdiff
path: root/src/video/cocoa
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2011-10-04 21:35:40 +0000
committermichi_cc <michi_cc@openttd.org>2011-10-04 21:35:40 +0000
commit6dbb050a32122209497d9b41c373b3b759602883 (patch)
treed4a463d465885f4eb4f376ac548f71d68b09995b /src/video/cocoa
parent12e28de8187808b166541ee8fa339e38037538fd (diff)
downloadopenttd-6dbb050a32122209497d9b41c373b3b759602883.tar.xz
(svn r22999) -Codechange: Allow changing the blitter during the running game.
Diffstat (limited to 'src/video/cocoa')
-rw-r--r--src/video/cocoa/cocoa_v.h7
-rw-r--r--src/video/cocoa/cocoa_v.mm12
-rw-r--r--src/video/cocoa/fullscreen.mm35
-rw-r--r--src/video/cocoa/wnd_quartz.mm24
-rw-r--r--src/video/cocoa/wnd_quickdraw.mm26
5 files changed, 61 insertions, 43 deletions
diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h
index cf8867b0d..157b285c8 100644
--- a/src/video/cocoa/cocoa_v.h
+++ b/src/video/cocoa/cocoa_v.h
@@ -47,6 +47,11 @@ public:
*/
/* virtual */ bool ToggleFullscreen(bool fullscreen);
+ /** Callback invoked after the blitter was changed.
+ * @return True if no error.
+ */
+ /* virtual */ bool AfterBlitterChange();
+
/** Return driver name
* @return driver name
*/
@@ -123,7 +128,7 @@ public:
* @param h New window height
* @return Whether change was successful
*/
- virtual bool ChangeResolution(int w, int h) = 0;
+ virtual bool ChangeResolution(int w, int h, int bpp) = 0;
/** Are we in fullscreen mode
* @return whether fullscreen mode is currently used
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 6e5988c91..3b85f9e8b 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -400,7 +400,7 @@ bool VideoDriver_Cocoa::ChangeResolution(int w, int h)
{
assert(_cocoa_subdriver != NULL);
- bool ret = _cocoa_subdriver->ChangeResolution(w, h);
+ bool ret = _cocoa_subdriver->ChangeResolution(w, h, BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth());
QZ_GameSizeChanged();
QZ_UpdateVideoModes();
@@ -444,6 +444,16 @@ bool VideoDriver_Cocoa::ToggleFullscreen(bool full_screen)
}
/**
+ * Callback invoked after the blitter was changed.
+ *
+ * @return True if no error.
+ */
+bool VideoDriver_Cocoa::AfterBlitterChange()
+{
+ return this->ChangeResolution(_screen.width, _screen.height);
+}
+
+/**
* Catch asserts prior to initialization of the videodriver.
*
* @param title Window title.
diff --git a/src/video/cocoa/fullscreen.mm b/src/video/cocoa/fullscreen.mm
index 6eea3d64b..db793a6b1 100644
--- a/src/video/cocoa/fullscreen.mm
+++ b/src/video/cocoa/fullscreen.mm
@@ -250,7 +250,7 @@ class FullscreenSubdriver: public CocoaSubdriver {
}
- bool SetVideoMode(int w, int h)
+ bool SetVideoMode(int w, int h, int bpp)
{
/* Define this variables at the top (against coding style) because
* otherwise GCC 4.2 barfs at the goto's jumping over variable initialization. */
@@ -266,14 +266,14 @@ class FullscreenSubdriver: public CocoaSubdriver {
/* See if requested mode exists */
boolean_t exact_match;
- this->cur_mode = CGDisplayBestModeForParameters(this->display_id, this->device_depth, w, h, &exact_match);
+ this->cur_mode = CGDisplayBestModeForParameters(this->display_id, bpp, w, h, &exact_match);
/* If the mode wasn't an exact match, check if it has the right bpp, and update width and height */
if (!exact_match) {
- int bpp;
+ int act_bpp;
CFNumberRef number = (const __CFNumber*) CFDictionaryGetValue(this->cur_mode, kCGDisplayBitsPerPixel);
- CFNumberGetValue(number, kCFNumberSInt32Type, &bpp);
- if (bpp != this->device_depth) {
+ CFNumberGetValue(number, kCFNumberSInt32Type, &act_bpp);
+ if (act_bpp != bpp) {
DEBUG(driver, 0, "Failed to find display resolution");
goto ERR_NO_MATCH;
}
@@ -323,6 +323,7 @@ class FullscreenSubdriver: public CocoaSubdriver {
this->device_width = CGDisplayPixelsWide(this->display_id);
this->device_height = CGDisplayPixelsHigh(this->display_id);
+ this->device_depth = bpp;
/* Setup double-buffer emulation */
this->pixel_buffer = malloc(this->device_width * this->device_height * this->device_depth / 8);
@@ -418,22 +419,18 @@ ERR_NO_MATCH:
}
public:
- FullscreenSubdriver(int bpp)
+ FullscreenSubdriver()
{
- if (bpp != 8 && bpp != 32) {
- error("Cocoa: This video driver only supports 8 and 32 bpp blitters.");
- }
-
/* Initialize the video settings; this data persists between mode switches */
this->display_id = kCGDirectMainDisplay;
this->save_mode = CGDisplayCurrentMode(this->display_id);
- if (bpp == 8) this->palette = CGPaletteCreateDefaultColorPalette();
+ this->palette = CGPaletteCreateDefaultColorPalette();
this->device_width = CGDisplayPixelsWide(this->display_id);
this->device_height = CGDisplayPixelsHigh(this->display_id);
- this->device_depth = bpp;
- this->pixel_buffer = NULL;
+ this->device_depth = 0;
+ this->pixel_buffer = NULL;
this->num_dirty_rects = MAX_DIRTY_RECTS;
}
@@ -512,14 +509,16 @@ public:
return QZ_ListModes(modes, max_modes, this->display_id, this->device_depth);
}
- virtual bool ChangeResolution(int w, int h)
+ virtual bool ChangeResolution(int w, int h, int bpp)
{
int old_width = this->device_width;
int old_height = this->device_height;
+ int old_bpp = this->device_depth;
- if (SetVideoMode(w, h)) return true;
+ if (bpp != 8 && bpp != 32) error("Cocoa: This video driver only supports 8 and 32 bpp blitters.");
- if (old_width != 0 && old_height != 0) SetVideoMode(old_width, old_height);
+ if (SetVideoMode(w, h, bpp)) return true;
+ if (old_width != 0 && old_height != 0) SetVideoMode(old_width, old_height, old_bpp);
return false;
}
@@ -583,9 +582,9 @@ CocoaSubdriver *QZ_CreateFullscreenSubdriver(int width, int height, int bpp)
return NULL;
}
- FullscreenSubdriver *ret = new FullscreenSubdriver(bpp);
+ FullscreenSubdriver *ret = new FullscreenSubdriver();
- if (!ret->ChangeResolution(width, height)) {
+ if (!ret->ChangeResolution(width, height, bpp)) {
delete ret;
return NULL;
}
diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm
index 0559b5c40..1fb85e011 100644
--- a/src/video/cocoa/wnd_quartz.mm
+++ b/src/video/cocoa/wnd_quartz.mm
@@ -63,10 +63,10 @@ private:
void BlitIndexedToView32(int left, int top, int right, int bottom);
virtual void GetDeviceInfo();
- virtual bool SetVideoMode(int width, int height);
+ virtual bool SetVideoMode(int width, int height, int bpp);
public:
- WindowQuartzSubdriver(int bpp);
+ WindowQuartzSubdriver();
virtual ~WindowQuartzSubdriver();
virtual void Draw(bool force_update);
@@ -75,7 +75,7 @@ public:
virtual uint ListModes(OTTD_Point *modes, uint max_modes);
- virtual bool ChangeResolution(int w, int h);
+ virtual bool ChangeResolution(int w, int h, int bpp);
virtual bool IsFullscreen() { return false; }
virtual bool ToggleFullscreen(); /* Full screen mode on OSX 10.7 */
@@ -248,7 +248,7 @@ bool WindowQuartzSubdriver::ToggleFullscreen()
#endif
}
-bool WindowQuartzSubdriver::SetVideoMode(int width, int height)
+bool WindowQuartzSubdriver::SetVideoMode(int width, int height, int bpp)
{
this->setup = true;
this->GetDeviceInfo();
@@ -337,6 +337,7 @@ bool WindowQuartzSubdriver::SetVideoMode(int width, int height)
this->window_width = width;
this->window_height = height;
+ this->buffer_depth = bpp;
[ this->window center ];
@@ -381,11 +382,11 @@ void WindowQuartzSubdriver::BlitIndexedToView32(int left, int top, int right, in
}
-WindowQuartzSubdriver::WindowQuartzSubdriver(int bpp)
+WindowQuartzSubdriver::WindowQuartzSubdriver()
{
this->window_width = 0;
this->window_height = 0;
- this->buffer_depth = bpp;
+ this->buffer_depth = 0;
this->window_buffer = NULL;
this->pixel_buffer = NULL;
this->active = false;
@@ -481,13 +482,14 @@ uint WindowQuartzSubdriver::ListModes(OTTD_Point *modes, uint max_modes)
return QZ_ListModes(modes, max_modes, kCGDirectMainDisplay, this->buffer_depth);
}
-bool WindowQuartzSubdriver::ChangeResolution(int w, int h)
+bool WindowQuartzSubdriver::ChangeResolution(int w, int h, int bpp)
{
int old_width = this->window_width;
int old_height = this->window_height;
+ int old_bpp = this->buffer_depth;
- if (this->SetVideoMode(w, h)) return true;
- if (old_width != 0 && old_height != 0) this->SetVideoMode(old_width, old_height);
+ if (this->SetVideoMode(w, h, bpp)) return true;
+ if (old_width != 0 && old_height != 0) this->SetVideoMode(old_width, old_height, old_bpp);
return false;
}
@@ -599,9 +601,9 @@ CocoaSubdriver *QZ_CreateWindowQuartzSubdriver(int width, int height, int bpp)
return NULL;
}
- WindowQuartzSubdriver *ret = new WindowQuartzSubdriver(bpp);
+ WindowQuartzSubdriver *ret = new WindowQuartzSubdriver();
- if (!ret->ChangeResolution(width, height)) {
+ if (!ret->ChangeResolution(width, height, bpp)) {
delete ret;
return NULL;
}
diff --git a/src/video/cocoa/wnd_quickdraw.mm b/src/video/cocoa/wnd_quickdraw.mm
index 849aae1bb..b8eafc620 100644
--- a/src/video/cocoa/wnd_quickdraw.mm
+++ b/src/video/cocoa/wnd_quickdraw.mm
@@ -81,10 +81,10 @@ private:
void DrawResizeIcon();
virtual void GetDeviceInfo();
- virtual bool SetVideoMode(int width, int height);
+ virtual bool SetVideoMode(int width, int height, int bpp);
public:
- WindowQuickdrawSubdriver(int bpp);
+ WindowQuickdrawSubdriver();
virtual ~WindowQuickdrawSubdriver();
virtual void Draw(bool force_update);
@@ -93,7 +93,7 @@ public:
virtual uint ListModes(OTTD_Point *modes, uint max_modes);
- virtual bool ChangeResolution(int w, int h);
+ virtual bool ChangeResolution(int w, int h, int bpp);
virtual bool IsFullscreen() { return false; }
@@ -152,12 +152,12 @@ void WindowQuickdrawSubdriver::GetDeviceInfo()
kCFNumberSInt32Type, &this->device_height);
}
-bool WindowQuickdrawSubdriver::SetVideoMode(int width, int height)
+bool WindowQuickdrawSubdriver::SetVideoMode(int width, int height, int bpp)
{
this->setup = true;
this->GetDeviceInfo();
- if (this->buffer_depth > this->device_depth) {
+ if (bpp > this->device_depth) {
DEBUG(driver, 0, "Cannot use a blitter with a higer screen depth than the display when running in windowed mode.");
this->setup = false;
return false;
@@ -217,6 +217,7 @@ bool WindowQuickdrawSubdriver::SetVideoMode(int width, int height)
/* Update again */
this->window_width = width;
this->window_height = height;
+ this->buffer_depth = bpp;
[ this->window center ];
@@ -335,11 +336,11 @@ void WindowQuickdrawSubdriver::DrawResizeIcon()
}
-WindowQuickdrawSubdriver::WindowQuickdrawSubdriver(int bpp)
+WindowQuickdrawSubdriver::WindowQuickdrawSubdriver()
{
this->window_width = 0;
this->window_height = 0;
- this->buffer_depth = bpp;
+ this->buffer_depth = 0;
this->pixel_buffer = NULL;
this->active = false;
this->setup = false;
@@ -440,14 +441,15 @@ uint WindowQuickdrawSubdriver::ListModes(OTTD_Point *modes, uint max_modes)
return QZ_ListModes(modes, max_modes, kCGDirectMainDisplay, this->buffer_depth);
}
-bool WindowQuickdrawSubdriver::ChangeResolution(int w, int h)
+bool WindowQuickdrawSubdriver::ChangeResolution(int w, int h, int bpp)
{
int old_width = this->window_width;
int old_height = this->window_height;
+ int old_bpp = this->buffer_depth;
- if (this->SetVideoMode(w, h)) return true;
+ if (this->SetVideoMode(w, h, bpp)) return true;
- if (old_width != 0 && old_height != 0) this->SetVideoMode(old_width, old_height);
+ if (old_width != 0 && old_height != 0) this->SetVideoMode(old_width, old_height, old_bpp);
return false;
}
@@ -544,9 +546,9 @@ CocoaSubdriver *QZ_CreateWindowQuickdrawSubdriver(int width, int height, int bpp
return NULL;
}
- ret = new WindowQuickdrawSubdriver(bpp);
+ ret = new WindowQuickdrawSubdriver();
- if (!ret->ChangeResolution(width, height)) {
+ if (!ret->ChangeResolution(width, height, bpp)) {
delete ret;
return NULL;
}