Make EAF support Wayland native.

Author: manateelazycat

Diff for: core/view.py

@@ -35,7 +35,9 @@ def __init__(self, buffer, view_info):
         self.buffer = buffer
 
         # Init widget attributes.
-        if get_emacs_func_result("eaf-emacs-not-use-reparent-technology", []):
+        if get_emacs_func_result("eaf-emacs-running-in-wayland-native", []):
+            self.setWindowFlags(Qt.FramelessWindowHint | Qt.BypassWindowManagerHint)
+        elif get_emacs_func_result("eaf-emacs-not-use-reparent-technology", []):
             self.setWindowFlags(Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint | Qt.NoDropShadowWindowHint)
         else:
             self.setWindowFlags(Qt.FramelessWindowHint)

Diff for: eaf.el

@@ -564,13 +564,17 @@ A hashtable, key is url and value is title.")
 (defun eaf--follow-system-dpi ()
   (if (and (getenv "WAYLAND_DISPLAY") (not (string= (getenv "WAYLAND_DISPLAY") "")))
       (progn
-        ;; We need manually set scale factor when at Gnome/Wayland environment.
-        ;; It is important to set QT_AUTO_SCREEN_SCALE_FACTOR=0
-        ;; otherwise Qt which explicitly force high DPI enabling get scaled TWICE.
-        (setenv "QT_AUTO_SCREEN_SCALE_FACTOR" "0")
+        (cond ((eaf-emacs-running-in-wayland-native)
+               ;; Wayland native need to set QT_AUTO_SCREEN_SCALE_FACTOR=1
+               ;; otherwise Qt window only have half of screen.
+               (setenv "QT_AUTO_SCREEN_SCALE_FACTOR" "1"))
+              (t
+               ;; XWayland need to set QT_AUTO_SCREEN_SCALE_FACTOR=0
+               ;; otherwise Qt which explicitly force high DPI enabling get scaled TWICE.
+               (setenv "QT_AUTO_SCREEN_SCALE_FACTOR" "0")))
         ;; Set EAF application scale factor.
         (setenv "QT_SCALE_FACTOR" "1")
-        ;; Force xwayland to ensure SWay works.
+        ;; Use XCB for input event transfer.
         (setenv "QT_QPA_PLATFORM" "xcb"))
     (setq process-environment
           (seq-filter
@@ -811,24 +815,24 @@ to edit EAF keybindings!" fun fun)))
             (set-keymap-parent map eaf-mode-map*))
           (cl-loop for (key . fun) in (reverse keybinding)
                    do (define-key map (kbd key)
-                        (cond
-                         ;; If command is normal symbol, just call it directly.
-                         ((symbolp fun)
-                          fun)
-
-                         ;; If command is string and include - , it's elisp function, use `intern' build elisp function from function name.
-                         ((string-match "-" fun)
-                          (intern fun))
-
-                         ;; If command prefix with js_, call JavaScript function directly.
-                         ((string-prefix-p "js_" fun)
-                          (eaf--make-js-proxy-function fun))
-
-                         ;; If command is not built-in function and not include char '-'
-                         ;; it's command in python side, build elisp proxy function to call it.
-                         (t
-                          (eaf--make-py-proxy-function fun))
-                         ))
+                                  (cond
+                                   ;; If command is normal symbol, just call it directly.
+                                   ((symbolp fun)
+                                    fun)
+
+                                   ;; If command is string and include - , it's elisp function, use `intern' build elisp function from function name.
+                                   ((string-match "-" fun)
+                                    (intern fun))
+
+                                   ;; If command prefix with js_, call JavaScript function directly.
+                                   ((string-prefix-p "js_" fun)
+                                    (eaf--make-js-proxy-function fun))
+
+                                   ;; If command is not built-in function and not include char '-'
+                                   ;; it's command in python side, build elisp proxy function to call it.
+                                   (t
+                                    (eaf--make-py-proxy-function fun))
+                                   ))
                    finally return map))))
 
 (defun eaf--get-app-bindings (app-name)
@@ -918,111 +922,120 @@ In this situation, we use 'stay on top' technicality that show EAF window when E
 
 'Stay on top' technicality is not perfect like 'cross-process reparent' technicality,
 provide at least one way to let everyone experience EAF. ;)"
