Make it work on mobile with autocompletion

Vorlent · May 28, 2023 · 4b79ba6 · 4b79ba6
1 parent 07b5445
commit 4b79ba6
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git a/cozycast-server/npm-website/src/private/js/MobileRemoteControls.js b/cozycast-server/npm-website/src/private/js/MobileRemoteControls.js
@@ -37,6 +37,20 @@ export const MobileRemoteControls = ({ lastRemotePosition }) => {
         });
     }
 
+    const handleCompositionend = (e) => {
+        if (!remoteInfo.value.remote) { return }
+            let key = e.data;
+            e.target.value += key;
+            if (key.length > 1) {
+                e.preventDefault();
+                sendMessage({
+                    action: 'textinput',
+                    text: key
+                });
+                return;
+            }
+    }
+
     const handleInput = (e) => {
         if (!remoteInfo.value.remote) { return }
         let key = null;
@@ -47,8 +61,8 @@ export const MobileRemoteControls = ({ lastRemotePosition }) => {
             if (key.length > 1) {
                 e.preventDefault();
                 sendMessage({
-                    action: 'paste',
-                    clipboard: key
+                    action: 'textinput',
+                    text: key
                 });
                 return;
             }
@@ -117,6 +131,7 @@ export const MobileRemoteControls = ({ lastRemotePosition }) => {
         <div className="touchpad-controls">
             <div class="textarea-wrapper">
                 <textarea autocomplete="off" autocorrect="off" spellcheck="false" autocapitalize="off" className="keyboard-input"
+                    onCompositionend={handleCompositionend}
                     onKeyDown={handleKeyDown}
                     onBeforeInput={handleInput}
                     onTouchStart={handleTextAreaClick}
@@ -137,4 +152,4 @@ export const MobileRemoteControls = ({ lastRemotePosition }) => {
             </button>
         </div>
     );
-};
+};
diff --git a/...ver/src/main/groovy/com/github/vorlent/cozycastserver/service/WebsocketRoomService.groovy b/...ver/src/main/groovy/com/github/vorlent/cozycastserver/service/WebsocketRoomService.groovy
@@ -243,6 +243,11 @@ class NextRestartAvailable {
     String time
 }
 
+class TextinputEvent {
+    String action = "textinput"
+    String text
+}
+
 class PasteEvent {
     String action = "paste"
     String clipboard
@@ -987,12 +992,19 @@ class WebsocketRoomService {
         }
     }
 
-    private void scroll(Room room, WebSocketSession session, Map jsonMessage , String username) {
+    private void scroll(Room room, WebSocketSession session, Map jsonMessage, String username) {
         if(username == room.remote) {
             sendMessage(room.worker?.websocket, new ScrollEvent(direction: jsonMessage.direction))
         }
     }
 
+    private void textinput(Room room, WebSocketSession session, Map jsonMessage, String username) {
+        if(username == room.remote) {
+            log.info jsonMessage.toString()
+            sendMessage(room.worker?.websocket, new TextinputEvent(text: jsonMessage.text));
+        }
+    }
+
     private void paste(Room room, WebSocketSession session, Map jsonMessage, String username) {
         if(username == room.remote) {
             log.info jsonMessage.toString()
@@ -1459,6 +1471,9 @@ class WebsocketRoomService {
                     case "mousedown":
                         mousedown(currentRoom, session, jsonMessage, username)
                         break;
+                    case "textinput":
+                        textinput(currentRoom, session, jsonMessage, username)
+                        break;
                     case "paste":
                         paste(currentRoom, session, jsonMessage, username)
                         break;

diff --git a/cozycast-worker/worker.lua b/cozycast-worker/worker.lua
@@ -37,6 +37,7 @@ int xdo_move_mouse(const xdo_t *xdo, int x, int y, int screen);
 int xdo_click_window(const xdo_t *xdo, Window window, int button);
 int xdo_mouse_down(const xdo_t *xdo, Window window, int button);
 int xdo_mouse_up(const xdo_t *xdo, Window window, int button);
+int xdo_enter_text_window(const xdo_t *xdo, Window window, const char *string, useconds_t delay);
 int xdo_send_keysequence_window(const xdo_t *xdo, Window window,
                     const char *keysequence, useconds_t delay);
 int xdo_send_keysequence_window_up(const xdo_t *xdo, Window window,
@@ -249,6 +250,10 @@ function worker.mouse_down(mouseX, mouseY, button)
     end
 end
 
+function worker.textinput(text)
+    libxdo.xdo_enter_text_window(xdo, 0, text, 0);
+end
+
 function worker.clipboard_write(text)
     local xclip = io.popen("xclip -selection clipboard", 'w')
     xclip:write(text or "")
@@ -338,6 +343,11 @@ function onmessage(ws, data)
         return true
     end
 
+    if data.action == "textinput" then
+        worker.textinput(data.text)
+        return true
+    end
+
     if data.action == "paste" then
         worker.clipboard_write(data.clipboard)
         return true