summaryrefslogtreecommitdiff
path: root/src/video/cocoa
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2013-11-08 20:18:27 +0000
committermichi_cc <michi_cc@openttd.org>2013-11-08 20:18:27 +0000
commita298a6209831e068818540ed12c728a4fb299d1c (patch)
tree0d448aa89e9dd60876aa20c32e0b9535770d6b79 /src/video/cocoa
parent2df78944b9f69679262f0c26900887c2124eb7a8 (diff)
downloadopenttd-a298a6209831e068818540ed12c728a4fb299d1c.tar.xz
(svn r25950) -Codechange: [OSX] Move some functions used by all video sub-drivers into the common source file.
Diffstat (limited to 'src/video/cocoa')
-rw-r--r--src/video/cocoa/cocoa_v.mm74
-rw-r--r--src/video/cocoa/fullscreen.mm74
2 files changed, 74 insertions, 74 deletions
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 3f8413d03..699080d15 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -225,6 +225,80 @@ static void setupApplication()
[ NSApp setDelegate:_ottd_main ];
}
+
+static int CDECL ModeSorter(const OTTD_Point *p1, const OTTD_Point *p2)
+{
+ if (p1->x < p2->x) return -1;
+ if (p1->x > p2->x) return +1;
+ if (p1->y < p2->y) return -1;
+ if (p1->y > p2->y) return +1;
+ return 0;
+}
+
+uint QZ_ListModes(OTTD_Point *modes, uint max_modes, CGDirectDisplayID display_id, int device_depth)
+{
+ CFArrayRef mode_list = CGDisplayAvailableModes(display_id);
+ CFIndex num_modes = CFArrayGetCount(mode_list);
+
+ /* Build list of modes with the requested bpp */
+ uint count = 0;
+ for (CFIndex i = 0; i < num_modes && count < max_modes; i++) {
+ int intvalue, bpp;
+ uint16 width, height;
+
+ CFDictionaryRef onemode = (const __CFDictionary*)CFArrayGetValueAtIndex(mode_list, i);
+ CFNumberRef number = (const __CFNumber*)CFDictionaryGetValue(onemode, kCGDisplayBitsPerPixel);
+ CFNumberGetValue(number, kCFNumberSInt32Type, &bpp);
+
+ if (bpp != device_depth) continue;
+
+ number = (const __CFNumber*)CFDictionaryGetValue(onemode, kCGDisplayWidth);
+ CFNumberGetValue(number, kCFNumberSInt32Type, &intvalue);
+ width = (uint16)intvalue;
+
+ number = (const __CFNumber*)CFDictionaryGetValue(onemode, kCGDisplayHeight);
+ CFNumberGetValue(number, kCFNumberSInt32Type, &intvalue);
+ height = (uint16)intvalue;
+
+ /* Check if mode is already in the list */
+ bool hasMode = false;
+ for (uint i = 0; i < count; i++) {
+ if (modes[i].x == width && modes[i].y == height) {
+ hasMode = true;
+ break;
+ }
+ }
+
+ if (hasMode) continue;
+
+ /* Add mode to the list */
+ modes[count].x = width;
+ modes[count].y = height;
+ count++;
+ }
+
+ /* Sort list smallest to largest */
+ QSortT(modes, count, &ModeSorter);
+
+ return count;
+}
+
+/** Small function to test if the main display can display 8 bpp in fullscreen */
+bool QZ_CanDisplay8bpp()
+{
+ /* 8bpp modes are deprecated starting in 10.5. CoreGraphics will return them
+ * as available in the display list, but many features (e.g. palette animation)
+ * will be broken. */
+ if (MacOSVersionIsAtLeast(10, 5, 0)) return false;
+
+ OTTD_Point p;
+
+ /* We want to know if 8 bpp is possible in fullscreen and not anything about
+ * resolutions. Because of this we want to fill a list of 1 resolution of 8 bpp
+ * on display 0 (main) and return if we found one. */
+ return QZ_ListModes(&p, 1, 0, 8);
+}
+
/**
* Update the video modus.
*
diff --git a/src/video/cocoa/fullscreen.mm b/src/video/cocoa/fullscreen.mm
index e066adfb4..2d8472e7d 100644
--- a/src/video/cocoa/fullscreen.mm
+++ b/src/video/cocoa/fullscreen.mm
@@ -74,80 +74,6 @@ struct OTTD_QuartzGammaTable {
}
@end
-
-static int CDECL ModeSorter(const OTTD_Point *p1, const OTTD_Point *p2)
-{
- if (p1->x < p2->x) return -1;
- if (p1->x > p2->x) return +1;
- if (p1->y < p2->y) return -1;
- if (p1->y > p2->y) return +1;
- return 0;
-}
-
-uint QZ_ListModes(OTTD_Point *modes, uint max_modes, CGDirectDisplayID display_id, int device_depth)
-{
- CFArrayRef mode_list = CGDisplayAvailableModes(display_id);
- CFIndex num_modes = CFArrayGetCount(mode_list);
-
- /* Build list of modes with the requested bpp */
- uint count = 0;
- for (CFIndex i = 0; i < num_modes && count < max_modes; i++) {
- int intvalue, bpp;
- uint16 width, height;
-
- CFDictionaryRef onemode = (const __CFDictionary*)CFArrayGetValueAtIndex(mode_list, i);
- CFNumberRef number = (const __CFNumber*)CFDictionaryGetValue(onemode, kCGDisplayBitsPerPixel);
- CFNumberGetValue(number, kCFNumberSInt32Type, &bpp);
-
- if (bpp != device_depth) continue;
-
- number = (const __CFNumber*)CFDictionaryGetValue(onemode, kCGDisplayWidth);
- CFNumberGetValue(number, kCFNumberSInt32Type, &intvalue);
- width = (uint16)intvalue;
-
- number = (const __CFNumber*)CFDictionaryGetValue(onemode, kCGDisplayHeight);
- CFNumberGetValue(number, kCFNumberSInt32Type, &intvalue);
- height = (uint16)intvalue;
-
- /* Check if mode is already in the list */
- bool hasMode = false;
- for (uint i = 0; i < count; i++) {
- if (modes[i].x == width && modes[i].y == height) {
- hasMode = true;
- break;
- }
- }
-
- if (hasMode) continue;
-
- /* Add mode to the list */
- modes[count].x = width;
- modes[count].y = height;
- count++;
- }
-
- /* Sort list smallest to largest */
- QSortT(modes, count, &ModeSorter);
-
- return count;
-}
-
-/** Small function to test if the main display can display 8 bpp in fullscreen */
-bool QZ_CanDisplay8bpp()
-{
- /* 8bpp modes are deprecated starting in 10.5. CoreGraphics will return them
- * as available in the display list, but many features (e.g. palette animation)
- * will be broken. */
- if (MacOSVersionIsAtLeast(10, 5, 0)) return false;
-
- OTTD_Point p;
-
- /* We want to know if 8 bpp is possible in fullscreen and not anything about
- * resolutions. Because of this we want to fill a list of 1 resolution of 8 bpp
- * on display 0 (main) and return if we found one. */
- return QZ_ListModes(&p, 1, 0, 8);
-}
-
class FullscreenSubdriver: public CocoaSubdriver {
CGDirectDisplayID display_id; ///< 0 == main display (only support single display)
CFDictionaryRef cur_mode; ///< current mode of the display