openttd-ottdgrfs: comparison src/video/cocoa

equal deleted inserted replaced

-:70d78ac95d6c
+:7bd07f43b0e3
 * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information.
 */
 /* Portions of CPS.h */
-typedef struct CPSProcessSerNum {
+struct CPSProcessSerNum {
 	UInt32 lo;
 	UInt32 hi;
-} CPSProcessSerNum;
+};
 extern "C" OSErr CPSGetCurrentProcess(CPSProcessSerNum* psn);
 extern "C" OSErr CPSEnableForegroundOperation(CPSProcessSerNum* psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
 extern "C" OSErr CPSSetFrontProcess(CPSProcessSerNum* psn);
 /* From Menus.h (according to Xcode Developer Documentation) */
-extern "C" void ShowMenuBar(void);
+extern "C" void ShowMenuBar();
-extern "C" void HideMenuBar(void);
+extern "C" void HideMenuBar();
 /* Disables a warning. This is needed since the method exists but has been dropped from the header, supposedly as of 10.4. */
 #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
 @interface NSApplication(NSAppleMenu)
 - (void)setAppleMenu:(NSMenu *)menu;
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../macros.h"
 #include "../os/macosx/splash.h"
+#include "../variables.h"
 #include "cocoa_v.h"
 #include "cocoa_keys.h"
 #undef Point
 #undef Rect
 /* Structure for rez switch gamma fades
 * We can hide the monitor flicker by setting the gamma tables to 0
 */
 #define QZ_GAMMA_TABLE_SIZE 256
-typedef struct {
+struct OTTD_QuartzGammaTable {
 	CGGammaValue red[QZ_GAMMA_TABLE_SIZE];
 	CGGammaValue green[QZ_GAMMA_TABLE_SIZE];
 	CGGammaValue blue[QZ_GAMMA_TABLE_SIZE];
-} OTTD_QuartzGammaTable;
+};
 /* Add methods to get at private members of NSScreen.
 * Since there is a bug in Apple's screen switching code that does not update
 * this variable when switching to fullscreen, we'll set it manually (but only
 * for the main screen).
 	_frame = frame;
 }
 @end
-static void QZ_Draw(void);
+static void QZ_Draw();
-static void QZ_UnsetVideoMode(void);
+static void QZ_UnsetVideoMode();
 static void QZ_UpdatePalette(uint start, uint count);
 static void QZ_WarpCursor(int x, int y);
-static void QZ_ShowMouse(void);
+static void QZ_ShowMouse();
-static void QZ_HideMouse(void);
+static void QZ_HideMouse();
 static void CocoaVideoFullScreen(bool full_screen);
 static NSAutoreleasePool *_ottd_autorelease_pool;
 static OTTDMain *_ottd_main;
 /******************************************************************************
 *                             Game loop and accessories                      *
 ******************************************************************************/
-static uint32 GetTick(void)
+static uint32 GetTick()
 {
 	struct timeval tim;
 	gettimeofday(&tim, NULL);
 	return tim.tv_usec / 1000 + tim.tv_sec * 1000;
 }
-static void QZ_CheckPaletteAnim(void)
+static void QZ_CheckPaletteAnim()
 {
 	if (_pal_last_dirty != -1) {
 		QZ_UpdatePalette(_pal_first_dirty, _pal_last_dirty - _pal_first_dirty + 1);
 		_pal_last_dirty = -1;
 	}
 }
-typedef struct VkMapping {
+struct VkMapping {
 	unsigned short vk_from;
 	byte map_to;
-} VkMapping;
+};
 #define AS(x, z) {x, z}
 static const VkMapping _vk_mapping[] = {
 	AS(QZ_BACKQUOTE,  WKC_BACKQUOTE), // key left of '1'
 		return [ _cocoa_video_data.qdview mouse:*pt inRect:[ _cocoa_video_data.qdview bounds ] ];
 	}
 }
