private/kendy/coda main batch 1

.gitignore

@@ -45,6 +45,7 @@ debian/coolwsd.postinst
 common/support-public-key.hpp
 compile_commands.json
 **/gdb.txt
+macos/coolwsd/gmake-wrapper.sh
 
 # Test stuff
 systemplate
@@ -97,14 +98,14 @@ browser/compilets
 browser/typescript_js
 browser/src/layer/tile/CanvasTileWorker.js
 
-coolforkit
-coolforkitns
-coolforkit-caps
-coolforkit-nocaps
-coolforkit-ns
+/coolforkit
+/coolforkitns
+/coolforkit-caps
+/coolforkit-nocaps
+/coolforkit-ns
 connect
 lokitclient
-coolwsd
+/coolwsd
 loolwsd
 coolmount
 coolmap
@@ -207,3 +208,12 @@ autogen.input
 
 # SBOM
 collabora-online-sbom.spdx.json
+
+# Visual Studio projects for CODA-W
+windows/coda/.vs
+windows/coda/CODA/bin
+windows/coda/CODA/obj
+windows/coda/CODALib/x64
+
+# CODA-W generated files
+windows/coda/config.props

Makefile.am

@@ -106,7 +106,10 @@ if !ENABLE_DEBUG
 AM_CPPFLAGS += -DNDEBUG
 endif
 
-AM_LDFLAGS = -Wl,-E -lpam $(ZLIB_LIBS) $(ZSTD_LIBS) ${PNG_LIBS}
+AM_LDFLAGS = -lpam $(ZLIB_LIBS) $(ZSTD_LIBS) ${PNG_LIBS}
+if !ENABLE_MACOS
+AM_LDFLAGS += -Wl,-E
+endif
 
 # Clang's linker doesn't like -pthread.
 if !HAVE_CLANG
@@ -123,6 +126,12 @@ coolwsd_LDADD += ${OPENSSL_LIBS}
 coolconfig_LDADD += ${OPENSSL_LIBS}
 endif
 
+if ENABLE_MACOS
+util_platform_cpp = common/Util-macos.cpp
+else
+util_platform_cpp = common/Util-linux.cpp
+endif
+
 AM_ETAGSFLAGS = --c++-kinds=+p --fields=+iaS --extra=+q -R --totals=yes --exclude=browser/node_modules --exclude=browser/dist *
 AM_CTAGSFLAGS = $(AM_ETAGSFLAGS)
 
@@ -138,12 +147,14 @@ shared_sources = common/FileUtil.cpp \
                  common/RegexUtil.cpp \
                  common/SigUtil-server.cpp \
                  common/SpookyV2.cpp \
+                 common/Syscall.cpp \
                  common/TraceEvent.cpp \
                  common/Unit.cpp \
                  common/Unit-server.cpp \
                  common/Uri.cpp \
                  common/Util.cpp \
                  common/Util-server.cpp \
+                 $(util_platform_cpp) \
                  common/Util-unix.cpp \
                  common/ConfigUtil.cpp \
                  common/Authorization.cpp \
@@ -220,6 +231,7 @@ connect_SOURCES = tools/Connect.cpp \
                   common/StringVector.cpp \
                   common/Util.cpp \
                   common/Util-server.cpp \
+                  $(util_platform_cpp) \
                   common/Util-unix.cpp
 
 connect_LDADD = libglobals.a
@@ -232,6 +244,7 @@ lokitclient_SOURCES = common/Log.cpp \
                       common/TraceEvent.cpp \
                       common/Util.cpp \
                       common/Util-server.cpp \
+                      $(util_platform_cpp) \
                       common/Util-unix.cpp
 
 lokitclient_LDADD = libglobals.a
@@ -338,6 +351,7 @@ clientnb_SOURCES = net/clientnb.cpp \
                    common/StringVector.cpp \
                    common/Util.cpp \
                    common/Util-server.cpp \
