From a7b1523b455bf7b9c3bc06e03ed5051498db8082 Mon Sep 17 00:00:00 2001 From: Morc - Richard Gráčik Date: Sat, 17 Jun 2023 10:02:13 +0200 Subject: fix clipboard pasting on macOS just checks for __APPLE__ definition and changes the mask accordingly --- src/components/chatinput.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp index d19ac4b..28ed1ea 100644 --- a/src/components/chatinput.cpp +++ b/src/components/chatinput.cpp @@ -41,9 +41,15 @@ bool ChatInputText::ProcessKeyPress(GdkEventKey *event) { return true; } +#ifdef __APPLE__ + if ((event->state & GDK_MOD2_MASK) && event->keyval == GDK_KEY_v) { + return CheckHandleClipboardPaste(); + } +#else if ((event->state & GDK_CONTROL_MASK) && event->keyval == GDK_KEY_v) { return CheckHandleClipboardPaste(); } +#endif if (event->keyval == GDK_KEY_Return) { if (event->state & GDK_SHIFT_MASK) -- cgit v1.2.3 From 734ffc9f715a83372dc88c943b1252dd78da4754 Mon Sep 17 00:00:00 2001 From: Morc - Richard Gráčik Date: Sat, 17 Jun 2023 10:29:07 +0200 Subject: add CoreFoundation, CoreAudio and AudioToolbox to CMakeLists required to make audio working on macOS --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4fdf7a..de97c32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,6 +150,13 @@ if (ENABLE_VOICE) target_link_libraries(abaddon PkgConfig::libsodium) target_link_libraries(abaddon ${CMAKE_DL_LIBS}) + + if(APPLE) + target_link_libraries(abaddon "-framework CoreFoundation") + target_link_libraries(abaddon "-framework CoreAudio") + target_link_libraries(abaddon "-framework AudioToolbox") + endif() + endif () if (${ENABLE_NOTIFICATION_SOUNDS}) -- cgit v1.2.3 From 418b158d4714b57f4ee7de1ace5c2a950c008cee Mon Sep 17 00:00:00 2001 From: Morc - Richard Gráčik Date: Sat, 17 Jun 2023 10:30:01 +0200 Subject: Add MA_NO_RUNTIME_LINKING for macOS --- src/audio/ma_impl.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/audio/ma_impl.cpp b/src/audio/ma_impl.cpp index a83ddaf..531b24f 100644 --- a/src/audio/ma_impl.cpp +++ b/src/audio/ma_impl.cpp @@ -1,4 +1,7 @@ #ifdef WITH_MINIAUDIO #define MINIAUDIO_IMPLEMENTATION + #ifdef __APPLE__ + #define MA_NO_RUNTIME_LINKING + #endif #include #endif -- cgit v1.2.3