+20
-1
lines changedFilter options
+20
-1
lines changed Original file line number Diff line number Diff line change
@@ -107,9 +107,13 @@ static void cocoa_switch(DisplayChangeListener *dcl,
107 107
static QemuSemaphore app_started_sem;
108 108
static bool allow_events;
109 109 110 +
// xPack
111 +
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_13
110 112
static NSInteger cbchangecount = -1;
111 113
static QemuClipboardInfo *cbinfo;
112 114
static QemuEvent cbevent;
115 +
#endif
116 +
// xPack
113 117 114 118
// Utility functions to run specified code block with iothread lock held
115 119
typedef void (^CodeBlock)(void);
@@ -1805,6 +1809,8 @@ static void addRemovableDevicesMenuItems(void)
1805 1809
qapi_free_BlockInfoList(pointerToFree);
1806 1810
}
1807 1811 1812 +
// xPack
1813 +
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_13
1808 1814
@interface QemuCocoaPasteboardTypeOwner : NSObject<NSPasteboardTypeOwner>
1809 1815
@end
1810 1816
@@ -1903,6 +1909,8 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info,
1903 1909
break;
1904 1910
}
1905 1911
}
1912 +
#endif
1913 +
// xPack
1906 1914 1907 1915
/*
1908 1916
* The startup process for the OSX/Cocoa UI is complicated, because
@@ -1938,7 +1946,11 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info,
1938 1946
COCOA_DEBUG("Second thread: calling qemu_main()\n");
1939 1947
status = qemu_main(gArgc, gArgv, *_NSGetEnviron());
1940 1948
COCOA_DEBUG("Second thread: qemu_main() returned, exiting\n");
1949 +
// xPack
1950 +
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_13
1941 1951
[cbowner release];
1952 +
#endif
1953 +
// xPack
1942 1954
exit(status);
1943 1955
}
1944 1956
@@ -2055,6 +2067,8 @@ static void cocoa_refresh(DisplayChangeListener *dcl)
2055 2067
});
2056 2068
}
2057 2069 2070 +
// xPack
2071 +
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_13
2058 2072
if (cbchangecount != [[NSPasteboard generalPasteboard] changeCount]) {
2059 2073
qemu_clipboard_info_unref(cbinfo);
2060 2074
cbinfo = qemu_clipboard_info_new(&cbpeer, QEMU_CLIPBOARD_SELECTION_CLIPBOARD);
@@ -2065,6 +2079,8 @@ static void cocoa_refresh(DisplayChangeListener *dcl)
2065 2079
cbchangecount = [[NSPasteboard generalPasteboard] changeCount];
2066 2080
qemu_event_set(&cbevent);
2067 2081
}
2082 +
#endif
2083 +
// xPack
2068 2084 2069 2085
[pool release];
2070 2086
}
@@ -2105,10 +2121,13 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
2105 2121 2106 2122
// register vga output callbacks
2107 2123
register_displaychangelistener(&dcl);
2108 - 2124 +
// xPack
2125 +
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_13
2109 2126
qemu_event_init(&cbevent, false);
2110 2127
cbowner = [[QemuCocoaPasteboardTypeOwner alloc] init];
2111 2128
qemu_clipboard_peer_register(&cbpeer);
2129 +
#endif
2130 +
// xPack
2112 2131
}
2113 2132 2114 2133
static QemuDisplay qemu_display_cocoa = {
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4