Fix: update eaf layer #14681

dalanicolai · 2021-04-19T16:11:20Z

The layer got broken due to some minor changes in the eaf package by the eaf
developers. This PR fixes the layer to a working state.

The layer got broken due to some minor changes in the eaf package by the eaf developers. This commit fixes the layer to a working state.

dalanicolai · 2021-04-19T16:18:15Z

Or actually I think it got broken by the recent big refactor operation...

lebensterben · 2021-04-19T17:59:06Z

layers/+tools/eaf/packages.el

@@ -236,20 +235,19 @@
        (lambda (prompt)
          (if (derived-mode-p 'eaf-mode)
              (pcase eaf--buffer-app-name
-                ((or
-                  (and "browser"
-                       (guard (string= (eaf-call-sync "call_function" eaf--buffer-id "is_focus") "True")))


(guard (string= (eaf-call-sync "call_function" eaf--buffer-id "is_focus") "True")))

to

(guard (not (string= (eaf-call-sync "call_function" eaf--buffer-id "is_focus") "True"))))

Should fix this.

I guess you mean I should just add the not in the original code (before the PR)? Anyway, I have tried that but that also does not seem to work (ESC does exit insert mode).

Ah sorry... I think it does work, there is another reason why it seems broken. I don't know exactly how eaf reparenting works, but somehow (on Ubuntu) the browser window seems not to get well embedded in Emacs, but instead it opens in its own separate window. But from its position it looks to be embedded in Emacs, however when I select the browser window, that window gets active instead of the Emacs window (so that the keybindings don't seem to work). On Fedora it all seems to work fine (I am switching a little between Fedora and Ubuntu, because mit-scheme does not build in Fedora. Anyway.. this makes things a little more confusing.)

I will check a little more and then update the PR

Congrats with your new role in the Spacemacs team!

Key binding issue aside, I've trouble with SPC m d for toggling dark-mode.
It works like 10% of time and for 90% of time it complains "cannot call function: is_focus".

P.S. EAF never fully worked on my computer so I cannot fully test it.

smile13241324

👍

lebensterben · 2021-04-19T20:52:34Z

layers/+tools/eaf/packages.el

                (_  (kbd "SPC")))
            (kbd "SPC"))))

      ;; The following lines create the major-mode leader key emulation map
      ;; in a similar way as how it was done in the evil-integration example
      (setq eaf-evil-leader-for-major-keymap (make-sparse-keymap))
      (define-key eaf-evil-leader-for-major-keymap (kbd "h") 'eaf-open-browser-with-history)
-      (define-key eaf-evil-leader-for-major-keymap (kbd "d") 'eaf-toggle-dark-mode)


This function is defined in funcs.el and now it's not used.
Do we need to remove it? But it works 100% of time on my computer....

Are you sure that function works? Because here it did not. I did not remove it, but replace it with the working version of that function (see below)

I can only view PDF file in EAF on my computer. And the only working function is to toggle dark mode. After this commit that stopped working.

No, the it should not be this line.

What I meant is

spacemacs/layers/+tools/eaf/funcs.el

Line 34 in df15f8c

(defun eaf-toggle-dark-mode ()

That is not used after this PR. And that function works for me.

Haha okay, I forgot that I had added that function myself. But I am using mainly the eaf-browser, and there this function stopped working while that new function does work. So I guess maybe we require both functions. I will look into it a little more then.

@lebensterben