From 10a81bf217ba9b623485db40498c38fcda6add4a Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 17 May 2020 14:19:38 +0200 Subject: [PATCH] app/internal/window: [macOS] fold header files into Cgo preambles Signed-off-by: Elias Naur --- app/internal/window/gl_macos.go | 9 ++++++++- app/internal/window/gl_macos.h | 9 --------- app/internal/window/gl_macos.m | 2 -- app/internal/window/os_darwin.go | 2 +- app/internal/window/os_darwin.h | 3 --- app/internal/window/os_darwin.m | 1 - app/internal/window/os_macos.go | 12 +++++++++++- app/internal/window/os_macos.h | 17 ----------------- app/internal/window/os_macos.m | 1 - 9 files changed, 20 insertions(+), 36 deletions(-) delete mode 100644 app/internal/window/gl_macos.h delete mode 100644 app/internal/window/os_darwin.h delete mode 100644 app/internal/window/os_macos.h diff --git a/app/internal/window/gl_macos.go b/app/internal/window/gl_macos.go index 9b229ab5..e4e293de 100644 --- a/app/internal/window/gl_macos.go +++ b/app/internal/window/gl_macos.go @@ -15,7 +15,14 @@ import ( #include #include #include -#include "gl_macos.h" + +__attribute__ ((visibility ("hidden"))) CFTypeRef gio_createGLView(void); +__attribute__ ((visibility ("hidden"))) CFTypeRef gio_contextForView(CFTypeRef viewRef); +__attribute__ ((visibility ("hidden"))) void gio_makeCurrentContext(CFTypeRef ctx); +__attribute__ ((visibility ("hidden"))) void gio_flushContextBuffer(CFTypeRef ctx); +__attribute__ ((visibility ("hidden"))) void gio_clearCurrentContext(void); +__attribute__ ((visibility ("hidden"))) void gio_lockContext(CFTypeRef ctxRef); +__attribute__ ((visibility ("hidden"))) void gio_unlockContext(CFTypeRef ctxRef); */ import "C" diff --git a/app/internal/window/gl_macos.h b/app/internal/window/gl_macos.h deleted file mode 100644 index f41c0cbc..00000000 --- a/app/internal/window/gl_macos.h +++ /dev/null @@ -1,9 +0,0 @@ -// SPDX-License-Identifier: Unlicense OR MIT - -__attribute__ ((visibility ("hidden"))) CFTypeRef gio_createGLView(void); -__attribute__ ((visibility ("hidden"))) CFTypeRef gio_contextForView(CFTypeRef viewRef); -__attribute__ ((visibility ("hidden"))) void gio_makeCurrentContext(CFTypeRef ctx); -__attribute__ ((visibility ("hidden"))) void gio_flushContextBuffer(CFTypeRef ctx); -__attribute__ ((visibility ("hidden"))) void gio_clearCurrentContext(void); -__attribute__ ((visibility ("hidden"))) void gio_lockContext(CFTypeRef ctxRef); -__attribute__ ((visibility ("hidden"))) void gio_unlockContext(CFTypeRef ctxRef); diff --git a/app/internal/window/gl_macos.m b/app/internal/window/gl_macos.m index c222dff5..65fb84b6 100644 --- a/app/internal/window/gl_macos.m +++ b/app/internal/window/gl_macos.m @@ -7,8 +7,6 @@ #include #include #include -#include "os_macos.h" -#include "gl_macos.h" #include "_cgo_export.h" static void handleMouse(NSView *view, NSEvent *event, int typ, CGFloat dx, CGFloat dy) { diff --git a/app/internal/window/os_darwin.go b/app/internal/window/os_darwin.go index 5d84b47c..5b8467d6 100644 --- a/app/internal/window/os_darwin.go +++ b/app/internal/window/os_darwin.go @@ -3,7 +3,7 @@ package window /* -#include "os_darwin.h" +__attribute__ ((visibility ("hidden"))) void gio_wakeupMainThread(void); */ import "C" diff --git a/app/internal/window/os_darwin.h b/app/internal/window/os_darwin.h deleted file mode 100644 index cb56b440..00000000 --- a/app/internal/window/os_darwin.h +++ /dev/null @@ -1,3 +0,0 @@ -// SPDX-License-Identifier: Unlicense OR MIT - -__attribute__ ((visibility ("hidden"))) void gio_wakeupMainThread(void); diff --git a/app/internal/window/os_darwin.m b/app/internal/window/os_darwin.m index 8c7b6eb3..37544dfd 100644 --- a/app/internal/window/os_darwin.m +++ b/app/internal/window/os_darwin.m @@ -2,7 +2,6 @@ @import Dispatch; -#include "os_darwin.h" #include "_cgo_export.h" void gio_wakeupMainThread(void) { diff --git a/app/internal/window/os_macos.go b/app/internal/window/os_macos.go index f10ca7ab..b6f2804b 100644 --- a/app/internal/window/os_macos.go +++ b/app/internal/window/os_macos.go @@ -26,7 +26,17 @@ import ( #include -#include "os_macos.h" + +#define GIO_MOUSE_MOVE 1 +#define GIO_MOUSE_UP 2 +#define GIO_MOUSE_DOWN 3 + +__attribute__ ((visibility ("hidden"))) void gio_main(CFTypeRef viewRef, const char *title, CGFloat width, CGFloat height); +__attribute__ ((visibility ("hidden"))) CGFloat gio_viewWidth(CFTypeRef viewRef); +__attribute__ ((visibility ("hidden"))) CGFloat gio_viewHeight(CFTypeRef viewRef); +__attribute__ ((visibility ("hidden"))) void gio_setAnimating(CFTypeRef viewRef, BOOL anim); +__attribute__ ((visibility ("hidden"))) void gio_updateDisplayLink(CFTypeRef viewRef, CGDirectDisplayID dispID); +__attribute__ ((visibility ("hidden"))) CGFloat gio_getViewBackingScale(CFTypeRef viewRef); */ import "C" diff --git a/app/internal/window/os_macos.h b/app/internal/window/os_macos.h deleted file mode 100644 index 201b6d04..00000000 --- a/app/internal/window/os_macos.h +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: Unlicense OR MIT - -#ifndef _OS_MACOS_H -#define _OS_MACOS_H - -#define GIO_MOUSE_MOVE 1 -#define GIO_MOUSE_UP 2 -#define GIO_MOUSE_DOWN 3 - -__attribute__ ((visibility ("hidden"))) void gio_main(CFTypeRef viewRef, const char *title, CGFloat width, CGFloat height); -__attribute__ ((visibility ("hidden"))) CGFloat gio_viewWidth(CFTypeRef viewRef); -__attribute__ ((visibility ("hidden"))) CGFloat gio_viewHeight(CFTypeRef viewRef); -__attribute__ ((visibility ("hidden"))) void gio_setAnimating(CFTypeRef viewRef, BOOL anim); -__attribute__ ((visibility ("hidden"))) void gio_updateDisplayLink(CFTypeRef viewRef, CGDirectDisplayID dispID); -__attribute__ ((visibility ("hidden"))) CGFloat gio_getViewBackingScale(CFTypeRef viewRef); - -#endif diff --git a/app/internal/window/os_macos.m b/app/internal/window/os_macos.m index 8184e8ad..b6804a67 100644 --- a/app/internal/window/os_macos.m +++ b/app/internal/window/os_macos.m @@ -4,7 +4,6 @@ @import AppKit; -#include "os_macos.h" #include "_cgo_export.h" @interface GioDelegate : NSObject