-static bool QZ_PollEvent(void)
+static bool QZ_PollEvent()
 {
 	NSEvent *event;
 	NSPoint pt;
 	NSString *chars;
 #ifdef _DEBUG
 			if ([ event deltaY ] > 0.0) { /* Scroll up */
 				_cursor.wheel--;
 			} else if ([ event deltaY ] < 0.0) { /* Scroll down */
 				_cursor.wheel++;
 			} /* else: deltaY was 0.0 and we don't want to do anything */
+			/* Set the scroll count for scrollwheel scrolling */
+			_cursor.h_wheel -= (int)([ event deltaX ]* 5 * _patches.scrollwheel_multiplier);
+			_cursor.v_wheel -= (int)([ event deltaY ]* 5 * _patches.scrollwheel_multiplier);
 			break;
 		default:
 			[NSApp sendEvent:event];
 	}
 	return true;
 }
-static void QZ_GameLoop(void)
+static void QZ_GameLoop()
 {
 	uint32 cur_ticks = GetTick();
 	uint32 next_tick = cur_ticks + 30;
 	uint32 pal_tick = 0;
 #ifdef _DEBUG
 		} else if (_fast_forward & 2) {
 			_fast_forward = 0;
 		}
 		cur_ticks = GetTick();
-		if (cur_ticks >= next_tick || (_fast_forward && !_pause) || cur_ticks < prev_cur_ticks) {
+		if (cur_ticks >= next_tick || (_fast_forward && !_pause_game) || cur_ticks < prev_cur_ticks) {
 			next_tick = cur_ticks + 30;
 			_ctrl_pressed = !!(_cocoa_video_data.current_mods & NSControlKeyMask);
 			_shift_pressed = !!(_cocoa_video_data.current_mods & NSShiftKeyMask);
 #ifdef _DEBUG
 /* This function makes the *game region* of the window 100% opaque.
 * The genie effect uses the alpha component. Otherwise,
 * it doesn't seem to matter what value it has.
 */
-static void QZ_SetPortAlphaOpaque(void)
+static void QZ_SetPortAlphaOpaque()
 {
 	if (_cocoa_video_data.device_bpp == 32) {
 		uint32* pixels = (uint32*)_cocoa_video_data.realpixels;
 		uint32 rowPixels = _cocoa_video_data.pitch / 4;
 		uint32 i;
 	0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1,
 	0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0,
 	1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0
 };
-static void QZ_DrawResizeIcon(void)
+static void QZ_DrawResizeIcon()
 {
 	int xoff = _cocoa_video_data.width - 16;
 	int yoff = _cocoa_video_data.height - 16;
 	int x;
 	int y;
 			}
 		}
 	}
 }
-static void QZ_DrawWindow(void)
+static void QZ_DrawWindow()
 {
 	int i;
 	RgnHandle dirty, temp;
 	/* Check if we need to do anything */
 	CGDisplaySetPalette(_cocoa_video_data.display_id, _cocoa_video_data.palette);
 }
 /* Wait for the VBL to occur (estimated since we don't have a hardware interrupt) */
-static void QZ_WaitForVerticalBlank(void)
+static void QZ_WaitForVerticalBlank()
 {
 	/* The VBL delay is based on Ian Ollmann's RezLib <iano@cco.caltech.edu> */
 	double refreshRate;
 	double linesPerSecond;
 	double target;
 	CSleep((uint32)(adjustment * 1000));
 }
-static void QZ_DrawScreen(void)
+static void QZ_DrawScreen()
 {
 	const uint8* src = _cocoa_video_data.pixels;
 	uint8* dst       = (uint8*)_cocoa_video_data.realpixels;
 	uint pitch       = _cocoa_video_data.pitch;
 	uint width       = _cocoa_video_data.width;
 	} else {
 		QZ_UpdateWindowPalette(start, count);
 	}
 }
-static void QZ_InitPalette(void)
+static void QZ_InitPalette()
 {
 	QZ_UpdatePalette(0, 256);
 }
-static void QZ_Draw(void)
+static void QZ_Draw()
 {
 	if (_cocoa_video_data.fullscreen) {
 		QZ_DrawScreen();
 	} else {
 		QZ_DrawWindow();
 	{1600, 1200},
 	{1680, 1050},
 	{1920, 1200}
 };
-static void QZ_UpdateVideoModes(void)
+static void QZ_UpdateVideoModes()
 {
 	uint i, j, count;
 	OTTDPoint modes[32];
 	const OTTDPoint *current_modes;
 	}
 	_num_resolutions = j;
 }