+                   $(util_platform_cpp) \
                    common/Util-unix.cpp
 
 clientnb_LDADD = libsimd.a libglobals.a
@@ -353,6 +367,7 @@ coolbench_SOURCES = tools/Benchmark.cpp \
                     common/StringVector.cpp \
                     common/Util.cpp \
                     common/Util-server.cpp \
+                    $(util_platform_cpp) \
                     common/Util-unix.cpp \
                     common/Simd.cpp
 
@@ -447,6 +462,7 @@ shared_headers = common/Anonymizer.hpp \
                  common/StringVector.hpp \
                  common/Seccomp.hpp \
                  common/Session.hpp \
+                 common/Syscall.hpp \
                  common/Unit.hpp \
                  common/Uri.hpp \
                  common/Util.hpp \

android/lib/src/main/cpp/androidapp.cpp

@@ -54,9 +54,9 @@ JNI_OnLoad(JavaVM* vm, void*) {
     // Uncomment the following to see the logs from the core too
     //setenv("SAL_LOG", "+WARN+INFO", 0);
 #if ENABLE_DEBUG
-    Log::initialize("Mobile", "debug", false, false, {}, false, {});
+    Log::initialize("Mobile", "debug");
 #else
-    Log::initialize("Mobile", "information", false, false, {}, false, {});
+    Log::initialize("Mobile", "information");
 #endif
     return JNI_VERSION_1_6;
 }

browser/Makefile.am

