From 49c8a7cf115c34d8d05a415a4ea85fc9d52c3301 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Fri, 22 Apr 2022 17:30:07 -0500
Subject: [PATCH] foot-pgo: better patch

---
 wayland/foot-pgo/checksums             |  2 +-
 wayland/foot-pgo/patches/fix-pgo.patch | 99 +++++++-------------------
 2 files changed, 28 insertions(+), 73 deletions(-)

diff --git a/wayland/foot-pgo/checksums b/wayland/foot-pgo/checksums
index 6e6b49b8..1c1500f7 100644
--- a/wayland/foot-pgo/checksums
+++ b/wayland/foot-pgo/checksums
@@ -1,4 +1,4 @@
 d8c27f735d2f361ee627cce282bee2462545f4df9532ee6ac28fd86a193404fa
 0d9b9f3add24aef5efcf42a32e8ad0e50060e1441a491e04fff3d79a36a526ea
 b0f32c9b2c2015c8d8dd068fd4e8b586aa91ca1670badc274ec962559ee0aadd
-f90254ec08b34407f4f4194c35b438bdbe66219a5d8e23d292bdee08035ec562
+9fa8ede522adead15fb4175312dbe9e4cb0d55ea4f05518988044d1dfe1f1f20
diff --git a/wayland/foot-pgo/patches/fix-pgo.patch b/wayland/foot-pgo/patches/fix-pgo.patch
index 8cb4ebfb..7319f40b 100644
--- a/wayland/foot-pgo/patches/fix-pgo.patch
+++ b/wayland/foot-pgo/patches/fix-pgo.patch
@@ -1,76 +1,31 @@
-diff --git a/meson.build b/meson.build
-index 49611dc..24d74cf 100644
---- a/meson.build
-+++ b/meson.build
-@@ -181,9 +181,13 @@ vtlib = static_library(
- 
- pgolib = static_library(
-   'pgolib',
-+  'config.c', 'config.h',
-   'grid.c', 'grid.h',
-+  'key-binding.c', 'key-binding.h',
-   'selection.c', 'selection.h',
-   'terminal.c', 'terminal.h',
-+  'tokenize.c', 'tokenize.h',
-+  'user-notification.c', 'user-notification.h',
-   wl_proto_src + wl_proto_headers,
-   dependencies: [libepoll, pixman, fcft, tllist, wayland_client, xkb, utf8proc],
-   link_with: vtlib,
-@@ -203,14 +207,12 @@ executable(
-   'foot',
-   'async.c', 'async.h',
-   'box-drawing.c', 'box-drawing.h',
--  'config.c', 'config.h',
-   'commands.c', 'commands.h',
-   'extract.c', 'extract.h',
-   'fdm.c', 'fdm.h',
-   'foot-features.h',
-   'ime.c', 'ime.h',
-   'input.c', 'input.h',
--  'key-binding.c', 'key-binding.h',
-   'main.c',
-   'notify.c', 'notify.h',
-   'quirks.c', 'quirks.h',
-@@ -221,9 +223,7 @@ executable(
-   'shm.c', 'shm.h',
-   'slave.c', 'slave.h',
-   'spawn.c', 'spawn.h',
--  'tokenize.c', 'tokenize.h',
-   'url-mode.c', 'url-mode.h',
--  'user-notification.c', 'user-notification.h',
-   'wayland.c', 'wayland.h',
-   wl_proto_src + wl_proto_headers, version,
-   dependencies: [math, threads, libepoll, pixman, wayland_client, wayland_cursor, xkb, fontconfig, utf8proc,
 diff --git a/pgo/pgo.c b/pgo/pgo.c
-index 26e0c10..ba92efd 100644
+index 26e0c10e..92d97dbf 100644
 --- a/pgo/pgo.c
 +++ b/pgo/pgo.c
-@@ -171,28 +171,6 @@ void get_current_modifiers(const struct seat *seat,
-                            xkb_mod_mask_t *effective,
-                            xkb_mod_mask_t *consumed, uint32_t key) {}
- 
--static struct key_binding_set kbd;
--static bool kbd_initialized = false;
--
--struct key_binding_set *
--key_binding_for(
--    struct key_binding_manager *mgr, const struct terminal *term,
--    const struct seat *seat)
--{
--    if (!kbd_initialized) {
--        kbd_initialized = true;
--        kbd = (struct key_binding_set){
--            .key = tll_init(),
--            .search = tll_init(),
--            .url = tll_init(),
--            .mouse = tll_init(),
--            .selection_overrides = 0,
--        };
--    }
--
--    return &kbd;
--}
--
- int
- main(int argc, const char *const *argv)
+@@ -178,6 +178,13 @@ struct key_binding_set *
+ key_binding_for(
+     struct key_binding_manager *mgr, const struct terminal *term,
+     const struct seat *seat)
++{
++    return &kbd;
++}
++
++void
++key_binding_new_for_term(
++    struct key_binding_manager *mgr, const struct terminal *term)
  {
+     if (!kbd_initialized) {
+         kbd_initialized = true;
+@@ -189,8 +196,11 @@ key_binding_for(
+             .selection_overrides = 0,
+         };
+     }
++}
+ 
+-    return &kbd;
++void
++key_binding_unref_term(struct key_binding_manager *mgr, const struct terminal *term)
++{
+ }
+ 
+ int