-static void QZ_UnsetVideoMode(void)
+static void QZ_UnsetVideoMode()
 {
 	if (_cocoa_video_data.fullscreen) {
 		/* Release fullscreen resources */
 		OTTD_QuartzGammaTable gamma_table;
 		int gamma_error;
 	if (ret != NULL && wasset) QZ_SetVideoMode(oldwidth, oldheight, oldfullscreen);
 	return ret;
 }
-static void QZ_VideoInit(void)
+static void QZ_VideoInit()
 {
 	memset(&_cocoa_video_data, 0, sizeof(_cocoa_video_data));
 	/* Initialize the video settings; this data persists between mode switches */
 	_cocoa_video_data.display_id = kCGDirectMainDisplay;
 	CGWarpMouseCursorPosition(cgp);
 	/* Generate the mouse moved event */
 }
-static void QZ_ShowMouse(void)
+static void QZ_ShowMouse()
 {
 	if (!_cocoa_video_data.cursor_visible) {
 		[ NSCursor unhide ];
 		_cocoa_video_data.cursor_visible = true;
 			UndrawMouseCursor();
 		_cursor.in_window = false;
 	}
 }
-static void QZ_HideMouse(void)
+static void QZ_HideMouse()
 {
 	if (_cocoa_video_data.cursor_visible) {
 #ifndef _DEBUG
 		[ NSCursor hide ];
 #endif
 	return NSTerminateCancel; // NSTerminateLater ?
 }
 @end
-static void setApplicationMenu(void)
+static void setApplicationMenu()
 {
 	/* warning: this code is very odd */
 	NSMenu *appleMenu;
 	NSMenuItem *menuItem;
 	NSString *title;
 	[appleMenu release];
 	[menuItem release];
 }
 /* Create a window menu */
-static void setupWindowMenu(void)
+static void setupWindowMenu()
 {
 	NSMenu* windowMenu;
 	NSMenuItem* windowMenuItem;
 	NSMenuItem* menuItem;
 	/* Finally give up our references to the objects */
 	[windowMenu release];
 	[windowMenuItem release];
 }
-static void setupApplication(void)
+static void setupApplication()
 {
 	CPSProcessSerNum PSN;
 	/* Ensure the application object is initialised */
 	[NSApplication sharedApplication];
 /******************************************************************************
 *                             Video driver interface                         *
 ******************************************************************************/
-static void CocoaVideoStop(void)
+static void CocoaVideoStop()
 {
 	if (!_cocoa_video_started) return;
 	if (_cocoa_video_data.isset) QZ_UnsetVideoMode();
 		_cocoa_video_data.dirty_rects[_cocoa_video_data.num_dirty_rects].bottom = top + height;
 	}
 	_cocoa_video_data.num_dirty_rects++;
 }
-static void CocoaVideoMainLoop(void)
+static void CocoaVideoMainLoop()
 {
 	/* Start the main event loop */
 	[NSApp run];
 }
 	if (!wasstarted) CocoaVideoStop();
 	_cocoa_video_dialog = false;
 }
-/* This is needed since OS X applications are started with the working dir set to / when double-clicked */
-void cocoaSetWorkingDirectory(void)
-{
-	char parentdir[MAXPATHLEN];
-	int chdir_ret;
-	CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
-	CFURLRef url2 = CFURLCreateCopyDeletingLastPathComponent(0, url);
-	if (CFURLGetFileSystemRepresentation(url2, true, (unsigned char*)parentdir, MAXPATHLEN)) {
-		chdir_ret = chdir(parentdir); /* chdir to the binary app's parent */
-		assert(chdir_ret == 0);
-	}
-	CFRelease(url);
-	CFRelease(url2);
-}
 /* These are called from main() to prevent a _NSAutoreleaseNoPool error when
 * exiting before the cocoa video driver has been loaded
 */
-void cocoaSetupAutoreleasePool(void)
+void cocoaSetupAutoreleasePool()
 {
 	_ottd_autorelease_pool = [[NSAutoreleasePool alloc] init];
 }
-void cocoaReleaseAutoreleasePool(void)
+void cocoaReleaseAutoreleasePool()
 {
 	[_ottd_autorelease_pool release];
 }
 #endif /* WITH_COCOA */

branch	gamebalance
changeset 9895	7bd07f43b0e3
parent 6514	634933c84aef
child 9913	e79cd19772dd