Jeremypw/gtk4

meson.build

@@ -2,7 +2,7 @@ project(
     'io.elementary.code',
     'vala', 'c',
     meson_version: '>= 0.58.0',
-    version: '8.3.1'
+    version: '9.0.0'
 )
 
 add_project_arguments([
@@ -29,16 +29,16 @@ i18n = import('i18n')
 glib_dep = dependency('glib-2.0', version: '>=2.74.0')
 gio_unix_dep = dependency('gio-unix-2.0', version: '>=2.20')
 gee_dep = dependency('gee-0.8', version: '>=0.8.5')
-gtk_dep = dependency('gtk+-3.0', version: '>=3.6.0')
-granite_dep = dependency('granite', version: '>=6.0.0')
-handy_dep = dependency('libhandy-1', version: '>=0.90.0')
-gtksourceview_dep = dependency('gtksourceview-4')
+gtk_dep = dependency('gtk4', version: '>=4.14.2')
+granite_dep = dependency('granite-7', version: '>=7.0.0')
+adwaita_dep = dependency('libadwaita-1', version: '>=1.0.0')
+gtksourceview_dep = dependency('gtksourceview-5')
 peas_dep = dependency('libpeas-2')
 git_dep = dependency('libgit2-glib-1.0', version: '>=1.2.0')
 fontconfig_dep = dependency('fontconfig')
 pangofc_dep = dependency('pangoft2')
 posix_dep = meson.get_compiler('vala').find_library('posix')
-vte_dep = dependency('vte-2.91')
+vte_dep = dependency('vte-2.91-gtk4', version: '>=0.76')
 
 code_resources = gnome.compile_resources(
     'code-resources', 'data/' + meson.project_name() + '.gresource.xml',
@@ -55,7 +55,7 @@ dependencies = [
     gee_dep,
     gtk_dep,
     granite_dep,
-    handy_dep,
+    adwaita_dep,
     gtksourceview_dep,
     peas_dep,
     git_dep,

plugins/brackets-completion/brackets-completion.vala

@@ -42,10 +42,12 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Se
         plugins = (Scratch.Services.Interface) object;
         plugins.hook_document.connect (on_hook_document);
         plugins.hook_window.connect ((w) => {
-            key_controller = new Gtk.EventControllerKey (w) {
+            key_controller = new Gtk.EventControllerKey () {
                 propagation_phase = CAPTURE
             };
+            ((Gtk.Widget) w).add_controller (key_controller);
             key_controller.key_pressed.connect (on_key_down);
+            key_controller.key_released.connect (on_key_release);
         });
     }
 
@@ -57,15 +59,17 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Se
 
     private void on_hook_document (Scratch.Services.Document doc) {
         current_buffer = doc.source_view.buffer;
-
+        // var key_controller = new Gtk.EventControllerKey () {
+        //     propagation_phase = BUBBLE
+        // };
         if (current_source_view != null) {
-            current_source_view.event_after.disconnect (on_event_after);
+            // current_source_view.event_after.disconnect (on_event_after);
             current_source_view.backspace.disconnect (on_backspace);
         }
 
         current_source_view = doc.source_view;
 
-        current_source_view.event_after.connect (on_event_after);
+        // current_source_view.event_after.connect (on_event_after);
         current_source_view.backspace.connect (on_backspace);
     }
 
@@ -174,11 +178,11 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Se
         Gdk.ModifierType state
     ) requires (current_source_view != null && current_buffer != null) {
 
-        if (!current_source_view.is_focus) {
+        if (!current_source_view.is_focus ()) {
             return false;
         }
 
-        if (Gdk.ModifierType.MOD1_MASK in state || Gdk.ModifierType.CONTROL_MASK in state) {
+        if (Gdk.ModifierType.ALT_MASK in state || Gdk.ModifierType.CONTROL_MASK in state) {
             return false;
         }
 
@@ -235,22 +239,25 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Se
         }
     }
 
-    private void on_event_after (Gdk.Event root_event) {
-        if (root_event.type != Gdk.EventType.KEY_PRESS) {
-            return;
-        }
-
-        var event = root_event.key;
+    private void on_key_release (
+        uint keyval,
+        uint keycode,
+        Gdk.ModifierType state
+    ) {
+    // private void on_event_after (Gdk.Event root_event) {
+        // if (root_event.type != Gdk.EventType.KEY_PRESS) {
+        //     return;
+        // }
 
-        if (current_source_view.auto_indent && (event.keyval == Gdk.Key.Return || event.keyval == Gdk.Key.KP_Enter)) {
+        if (current_source_view.auto_indent && (keyval == Gdk.Key.Return || keyval == Gdk.Key.KP_Enter)) {
             check_bracket_indent ();
         }
 
-        if (keys.has_key (event.keyval) &&
-            !(Gdk.ModifierType.MOD1_MASK in event.state) &&
-            !(Gdk.ModifierType.CONTROL_MASK in event.state)) {
+        if (keys.has_key (keyval) &&
+            !(Gdk.ModifierType.ALT_MASK in state) &&
+            !(Gdk.ModifierType.CONTROL_MASK in state)) {
 
-            string bracket = keys[event.keyval];
+            string bracket = keys[keyval];
             string next_char = get_next_char ();
             string prev_char = get_previous_char ();
             bool brackets_match = next_char == bracket && prev_char == bracket;

plugins/detect-indent/detect-indent.vala

@@ -25,7 +25,7 @@ public class Scratch.Plugins.DetectIndent: Peas.ExtensionBase, Scratch.Services.
                 return;
             }
 
-            var source_buffer = (Gtk.SourceBuffer) view.buffer;
+            var source_buffer = (GtkSource.Buffer) view.buffer;
             Gtk.TextIter it;
             source_buffer.get_iter_at_line (out it, 0);
 

plugins/fuzzy-search/file-item.vala

@@ -16,8 +16,8 @@ public class FileItem : Gtk.ListBoxRow {
     }
 
     public FileItem (SearchResult res, bool should_distinguish_project = false) {
-        this.get_style_context ().add_class ("fuzzy-item");
-        this.get_style_context ().add_class ("flat");
+        this.add_css_class ("fuzzy-item");
+        this.add_css_class ("flat");
 
         result = res;
         Icon icon;
@@ -41,18 +41,20 @@ public class FileItem : Gtk.ListBoxRow {
             icon = ContentType.get_icon ("text/plain");
         }
 
-        var image = new Gtk.Image.from_gicon (icon, Gtk.IconSize.DND);
-        image.get_style_context ().add_class ("fuzzy-file-icon");
+        var image = new Gtk.Image.from_gicon (icon) {
+            icon_size = Gtk.IconSize.NORMAL
+        };
+        image.add_css_class ("fuzzy-file-icon");
 
-        path_box.add (filename_label);
-        path_box.add (path_label);
+        path_box.append (filename_label);
+        path_box.append (path_label);
 
         var container_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 1) {
             valign = Gtk.Align.CENTER
         };
 
-        container_box.add (image);
-        container_box.add (path_box);
+        container_box.append (image);
+        container_box.append (path_box);
 
         this.child = container_box;
     }

plugins/fuzzy-search/fuzzy-search-popover.vala

@@ -9,15 +9,15 @@
 public class Scratch.FuzzySearchPopover : Gtk.Popover {
     private Gtk.SearchEntry search_term_entry;
     private Services.FuzzyFinder fuzzy_finder;
-    private Gtk.ListBox search_result_container;
+    private Gtk.ListBox search_result_listbox;
     private int preselected_index;
     private Gtk.ScrolledWindow scrolled;
     private Gee.ArrayList<FileItem> items;
     private Scratch.Services.FuzzySearchIndexer indexer;
     private int window_height;
     private int max_items;
     private Gee.LinkedList<GLib.Cancellable> cancellables;
-    private Gtk.EventControllerKey search_term_entry_key_controller;
+    // private Gtk.EventControllerKey search_term_entry_key_controller;
     private Gtk.Label title_label;
     private string current_doc_project;
     public Scratch.MainWindow current_window { get; construct; }
@@ -63,30 +63,28 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
     }
 
     construct {
-        modal = true;
-        relative_to = current_window.document_view;
         width_request = 500;
         pointing_to = { 0, 32, 1, 1 };
 
-        this.get_style_context ().add_class ("fuzzy-popover");
+        this.add_css_class ("fuzzy-popover");
 
         title_label = new Gtk.Label (_("Find project files"));
         title_label.halign = Gtk.Align.START;
-        title_label.get_style_context ().add_class ("h4");
+        title_label.add_css_class ("h4");
 
         search_term_entry = new Gtk.SearchEntry ();
         search_term_entry.halign = Gtk.Align.FILL;
         search_term_entry.hexpand = true;
 
-        search_result_container = new Gtk.ListBox () {
+        search_result_listbox = new Gtk.ListBox () {
             selection_mode = Gtk.SelectionMode.NONE,
             activate_on_single_click = true,
             can_focus = false
         };
 
-        search_result_container.get_style_context ().add_class ("fuzzy-list");
+        search_result_listbox.add_css_class ("fuzzy-list");
 
-        search_result_container.row_activated.connect ((row) => {
+        search_result_listbox.row_activated.connect ((row) => {
             var file_item = row as FileItem;
             if (file_item == null) {
                 return;
@@ -95,7 +93,8 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
             handle_item_selection (items.index_of (file_item));
         });
 
-        search_term_entry_key_controller = new Gtk.EventControllerKey (search_term_entry);
+        var search_term_entry_key_controller = new Gtk.EventControllerKey ();
+        search_term_entry.add_controller (search_term_entry_key_controller);
         search_term_entry_key_controller.key_pressed.connect ((keyval, keycode, state) => {
             // Handle key up/down to select other files found by fuzzy search
             switch (keyval) {
@@ -184,10 +183,9 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
 
                         bool first = true;
 
-
-
-                        foreach (var c in search_result_container.get_children ()) {
-                            search_result_container.remove (c);
+                        var child = search_result_listbox.get_first_child ();
+                        while (child != null) {
+                            search_result_listbox.remove (child);
                         }
 
                         items.clear ();
@@ -198,16 +196,15 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
 
                             if (first) {
                                 first = false;
-                                file_item.get_style_context ().add_class ("preselect-fuzzy");
+                                file_item.add_css_class ("preselect-fuzzy");
                                 preselected_index = 0;
                             }
 
-                            search_result_container.add (file_item);
+                            search_result_listbox.append (file_item);
                             items.add (file_item);
                         }
 
                         scrolled.hide ();
-                        scrolled.show_all ();
 
                         // Reset scrolling
                         scrolled.vadjustment.value = 0;
@@ -216,8 +213,9 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
                     return Source.REMOVE;
                 });
             } else {
-                foreach (var c in search_result_container.get_children ()) {
-                    search_result_container.remove (c);
+                var child = search_result_listbox.get_first_child ();
+                while (child != null) {
+                    search_result_listbox.remove (child);
                 }
 
                 items.clear ();
@@ -228,33 +226,30 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
         var entry_layout = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
         entry_layout.valign = Gtk.Align.START;
 
-        entry_layout.add (title_label);
-        entry_layout.add (search_term_entry);
+        entry_layout.append (title_label);
+        entry_layout.append (search_term_entry);
         search_term_entry.valign = Gtk.Align.START;
 
-        scrolled = new Gtk.ScrolledWindow (null, null) {
+        scrolled = new Gtk.ScrolledWindow () {
             propagate_natural_height = true,
-            hexpand = true
+            hexpand = true,
+            child = search_result_listbox
         };
 
-        scrolled.add (search_result_container);
-
         var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-        box.pack_start (entry_layout, false, false);
-        box.pack_end (scrolled, true, true);
-        box.show_all ();
+        box.prepend (entry_layout);
+        box.append (scrolled);
 
         scrolled.hide ();
-        this.add (box);
+        this.child = box;
 
         fuzzy_finder = new Services.FuzzyFinder (search_indexer.project_paths);
         indexer = search_indexer;
         items = new Gee.ArrayList<FileItem> ();
         cancellables = new Gee.LinkedList<GLib.Cancellable> ();
 
         search_term_entry.realize.connect_after (() => {
-            int height;
-            current_window.get_size (null, out height);
+            int height = current_window.get_size (VERTICAL);
 
             // Limit the shown results if the window height is too small
             if (height > 400) {
@@ -266,7 +261,7 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
             scrolled.set_max_content_height (45 /* height */ * max_items);
 
             current_doc_project = get_current_project (); // This will not change while popover is showing
-            search_result_container.set_sort_func ((a , b) => {
+            search_result_listbox.set_sort_func ((a , b) => {
                 var result_a = ((FileItem)a).result;
                 var result_b = ((FileItem)b).result;
                 var project_a_is_current = result_a.project == current_doc_project;
@@ -293,8 +288,8 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
 
     private void preselect_new_item (FileItem old_item, FileItem new_item) {
         var class_name = "preselect-fuzzy";
-        old_item.get_style_context ().remove_class (class_name);
-        new_item.get_style_context ().add_class (class_name);
+        old_item.remove_css_class (class_name);
+        new_item.add_css_class (class_name);
     }
 
     private string get_current_project () {

plugins/fuzzy-search/fuzzy-search.vala

@@ -9,7 +9,6 @@
 public class Scratch.Plugins.FuzzySearch: Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     public Object object { owned get; set construct; }
     private const uint ACCEL_KEY = Gdk.Key.F;
-    private const Gdk.ModifierType ACCEL_MODTYPE = Gdk.ModifierType.MOD1_MASK;
 
     private Scratch.Services.FuzzySearchIndexer indexer;
     private MainWindow window = null;

plugins/highlight-word-selection/highlight-word-selection.vala

@@ -23,7 +23,7 @@
 public class Scratch.Plugins.HighlightSelectedWords : Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     Scratch.Widgets.SourceView current_source;
     Scratch.MainWindow? main_window = null;
-    Gtk.SourceSearchContext? current_search_context = null;
+    GtkSource.SearchContext? current_search_context = null;
 
     private const uint SELECTION_HIGHLIGHT_MAX_CHARS = 255;
 
@@ -118,8 +118,8 @@ public class Scratch.Plugins.HighlightSelectedWords : Peas.ExtensionBase, Scratc
 
             // We know the selected text is non-zero length, check not too long
             if (selected_text.char_count () <= SELECTION_HIGHLIGHT_MAX_CHARS) {
-                current_search_context = new Gtk.SourceSearchContext (
-                    (Gtk.SourceBuffer)current_source.buffer,
+                current_search_context = new GtkSource.SearchContext (
+                    (GtkSource.Buffer)current_source.buffer,
                     null
                 );
                 current_search_context.settings.search_text = selected_text;