@@ -690,7 +690,9 @@ define bundle_cool
 	$(if $(IS_SEPARATE),\
 		@touch $@,
 		$(QUIET_M4) m4 -PE -DIOSAPP=$(ENABLE_IOSAPP) \
+			-DMACOSAPP=$(ENABLE_MACOSAPP) \
 			-DGTKAPP=$(ENABLE_GTKAPP) \
+			-DWINDOWSAPP=$(ENABLE_WINDOWSAPP) \
 			-DANDROIDAPP=$(ENABLE_ANDROIDAPP) \
 			-DMOBILEAPPNAME="$(APP_NAME)" \
 			-DVERSION=$(COOL_VERSION) \
@@ -923,8 +925,10 @@ $(DIST_FOLDER)/cool.html: $(srcdir)/html/cool.html.m4 \
 	$(QUIET_M4) m4 -PE -I $(INTERMEDIATE_DIR) \
 	    -DBUNDLE=$(IS_BUNDLE) \
 		-DIOSAPP=$(ENABLE_IOSAPP) \
+		-DMACOSAPP=$(ENABLE_MACOSAPP) \
 		-DGTKAPP=$(ENABLE_GTKAPP) \
 		-DDEBUG=$(ENABLE_DEBUG) \
+		-DWINDOWSAPP=$(ENABLE_WINDOWSAPP) \
 		-DANDROIDAPP=$(ENABLE_ANDROIDAPP) \
 		-DEMSCRIPTENAPP=$(ENABLE_EMSCRIPTENAPP) \
 		-DMOBILEAPPNAME="$(APP_NAME)" \

browser/html/cool.html.m4

@@ -9,7 +9,9 @@ m4_dnl------------------------------------------------------------------------
 m4_dnl# Define MOBILEAPP as true if this is either for the iOS/Android app or for the gtk+ "app" testbed
 m4_define([MOBILEAPP],[])m4_dnl
 m4_ifelse(IOSAPP,[true],[m4_define([MOBILEAPP],[true])])m4_dnl
+m4_ifelse(MACOSAPP,[true],[m4_define([MOBILEAPP],[true])])m4_dnl
 m4_ifelse(GTKAPP,[true],[m4_define([MOBILEAPP],[true])])m4_dnl
+m4_ifelse(WINDOWSAPP,[true],[m4_define([MOBILEAPP],[true])])m4_dnl
 m4_ifelse(ANDROIDAPP,[true],[m4_define([MOBILEAPP],[true])])m4_dnl
 m4_dnl
 m4_dnl# FIXME: This is temporary and not what we actually eventually want.
@@ -63,7 +65,9 @@ m4_ifelse(MOBILEAPP, [true],
 
 m4_dnl# For use in conditionals in JS:
 m4_ifelse(IOSAPP, [true], [<input type="hidden" id="init-mobile-app-os-type" value="IOS" />])
+m4_ifelse(MACOSAPP, [true], [<input type="hidden" id="init-mobile-app-os-type" value="MACOS" />])
 m4_ifelse(GTKAPP, [true], [<input type="hidden" id="init-mobile-app-os-type" value="GTK" />])
+m4_ifelse(WINDOWSAPP, [true], [<input type="hidden" id="init-mobile-app-os-type" value="WINDOWS" />])
 m4_ifelse(ANDROIDAPP, [true], [<input type="hidden" id="init-mobile-app-os-type" value="ANDROID" />])
 m4_ifelse(EMSCRIPTENAPP, [true], [<input type="hidden" id="init-mobile-app-os-type" value="EMSCRIPTEN" />])
 
@@ -74,15 +78,11 @@ m4_ifelse(BUNDLE,[],
   m4_foreachq([fileCSS],[COOL_CSS],[<link rel="stylesheet" href="][m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/browser/%VERSION%/])][fileCSS" />
 ]),
 [<link rel="stylesheet" href="][m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/browser/%VERSION%/])][bundle.css" />])
-
-<!--%BRANDING_CSS%--> <!-- add your logo here -->
-m4_ifelse(IOSAPP,[true],
-  [<link rel="stylesheet" href="Branding/branding.css">])
-m4_ifelse(ANDROIDAPP,[true],
-  [<link rel="stylesheet" href="branding.css">])
-m4_ifelse(EMSCRIPTENAPP,[true],
-  [<link rel="stylesheet" href="branding.css">])
-
+m4_dnl
+m4_dnl Add branding.css for mobile apps, or the placeholder for server processing
+m4_ifelse(MOBILEAPP, [true], [<link rel="stylesheet" href="m4_ifelse(IOSAPP, [true], [Branding/])branding.css" />],
+  [<!--%BRANDING_CSS%--> <!-- add your logo here -->])
+m4_dnl
 m4_dnl Handle localization
 m4_ifelse(MOBILEAPP,[true],
   [

browser/js/global.js

@@ -1,4 +1,4 @@
-/* -*- js-indent-level: 8 -*- */
+/* -*- js-indent-level: 8; fill-column: 100 -*- */
 
 /* global Module ArrayBuffer Uint8Array _ */
 
@@ -477,6 +477,19 @@ class IOSAppInitializer extends MobileAppInitializer {
 	}
 }
 
+class MacOSAppInitializer extends MobileAppInitializer {
+	constructor() {
+		super();
+
+		window.ThisIsTheMacOSApp = true;
+		window.postMobileMessage = function(msg) { window.webkit.messageHandlers.lok.postMessage(msg); };
+		window.postMobileError   = function(msg) { window.webkit.messageHandlers.error.postMessage(msg); };
+		window.postMobileDebug   = function(msg) { window.webkit.messageHandlers.debug.postMessage(msg); };
+
+		window.userInterfaceMode = window.coolParams.get('userinterfacemode');
+	}
+}
+
 class GTKAppInitializer extends MobileAppInitializer {
 	constructor() {
 		super();
@@ -488,6 +501,24 @@ class GTKAppInitializer extends MobileAppInitializer {
 	}
 }
 
+class WindowsAppInitializer extends MobileAppInitializer {
+	constructor() {
+		super();
+
+		window.ThisIsTheWindowsApp = true;
+		window.postMobileMessage = function(msg) { window.chrome.webview.postMessage('MSG ' + msg); };
+
+		// FIXME: No registration of separate handlers in Windows WebView2, so just log
+		// errors and debug messages? Maybe instead send a JSON object with separate name
+		// and body? But then we would have to parse that JSON object from the string in C#
+		// anyway.
+		window.postMobileError   = function(msg) { window.chrome.webview.postMessage('ERR ' + msg); };
+		window.postMobileDebug   = function(msg) { window.chrome.webview.postMessage('DBG ' + msg); };
+
+		window.userInterfaceMode = window.coolParams.get('userinterfacemode');
+	}
+}
+
 class AndroidAppInitializer extends MobileAppInitializer {
 	constructor() {
 		super();
@@ -528,8 +559,12 @@ function getInitializerClass() {
 
 			if (osType === "IOS")
 				return new IOSAppInitializer();
+			else if (osType === "MACOS")
+				return new MacOSAppInitializer();
 			else if (osType === "GTK")
 				return new GTKAppInitializer();
+			else if (osType === "WINDOWS")
+				return new WindowsAppInitializer();
 			else if (osType === "ANDROID")
 				return new AndroidAppInitializer();
 			else if (osType === "EMSCRIPTEN")

browser/src/app/Socket.ts

@@ -1144,7 +1144,10 @@ class Socket {
 
 	private _extractTextImg(e: SlurpMessageEvent): void {
 		if (
-			(window.ThisIsTheiOSApp || window.ThisIsTheEmscriptenApp) &&
+			(window.ThisIsTheiOSApp ||
+				window.ThisIsTheWindowsApp ||
+				window.ThisIsTheMacOSApp ||
+				window.ThisIsTheEmscriptenApp) &&
 			typeof e.data === 'string'
 		) {
 			// Another fix for issue #5843 limit splitting on the first newline

browser/src/control/Toolbar.js

@@ -260,7 +260,7 @@ window.L.Map.include({
 	},
 
 	print: function (options) {
-		if (window.ThisIsTheiOSApp || window.ThisIsTheAndroidApp) {
+		if (window.ThisIsTheiOSApp || window.ThisIsTheAndroidApp || window.ThisIsTheMacOSApp || window.ThisIsTheWindowsApp) {
 			window.postMobileMessage('PRINT');
 		} else {
 			this.showBusy(_('Downloading...'), false);

browser/src/global.d.ts

@@ -357,6 +357,9 @@ interface Window {
 	ThisIsAMobileApp: boolean;
 	ThisIsTheEmscriptenApp: boolean;
 	ThisIsTheGtkApp: boolean;
+	ThisIsTheiOSApp: boolean;
+	ThisIsTheMacOSApp: boolean;
+	ThisIsTheWindowsApp: boolean;
 	wopiSrc: string;
 	zoteroEnabled: boolean;
 	accessToken: string;

browser/src/layer/tile/CanvasTileLayer.js

@@ -2108,6 +2108,9 @@ window.L.CanvasTileLayer = window.L.Layer.extend({
 			// when json.commandName is '.uno:RowColSelCount'.
 			if (json.commandName && json.state !== undefined) {
 				this._map.fire('commandstatechanged', json);
+				if (window.ThisIsTheMacOSApp) {
+					window.postMobileMessage('COMMANDSTATECHANGED ' + JSON.stringify(json));
+				}
 			}
 		}
 		else if (textMsg.startsWith('.uno:Context=') && this._docType === 'presentation') {
@@ -2117,7 +2120,11 @@ window.L.CanvasTileLayer = window.L.Layer.extend({
 			var index = textMsg.indexOf('=');
 			var commandName = index !== -1 ? textMsg.substr(0, index) : '';
 			var state = index !== -1 ? textMsg.substr(index + 1) : '';
-			this._map.fire('commandstatechanged', {commandName : commandName, state : state});
+			const json = {commandName : commandName, state : state};
+			this._map.fire('commandstatechanged', json);
+			if (window.ThisIsTheMacOSApp) {
+				window.postMobileMessage('COMMANDSTATECHANGED ' + JSON.stringify(json));
+			}
 		}
 	},