mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(MEtal) Get rid of specialized version of ui_cocoa_window_metal.m

Browse Source
This commit is contained in:
twinaphex 2019-02-07 04:47:24 +01:00
parent 2599172831
commit 0a6c7acbd4
3 changed files with 40 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
griffin/griffin_objc.m
View File

@ -28,6 +28,7 @@
#endif
#if defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
#if defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA)
#include "../gfx/drivers_context/cocoa_gl_ctx.m"
#include "../ui/drivers/cocoa/cocoa_common.m"
@ -37,29 +38,32 @@
#endif
#if defined(HAVE_COCOATOUCH)
#if TARGET_OS_IOS
#include "../ui/drivers/cocoa/cocoatouch_menu.m"
#endif
#include "../ui/drivers/ui_cocoatouch.m"
#else
#elif defined(HAVE_COCOA)
#if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
#include "../ui/drivers/cocoa/ui_cocoa_window.m"
#endif
#if defined(HAVE_COCOA)
#include "../ui/drivers/ui_cocoa.m"
#include "../ui/drivers/cocoa/ui_cocoa_browser_window.m"
#include "../ui/drivers/cocoa/ui_cocoa_window.m"
#include "../ui/drivers/cocoa/ui_cocoa_msg_window.m"
#include "../ui/drivers/cocoa/ui_cocoa_application.m"
#elif defined(HAVE_COCOA_METAL)
#include "../ui/drivers/ui_cocoa_metal.m"
#include "../ui/drivers/cocoa/ui_cocoa_browser_window_metal.m"
#include "../ui/drivers/cocoa/ui_cocoa_window_metal.m"
#include "../ui/drivers/cocoa/ui_cocoa_msg_window_metal.m"
#include "../ui/drivers/cocoa/ui_cocoa_application_metal.m"
#endif
#endif
#endif
#ifdef HAVE_MFI
#include "../input/drivers_joypad/mfi_joypad.m"
#endif

34
ui/drivers/cocoa/ui_cocoa_window.m
View File