-  (or (eq system-type 'darwin)          ;macOS
-      (and (eq window-system 'pgtk)     ;Wayland native
-           (fboundp 'pgtk-backend-display-class)
-           (string-equal (pgtk-backend-display-class) "GdkWaylandDisplay"))
-      (not (display-graphic-p))         ;Terminal emulator
+  (or (eq system-type 'darwin)              ;macOS
+      (eaf-emacs-running-in-wayland-native) ;Wayland native
+      (not (display-graphic-p))             ;Terminal emulator
       ))
 
+(defun eaf-emacs-running-in-wayland-native ()
+  (and (eq window-system 'pgtk)
+       (fboundp 'pgtk-backend-display-class)
+       (string-equal (pgtk-backend-display-class) "GdkWaylandDisplay")))
+
 (eval-when-compile
   (when (eaf-emacs-not-use-reparent-technology)
     (cond
      ((eq system-type 'darwin)
-      (defcustom eaf--stay-on-top-safe-focus-change t
+      (defcustom eaf--mac-safe-focus-change t
         "Whether to verify the active application on Emacs frame focus change.
 
 Only set this to nil if you do not use the mouse inside EAF buffers.
 The benefit of setting this to nil is that application switching
 is a lot faster but could be buggy."
         :type 'boolean)
 
-      (defvar eaf--stay-on-top-switch-to-python nil
+      (defvar eaf--mac-switch-to-python nil
         "Record if Emacs should switch to Python process.")
 
-      (defvar eaf--stay-on-top-has-focus t
+      (defvar eaf--mac-has-focus t
         "Record if Emacs has focus.")
 
-      (defvar eaf--stay-on-top-unsafe-focus-change-timer nil
+      (defvar eaf--mac-unsafe-focus-change-timer nil
         "Use timer to ignore spurious focus events.
 
-This is only used when `eaf--stay-on-top-safe-focus-change' is nil.
+This is only used when `eaf--mac-safe-focus-change' is nil.
 
 See
 https://old.reddit.com/r/emacs/comments/\
 kxsgtn/ignore_spurious_focus_events_for/")
 
-      (defun eaf--stay-on-top-unsafe-focus-change-handler ()
+      (defun eaf--mac-unsafe-focus-change-handler ()
         ;; ignore errors related to
         ;; (wrong-type-argument eaf-epc-manager nil)
         (ignore-errors
           (if (frame-focus-state)
-              (eaf--stay-on-top-unsafe-focus-in)
-            (eaf--stay-on-top-unsafe-focus-out)))
-        (setq eaf--stay-on-top-unsafe-focus-change-timer nil))
+              (eaf--mac-unsafe-focus-in)
+            (eaf--mac-unsafe-focus-out)))
+        (setq eaf--mac-unsafe-focus-change-timer nil))
 
-      (defun eaf--stay-on-top-focus-change ()
+      (defun eaf--mac-focus-change ()
         "Manage Emacs's focus change."
-        (if eaf--stay-on-top-safe-focus-change
+        (if eaf--mac-safe-focus-change
             (let ((front (shell-command-to-string "app-frontmost --name")))
               (cond
                ((string= "Python\n" front)
-                (setq eaf--stay-on-top-switch-to-python t))
+                (setq eaf--mac-switch-to-python t))
 
                ((string= "Emacs\n" front)
                 (cond
-                 (eaf--stay-on-top-switch-to-python
-                  (setq eaf--stay-on-top-switch-to-python nil))
-                 ((not eaf--stay-on-top-has-focus)
-                  (run-with-timer 0.1 nil #'eaf--stay-on-top-focus-in))
-                 (eaf--stay-on-top-has-focus
-                  (eaf--stay-on-top-focus-out))))
-               (t (eaf--stay-on-top-focus-out))))
-          (setq eaf--stay-on-top-unsafe-focus-change-timer
-                (unless eaf--stay-on-top-unsafe-focus-change-timer
+                 (eaf--mac-switch-to-python
+                  (setq eaf--mac-switch-to-python nil))
+                 ((not eaf--mac-has-focus)
+                  (run-with-timer 0.1 nil #'eaf--mac-focus-in))
+                 (eaf--mac-has-focus
+                  (eaf--mac-focus-out))))
+               (t (eaf--mac-focus-out))))
+          (setq eaf--mac-unsafe-focus-change-timer
+                (unless eaf--mac-unsafe-focus-change-timer
                   (run-at-time 0.06 nil
-                               #'eaf--stay-on-top-unsafe-focus-change-handler)))))
+                               #'eaf--mac-unsafe-focus-change-handler)))))
 
-      (defun eaf--stay-on-top-replace-eaf-buffers ()
+      (defun eaf--mac-replace-eaf-buffers ()
         (dolist (window (window-list))
           (select-window window)
           (when (eq major-mode 'eaf-mode)
             (get-buffer-create "*eaf temp*")
             (switch-to-buffer "*eaf temp*" t))))
 
-      (defun eaf--stay-on-top-focus-in ()
-        (setq eaf--stay-on-top-has-focus t)
+      (defun eaf--mac-focus-in ()
+        (setq eaf--mac-has-focus t)
         (ignore-errors
           (set-window-configuration
-           (frame-parameter (selected-frame) 'eaf--stay-on-top-frame))
+           (frame-parameter (selected-frame) 'eaf--mac-frame))
           (bury-buffer "*eaf temp*")))
 
-      (defun eaf--stay-on-top-focus-out (&optional frame)
-        (when eaf--stay-on-top-has-focus
-          (setq eaf--stay-on-top-has-focus nil)
+      (defun eaf--mac-focus-out (&optional frame)
+        (when eaf--mac-has-focus
+          (setq eaf--mac-has-focus nil)
           (set-frame-parameter (or frame (selected-frame))
-                               'eaf--stay-on-top-frame (current-window-configuration))
-          (eaf--stay-on-top-replace-eaf-buffers)))
+                               'eaf--mac-frame (current-window-configuration))
+          (eaf--mac-replace-eaf-buffers)))
 
-      (defun eaf--stay-on-top-unsafe-focus-in ()
+      (defun eaf--mac-unsafe-focus-in ()
         (eaf-call-async "show_top_views")
         (set-window-configuration
-         (frame-parameter (selected-frame) 'eaf--stay-on-top-frame)))
+         (frame-parameter (selected-frame) 'eaf--mac-frame)))
 
-      (defun eaf--stay-on-top-unsafe-focus-out (&optional frame)
+      (defun eaf--mac-unsafe-focus-out (&optional frame)
         (eaf-call-async "hide_top_views")
-        (set-frame-parameter (or frame (selected-frame)) 'eaf--stay-on-top-frame
+        (set-frame-parameter (or frame (selected-frame)) 'eaf--mac-frame
                              (current-window-configuration)))
 
-      (defun eaf--stay-on-top-delete-frame-handler (frame)
-        (if eaf--stay-on-top-safe-focus-change
-            (eaf--stay-on-top-focus-out frame)
-          (eaf--stay-on-top-unsafe-focus-out frame)))
+      (defun eaf--mac-delete-frame-handler (frame)
+        (if eaf--mac-safe-focus-change
+            (eaf--mac-focus-out frame)
+          (eaf--mac-unsafe-focus-out frame)))
 
-      (add-function :after after-focus-change-function #'eaf--stay-on-top-focus-change)
-      (add-to-list 'delete-frame-functions #'eaf--stay-on-top-delete-frame-handler))
+      (add-function :after after-focus-change-function #'eaf--mac-focus-change)
+      (add-to-list 'delete-frame-functions #'eaf--mac-delete-frame-handler))
      (t
-      (message "Wayland native code is not supported yet.")))))
+      (defun eaf--wayland-focus-change ()
+        "Manage Emacs's focus change."
+        (if (frame-focus-state)
+            (eaf-call-async "show_top_views")
+          (eaf-call-async "hide_top_views")))
+      (add-function :after after-focus-change-function #'eaf--wayland-focus-change)
+      ))))
 
 (defun eaf-monitor-configuration-change (&rest _)
   "EAF function to respond when detecting a window configuration change."