Adding upstream version 2:20.4+dfsg.upstream/2%20.4+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 245 insertions, 0 deletions

diff --git a/xbmc/windowing/osx/OpenGL/OSXGLWindow.mm b/xbmc/windowing/osx/OpenGL/OSXGLWindow.mm
new file mode 100644
index 0000000..8ee26fc
--- /dev/null
+++ b/xbmc/windowing/osx/OpenGL/OSXGLWindow.mm
@@ -0,0 +1,245 @@
+/*
+ *  Copyright (C) 2021- Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "OSXGLWindow.h"
+
+#include "ServiceBroker.h"
+#include "application/AppInboundProtocol.h"
+#include "application/AppParamParser.h"
+#include "application/Application.h"
+#include "guilib/GUIComponent.h"
+#include "guilib/GUIWindowManager.h"
+#include "messaging/ApplicationMessenger.h"
+#include "settings/DisplaySettings.h"
+#include "settings/Settings.h"
+#include "settings/SettingsComponent.h"
+#import "windowing/osx/OpenGL/OSXGLView.h"
+#include "windowing/osx/WinEventsOSX.h"
+#import "windowing/osx/WinSystemOSX.h"
+
+#include "platform/darwin/osx/CocoaInterface.h"
+
+//------------------------------------------------------------------------------------------
+@implementation OSXGLWindow
+
+@synthesize resizeState = m_resizeState;
+
+- (id)initWithContentRect:(NSRect)box styleMask:(uint)style
+{
+  self = [super initWithContentRect:box styleMask:style backing:NSBackingStoreBuffered defer:YES];
+  [self setDelegate:self];
+  [self setAcceptsMouseMovedEvents:YES];
+  // autosave the window position/size
+  // Tell the controller to not cascade its windows.
+  [self.windowController setShouldCascadeWindows:NO];
+  [self setFrameAutosaveName:@"OSXGLWindowPositionHeightWidth"];
+
+  g_application.m_AppFocused = true;
+
+  return self;
+}
+
+- (void)dealloc
+{
+  [self setDelegate:nil];
+}
+
+- (BOOL)windowShouldClose:(id)sender
+{
+  if (!g_application.m_bStop)
+    CServiceBroker::GetAppMessenger()->PostMsg(TMSG_QUIT);
+
+  return NO;
+}
+
+- (void)windowDidExpose:(NSNotification*)aNotification
+{
+  g_application.m_AppFocused = true;
+}
+
+- (void)windowDidMove:(NSNotification*)aNotification
+{
+  NSOpenGLContext* context = NSOpenGLContext.currentContext;
+  if (context)
+  {
+    if (context.view)
+    {
+      NSPoint window_origin = [[[context view] window] frame].origin;
+      XBMC_Event newEvent = {};
+      newEvent.type = XBMC_VIDEOMOVE;
+      newEvent.move.x = window_origin.x;
+      newEvent.move.y = window_origin.y;
+      std::shared_ptr<CAppInboundProtocol> appPort = CServiceBroker::GetAppPort();
+      if (appPort)
+        appPort->OnEvent(newEvent);
+    }
+  }
+}
+
+- (void)windowWillStartLiveResize:(NSNotification*)notification
+{
+  m_resizeState = true;
+}
+
+- (void)windowDidEndLiveResize:(NSNotification*)notification
+{
+  m_resizeState = false;
+  [self windowDidResize:notification];
+}
+
+- (void)windowDidResize:(NSNotification*)aNotification
+{
+  if (!m_resizeState)
+  {
+    NSRect rect = [self contentRectForFrameRect:self.frame];
+    int width = static_cast<int>(rect.size.width);
+    int height = static_cast<int>(rect.size.height);
+
+    XBMC_Event newEvent = {};
+
+    if (!CServiceBroker::GetWinSystem()->IsFullScreen())
+    {
+      RESOLUTION res_index = RES_DESKTOP;
+      if ((width == CDisplaySettings::GetInstance().GetResolutionInfo(res_index).iWidth) &&
+          (height == CDisplaySettings::GetInstance().GetResolutionInfo(res_index).iHeight))
+        return;
+
+      newEvent.type = XBMC_VIDEORESIZE;
+    }
+    else
+    {
+      // macos may trigger a resize/rescale event just after Kodi has entered fullscreen
+      // (from windowDidEndLiveResize). Kodi needs to rescale the UI - use a different event
+      // type since XBMC_VIDEORESIZE is supposed to only be used in windowed mode
+      newEvent.type = XBMC_FULLSCREEN_UPDATE;
+      newEvent.move.x = -1;
+      newEvent.move.y = -1;
+    }
+
+    newEvent.resize.w = width;
+    newEvent.resize.h = height;
+
+    // check for valid sizes cause in some cases
+    // we are hit during fullscreen transition from macos
+    // and might be technically "zero" sized
+    if (newEvent.resize.w != 0 && newEvent.resize.h != 0)
+    {
+      std::shared_ptr<CAppInboundProtocol> appPort = CServiceBroker::GetAppPort();
+      if (appPort)
+        appPort->OnEvent(newEvent);
+    }
+  }
+}
+
+- (void)windowDidChangeScreen:(NSNotification*)notification
+{
+  // user has moved the window to a
+  // different screen
+  //  if (CServiceBroker::GetWinSystem()->IsFullScreen())
+  //    CServiceBroker::GetWinSystem()->SetMovedToOtherScreen(true);
+}
+
+- (NSSize)windowWillResize:(NSWindow*)sender toSize:(NSSize)frameSize
+{
+  return frameSize;
+}
+
+- (void)windowWillEnterFullScreen:(NSNotification*)pNotification
+{
+  CWinSystemOSX* winSystem = dynamic_cast<CWinSystemOSX*>(CServiceBroker::GetWinSystem());
+  if (!winSystem)
+    return;
+
+  // if osx is the issuer of the toggle
+  // call Kodi's toggle function
+  if (!winSystem->GetFullscreenWillToggle())
+  {
+    // indicate that we are toggling
+    // flag will be reset in SetFullscreen once its
+    // called from Kodi's gui thread
+    winSystem->SetFullscreenWillToggle(true);
+
+    CServiceBroker::GetAppMessenger()->PostMsg(TMSG_TOGGLEFULLSCREEN);
+  }
+  else
+  {
+    // in this case we are just called because
+    // of Kodi did a toggle - just reset the flag
+    // we don't need to do anything else
+    winSystem->SetFullscreenWillToggle(false);
+  }
+}
+
+- (void)windowDidExitFullScreen:(NSNotification*)pNotification
+{
+  auto winSystem = dynamic_cast<CWinSystemOSX*>(CServiceBroker::GetWinSystem());
+  if (!winSystem)
+    return;
+
+  // if osx is the issuer of the toggle
+  // call Kodi's toggle function
+  if (!winSystem->GetFullscreenWillToggle())
+  {
+    // indicate that we are toggling
+    // flag will be reset in SetFullscreen once its
+    // called from Kodi's gui thread
+    winSystem->SetFullscreenWillToggle(true);
+    CServiceBroker::GetAppMessenger()->PostMsg(TMSG_TOGGLEFULLSCREEN);
+  }
+  else
+  {
+    // in this case we are just called because
+    // of Kodi did a toggle - just reset the flag
+    // we don't need to do anything else
+    winSystem->SetFullscreenWillToggle(false);
+  }
+}
+
+- (NSApplicationPresentationOptions)window:(NSWindow*)window
+      willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions
+{
+  // customize our appearance when entering full screen:
+  // we don't want the dock to appear but we want the menubar to hide/show automatically
+  //
+  return (NSApplicationPresentationFullScreen | // support full screen for this window (required)
+          NSApplicationPresentationHideDock | // completely hide the dock
+          NSApplicationPresentationAutoHideMenuBar); // yes we want the menu bar to show/hide
+}
+
+- (void)windowDidMiniaturize:(NSNotification*)aNotification
+{
+  g_application.m_AppFocused = false;
+}
+
+- (void)windowDidDeminiaturize:(NSNotification*)aNotification
+{
+  g_application.m_AppFocused = true;
+}
+
+- (void)windowDidBecomeKey:(NSNotification*)aNotification
+{
+  g_application.m_AppFocused = true;
+
+  auto winSystem = dynamic_cast<CWinSystemOSX*>(CServiceBroker::GetWinSystem());
+  if (winSystem)
+  {
+    winSystem->enableInputEvents();
+  }
+}
+
+- (void)windowDidResignKey:(NSNotification*)aNotification
+{
+  g_application.m_AppFocused = false;
+
+  auto winSystem = dynamic_cast<CWinSystemOSX*>(CServiceBroker::GetWinSystem());
+  if (winSystem)
+  {
+    winSystem->disableInputEvents();
+  }
+}
+@end