@ -21,7 +21,11 @@
#include <string/stdstring.h>
#if defined(HAVE_COCOA_METAL)
#include "cocoa_common_metal.h"
#elif defined(HAVE_COCOA)
#include "cocoa_common.h"
#endif
#include "../ui_cocoa.h"
#include "../../ui_companion_driver.h"
@ -32,15 +36,21 @@ static void* ui_window_cocoa_init(void)
static void ui_window_cocoa_destroy(void *data)
{
#if !defined(HAVE_COCOA_METAL)
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
CocoaView *cocoa_view = (CocoaView*)cocoa->data;
[[cocoa_view window] release];
#endif
}
static void ui_window_cocoa_set_focused(void *data)
{
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
#if defined(HAVE_COCOA_METAL)
CocoaView *cocoa_view = (CocoaView*)cocoa->data;
#elif defined(HAVE_COCOA)
CocoaView *cocoa_view = (BRIDGE CocoaView*)cocoa->data;
#endif
[[cocoa_view window] makeKeyAndOrderFront:nil];
}
@ -48,7 +58,11 @@ static void ui_window_cocoa_set_visible(void *data,
bool set_visible)
{
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
#if defined(HAVE_COCOA_METAL)
CocoaView *cocoa_view = (BRIDGE CocoaView*)cocoa->data;
#elif defined(HAVE_COCOA)
CocoaView *cocoa_view = (CocoaView*)cocoa->data;
#endif
if (set_visible)
[[cocoa_view window] makeKeyAndOrderFront:nil];
else
@ -58,7 +72,11 @@ static void ui_window_cocoa_set_visible(void *data,
static void ui_window_cocoa_set_title(void *data, char *buf)
{
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
#if defined(HAVE_COCOA_METAL)
CocoaView *cocoa_view = (BRIDGE CocoaView*)cocoa->data;
#else
CocoaView *cocoa_view = (CocoaView*)cocoa->data;
#endif
const char* const text = buf; /* < Can't access buffer directly in the block */
[[cocoa_view window] setTitle:[NSString stringWithCString:text encoding:NSUTF8StringEncoding]];
}
@ -66,11 +84,19 @@ static void ui_window_cocoa_set_title(void *data, char *buf)
static void ui_window_cocoa_set_droppable(void *data, bool droppable)
{
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
#if defined(HAVE_COCOA_METAL)
CocoaView *cocoa_view = (BRIDGE CocoaView*)cocoa->data;
#else
CocoaView *cocoa_view = (CocoaView*)cocoa->data;
#endif
if (droppable)
{
#if defined(HAVE_COCOA_METAL)
[[cocoa_view window] registerForDraggedTypes:@[NSPasteboardTypeColor, NSPasteboardTypeFileURL]];
#elif defined(HAVE_COCOA)
[[cocoa_view window] registerForDraggedTypes:[NSArray arrayWithObjects:NSColorPboardType, NSFilenamesPboardType, nil]];
#endif
}
else
{
@ -81,10 +107,12 @@ static void ui_window_cocoa_set_droppable(void *data, bool droppable)
static bool ui_window_cocoa_focused(void *data)
{
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
#if defined(HAVE_COCOA_METAL)
CocoaView *cocoa_view = (BRIDGE CocoaView*)cocoa->data;
#else
CocoaView *cocoa_view = (CocoaView*)cocoa->data;
if ([[cocoa_view window] isMainWindow] == YES)
return true;
return false;
#endif
return cocoa_view.window.isMainWindow;
}
ui_window_t ui_window_cocoa = {

94
ui/drivers/cocoa/ui_cocoa_window_metal.m
View File

@ -1,94 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2017 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <boolean.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <string/stdstring.h>
#include "cocoa_common_metal.h"
#include "../ui_cocoa.h"
#include "../../ui_companion_driver.h"
static void* ui_window_cocoa_init(void)
{
return NULL;
}
static void ui_window_cocoa_destroy(void *data)
{
}
static void ui_window_cocoa_set_focused(void *data)
{
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
CocoaView *cocoa_view = (BRIDGE CocoaView*)cocoa->data;
[[cocoa_view window] makeKeyAndOrderFront:nil];
}
static void ui_window_cocoa_set_visible(void *data,
bool set_visible)
{
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
CocoaView *cocoa_view = (BRIDGE CocoaView*)cocoa->data;
if (set_visible)
[[cocoa_view window] makeKeyAndOrderFront:nil];
else
[[cocoa_view window] orderOut:nil];
}
static void ui_window_cocoa_set_title(void *data, char *buf)
{
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
CocoaView *cocoa_view = (BRIDGE CocoaView*)cocoa->data;
const char* const text = buf; /* < Can't access buffer directly in the block */
[[cocoa_view window] setTitle:[NSString stringWithCString:text encoding:NSUTF8StringEncoding]];
}
static void ui_window_cocoa_set_droppable(void *data, bool droppable)
{
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
CocoaView *cocoa_view = (BRIDGE CocoaView*)cocoa->data;
if (droppable)
{
[[cocoa_view window] registerForDraggedTypes:@[NSPasteboardTypeColor, NSPasteboardTypeFileURL]];
}
else
{
[[cocoa_view window] unregisterDraggedTypes];
}
}
static bool ui_window_cocoa_focused(void *data)
{
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
CocoaView *cocoa_view = (BRIDGE CocoaView*)cocoa->data;
return cocoa_view.window.isMainWindow;
}
ui_window_t ui_window_cocoa = {
ui_window_cocoa_init,
ui_window_cocoa_destroy,
ui_window_cocoa_set_focused,
ui_window_cocoa_set_visible,
ui_window_cocoa_set_title,
ui_window_cocoa_set_droppable,
ui_window_cocoa_focused,
"cocoa"
};