fix: clean up GTK/WebKit integration and event handling

- fix split pane expansion/orientation setup logic
- remove deferred pane positioning on show events
- load VTE with interactive bash rcfile
- migrate WebKit2 bindings from 4.0 to 4.1
- add icons path accessor to PathManager
- normalize startup IPC file event payloads with FILE| prefix
- alias App_Event_Types and update plugin event references
- guard widget registry against unnamed builder objects
- fix application_dirs home path lookup
- remove unused GLib import from completion controller
- reorder setproctitle import in __main__

plugins/code/commands/nanoesq_temp_buffer/cut_to_temp_buffer.py

@@ -14,31 +14,44 @@ from .helpers import clear_temp_cut_buffer_delayed, set_temp_cut_buffer_delayed
 
 class Handler:
     @staticmethod
-    def execute(
+    def execute(view: GtkSource.View, *args, **kwargs):
-        view: GtkSource.View,
-        *args,
-        **kwargs
-    ):
         logger.debug("Command: Cut to Temp Buffer")
 
         clear_temp_cut_buffer_delayed(view)
 
         buffer = view.get_buffer()
-        itr = buffer.get_iter_at_mark(buffer.get_insert())
 
-        start_itr = itr.copy()
+        if buffer.get_has_selection():
-        start_itr.set_line_offset(0)
+            start_itr, end_itr = buffer.get_selection_bounds()
 
-        end_itr = start_itr.copy()
+            start_itr.set_line_offset(0)
-        if not end_itr.forward_line():
+
-            end_itr = buffer.get_end_iter()
+            if not end_itr.ends_line():
+                end_itr.forward_to_line_end()
+
+            if not end_itr.is_end():
+                end_itr.forward_char()
+        else:
+            itr = buffer.get_iter_at_mark(buffer.get_insert())
+
+            start_itr = itr.copy()
+            start_itr.set_line_offset(0)
+
+            end_itr = start_itr.copy()
+            if not end_itr.forward_line():
+                end_itr = buffer.get_end_iter()
 
         if not hasattr(view, "_cut_buffer"):
             view._cut_buffer = ""
 
-        line_str = buffer.get_text(start_itr, end_itr, True)
+        text = buffer.get_text(start_itr, end_itr, True)
-        view._cut_buffer += line_str
+
+        if not text.endswith("\n"):
+            text += "\n"
+
+        view._cut_buffer += text
 
         buffer.delete(start_itr, end_itr)
+        buffer.place_cursor(start_itr)
 
         set_temp_cut_buffer_delayed(view)

plugins/code/commands/split_pane/create_split_view.py

@@ -47,6 +47,8 @@ def execute(
 
     pane.set_hexpand(True)
     pane.set_vexpand(True)
+    scrolled_win1.set_hexpand(True)
+    scrolled_win2.set_vexpand(True)
     pane.set_wide_handle(True)
 
     container.remove(scrolled_win1)
@@ -54,21 +56,9 @@ def execute(
     pane.pack2( scrolled_win2, True, True )
     container.add(pane)
 
-    def _show(pane, alloc, is_vertical: bool):
-        if is_vertical:
-            pane.set_position(alloc.width  / 2)
-        else:
-            pane.set_position(alloc.height / 2)
-
-        pane.disconnect(pane.show_id)
-
-    is_control, is_shift, is_alt = modkeys_states
-    alloc = container.get_allocation()
     if char_str == "|":
-        pane.show_id = pane.connect("show", _show, alloc, True)
         pane.set_orientation(Gtk.Orientation.VERTICAL)
     elif char_str == "\\":
-        pane.show_id = pane.connect("show", _show, alloc, False)
         pane.set_orientation(Gtk.Orientation.HORIZONTAL)
 
     pane.show_all()

plugins/code/commands/split_pane/plugin.py

@@ -55,7 +55,7 @@ class Plugin(PluginCode):
             command_name = "close_split_view",
             command      = _close_split_view,
             binding_mode = "released",
-            binding      = "<Shift><Control>w"
+            binding      = "<Alt>\\"
         )
 
         self.emit_to("source_views", event)

plugins/code/language_server_clients/lsp_manager/client/lsp_client_events.py

@@ -15,6 +15,8 @@ from ..dto.code.lsp.lsp_messages import definition_request
 from ..dto.code.lsp.lsp_messages import implementation_request
 from ..dto.code.lsp.lsp_messages import references_request
 from ..dto.code.lsp.lsp_messages import symbols_request
+from ..dto.code.lsp.lsp_messages import shutdown_request
+from ..dto.code.lsp.lsp_messages import exit_request
 
 
 
@@ -36,9 +38,15 @@ class LSPClientEvents:
         self._init_params["initializationOptions"] = self._init_opts
         self.send_request("initialize", self._init_params)
 
-    def send_initialized_message(self):
+    def send_initialized_notification(self):
         self.send_notification("initialized")
 
+    def send_shutdown_request(self):
+        self.send_request("shutdown")
+
+    def send_exit_notification(self):
+        self.send_notification("exit")
+
     def _lsp_did_open(self, data: dict):
         method = "textDocument/didOpen"
         params = didopen_notification["params"]

plugins/code/language_server_clients/lsp_manager/dto/code/lsp/lsp_messages.py

@@ -183,7 +183,6 @@ references_request = {
 	}
 }
 
-
 symbols_request = {
 	"method": "textDocument/documentSymbol",
 	"params": {
@@ -195,3 +194,14 @@ symbols_request = {
 	    }
 	}
 }
+
+shutdown_request = {
+	"method": "shutdown",
+	"params": None
+}
+
+exit_request = {
+	"method": "exit",
+	"params": None
+}
+

plugins/code/language_server_clients/lsp_manager/lsp_manager.py

@@ -1,6 +1,9 @@
 # Python imports
 
 # Lib imports
+import gi
+
+from gi.repository import GLib
 
 # Application imports
 from libs.controllers.controller_base import ControllerBase
@@ -109,8 +112,16 @@ class LSPManager(ControllerBase):
         return True
 
     def close_client(self, lang_id: str) -> bool:
-        self.client_manager.close_client(lang_id)
+        controller = self.client_manager.get_active_client()
-        self.response_registry.close_handler(lang_id)
+        controller.send_shutdown_request()
+
+        def _close():
+            self.client_manager.close_client(lang_id)
+            self.response_registry.close_handler(lang_id)
+
+            return False
+
+        GLib.timeout_add(5000, _close)
 
         return True
 

plugins/code/language_server_clients/lsp_manager/response_handlers/default.py

@@ -17,6 +17,10 @@ class DefaultHandler(BaseHandler):
 
     def handle(self, method: str, response, controller):
         match method:
+            case "initialize":
+                controller.send_initialized_notification()
+            case "shutdown":
+                controller.send_exit_notification()
             case "textDocument/completion":
                 self._handle_completion(response)
             case "textDocument/definition":

src/__main__.py

@@ -4,12 +4,12 @@
 import argparse
 import faulthandler
 import traceback
-from setproctitle import setproctitle
 
 import tracemalloc
 tracemalloc.start()
 
 # Lib imports
+from setproctitle import setproctitle
 
 # Application imports
 from __builtins__ import *

src/core/controllers/base_controller.py

@@ -81,7 +81,7 @@ class BaseController(IPCSignalsMixin, KeyboardSignalsMixin, BaseControllerMixin)
 
     def _load_files(self):
         for file in settings_manager.get_starting_files():
-            event_system.emit("post-file-to-ipc", file)
+            event_system.emit("post-file-to-ipc", f"FILE|{file}")
 
     def _tggl_top_main_menubar(self):
         logger.debug("_tggl_top_main_menubar > stub...")

src/core/widgets/code/command_system/commands/duplicate_line.py

@@ -11,45 +11,45 @@ from gi.repository import GtkSource
 
 
 
-def execute(
+def execute(view: GtkSource.View, *args, **kwargs):
-    view: GtkSource.View,
-    *args,
-    **kwargs
-):
     logger.debug("Command: Duplicate Line")
 
     buffer = view.get_buffer()
 
-    if not buffer.get_has_selection():
+    if buffer.get_has_selection():
-        had_selection = False
+        start_itr, \
-        itr        = buffer.get_iter_at_mark( buffer.get_insert() )
+        end_itr    = buffer.get_selection_bounds()
-        start_itr  = itr.copy()
+        start_line = start_itr.get_line()
-        end_itr    = itr.copy()
+        end_line   = end_itr.get_line()
-        start_line = itr.get_line() + 1
+        scol       = start_itr.get_line_offset()
-        start_char = itr.get_line_offset()
+        ecol       = end_itr.get_line_offset()
     else:
-        had_selection = True
+        itr        = buffer.get_iter_at_mark(buffer.get_insert())
-        start_itr, end_itr = buffer.get_selection_bounds()
+        start_line = end_line = itr.get_line()
-        sline      = start_itr.get_line()
+        col        = itr.get_line_offset()
-        eline      = end_itr.get_line()
-        start_line = eline + 1
-        start_char = start_itr.get_line_offset()
-        end_char   = end_itr.get_line_offset()
-        range_line_size  = eline - sline
 
-    start_itr.backward_visible_line()
+    start_itr = buffer.get_iter_at_line(start_line)
-    start_itr.forward_line()
+    end_itr   = buffer.get_iter_at_line(end_line)
-    end_itr.forward_line()
-    end_itr.backward_char()
 
-    line_str = buffer.get_slice(start_itr, end_itr, True)
+    if not end_itr.ends_line():
-    end_itr.forward_char()
+        end_itr.forward_to_line_end()
-    buffer.insert(end_itr, f"{line_str}\n", -1)
 
-    if not had_selection:
+    if not end_itr.is_end():
-        new_itr = buffer.get_iter_at_line_offset(start_line, start_char)
+        end_itr.forward_char()
-        buffer.place_cursor(new_itr)
+
+    text       = buffer.get_text(start_itr, end_itr, True)
+    insert_itr = buffer.get_iter_at_line(end_line)
+
+    insert_itr.forward_to_line_end()
+    if not insert_itr.is_end():
+        insert_itr.forward_char()
+
+    buffer.insert(insert_itr, text)
+
+    if buffer.get_has_selection():
+        new_start = buffer.get_iter_at_line_offset(end_line + 1, scol)
+        new_end   = buffer.get_iter_at_line_offset(end_line + 1 + (end_line - start_line), ecol)
+        buffer.select_range(new_start, new_end)
     else:
-        new_itr     = buffer.get_iter_at_line_offset(start_line, start_char)
+        new_start = buffer.get_iter_at_line_offset(end_line + 1, col)
-        new_end_itr = buffer.get_iter_at_line_offset((start_line + range_line_size), end_char)
+        buffer.place_cursor(new_start)
-        buffer.select_range(new_itr, new_end_itr)

src/core/widgets/code/controllers/completion_controller.py

@@ -4,7 +4,6 @@
 import gi
 gi.require_version('GtkSource', '4')
 
-from gi.repository import GLib
 from gi.repository import GtkSource
 
 # Application imports

src/core/widgets/code/source_file.py

@@ -61,7 +61,20 @@ class SourceFile(GtkSource.File):
         location: Gtk.TextIter,
         text: str, length: int
     ):
-        ...
+        event = Event_Factory.create_event(
+            "text_insert",
+            file     = self,
+            buffer   = self.buffer,
+            location = location,
+            text     = text,
+            length   = length
+        )
+
+        # Note: 'idle_add' needed b/c markers don't get thir positions
+        #      updated relative to the initial insert.
+        #      If not used, seg faults galor during multi insert.
+        # GLib.idle_add(self.emit, event)
+        self.emit(event)
 
     def _after_insert_text(
         self,

src/core/widgets/vte_widget.py

@@ -28,8 +28,8 @@ class VteWidget(Vte.Terminal):
     def __init__(self):
         super(VteWidget, self).__init__()
 
-        self.cd_cmd_prefix = ("cd".encode(), "cd ".encode())
+        self.cd_cmd_prefix: tuple = ("cd".encode(), "cd ".encode())
-        self.dont_process  = False
+        self.dont_process: bool   = False
 
         self._setup_styling()
         self._setup_signals()
@@ -48,9 +48,17 @@ class VteWidget(Vte.Terminal):
         self.set_hexpand(True)
         self.set_enable_sixel(True)
         self.set_cursor_shape( Vte.CursorShape.IBEAM )
+        self.set_audible_bell(False)
+        self.set_scroll_on_output(True)
 
     def _setup_signals(self):
-        self.connect("commit", self._commit)
+       self.connect("commit", self._handle_commit)
+       self.connect("current-directory-uri-changed", self._handle_path_change)
+       self.connect("selection-changed", self._handle_selection)
+       self.connect("button-press-event", self._on_button_press)
+       self.connect("key-press-event", self._on_key_press)
+       self.connect("key-release-event", self._on_key_release)
+       self.connect("destroy", self._handle_destroy)
 
     def _subscribe_to_events(self):
         event_system.subscribe("update_term_path", self.update_term_path)
@@ -59,35 +67,87 @@ class VteWidget(Vte.Terminal):
         ...
 
     def _do_session_spawn(self):
-        env = [
+        env_dict    = os.environ.copy()
-            "DISPLAY=:0",
+        existing_pc = env_dict.get("PROMPT_COMMAND", "")
-            "LC_ALL=C",
+        # Note: Needed for 'current-directory-uri-changed' to work.
-            "TERM='xterm-256color'",
+        #       Make sure user .bashrc doesn't affect it...
-            f"HOME='{settings_manager.path_manager.get_home_path()}'",
+        osc7        = 'printf "\\033]7;file://%s%s\\007" "$PWD"'
-            "XDG_RUNTIME_DIR='/run/user/1000'",
-            f"XAUTHORITY='{settings_manager.path_manager.get_home_path()}/.Xauthority'",
-            "HISTFILE=/dev/null",
-            "HISTSIZE=0",
-            "HISTFILESIZE=0",
-            "PS1=\\h@\\u \\W -->: ",
-        ]
 
-        self.spawn_sync(
+        env_dict.update({
+            "LC_ALL": "C",
+            "TERM": "xterm-256color",
+            "HISTFILE": "/dev/null",
+            "HISTSIZE": "0",
+            "HISTFILESIZE": "0",
+            "PS1": "\\h@\\u \\W -->: ",
+            "PROMPT_COMMAND": f"{osc7};{existing_pc}" if existing_pc else osc7,
+        })
+
+        env = [f"{k}={v}" for k, v in env_dict.items()]
+
+        self.spawn_async(
             Vte.PtyFlags.DEFAULT,
             settings_manager.path_manager.get_home_path(),
-            ["/bin/bash"],
+            ["/bin/bash", "--rcfile", f"{settings_manager.path_manager.get_home_path()}/.bashrc", "-i"],
             env,
             GLib.SpawnFlags.DEFAULT,
-            None, None,
+            None, None, -1, None, None,
         )
 
         startup_cmds = [
         ]
 
+        self.set_scrollback_lines(15000)
         for i in startup_cmds:
             self.run_command(i)
 
-    def _commit(self, terminal, text, size):
+    def _handle_destroy(self, terminal):
+        logger.debug("Destroying terminal...")
+        terminal.disconnect_by_func(terminal._handle_commit)
+        terminal.disconnect_by_func(terminal._handle_path_change)
+        terminal.disconnect_by_func(terminal._handle_selection)
+        terminal.disconnect_by_func(terminal._on_button_press)
+        terminal.disconnect_by_func(terminal._on_key_press)
+        terminal.disconnect_by_func(terminal._on_key_release)
+        terminal.disconnect_by_func(terminal._handle_destroy)
+
+    def _handle_path_change(self, terminal):
+        if not hasattr(self, "label"): return
+
+        uri = terminal.get_current_directory_uri().replace("file://", "")
+
+        terminal.label.set_text(uri)
+        terminal.label.set_tooltip_text(uri)
+
+    def _handle_selection(self, *args):
+        if self.get_has_selection():
+            self.copy_primary()
+
+    def _on_button_press(self, widget, event):
+        if event.button == 2:  # middle click
+            self.paste_clipboard()
+            return True
+
+    def _on_key_press(self, widget, event):
+        ctrl_pressed  = event.state & Gdk.ModifierType.CONTROL_MASK
+        shift_pressed = event.state & Gdk.ModifierType.SHIFT_MASK
+
+        if ctrl_pressed:
+            if shift_pressed:
+                if event.keyval in [Gdk.KEY_C, Gdk.KEY_V]:
+                    if event.keyval == Gdk.KEY_C:
+                        self.copy_clipboard()
+                    elif event.keyval == Gdk.KEY_V:
+                        self.paste_clipboard()
+
+                    return True
+
+        return False
+
+    def _on_key_release(self, widget, event):
+        ...
+
+    def _handle_commit(self, terminal, text, size):
         if self.dont_process:
             self.dont_process = False
             return

src/core/widgets/webkit/webkit_ui.py

@@ -5,7 +5,7 @@ import json
 # Lib imports
 import gi
 gi.require_version('Gdk', '3.0')
-gi.require_version('WebKit2', '4.0')
+gi.require_version('WebKit2', '4.1')
 from gi.repository import Gdk
 from gi.repository import Gtk
 from gi.repository import Gio

src/libs/dto/code/events/__init__.py

@@ -29,6 +29,7 @@ from .cursor_moved_event import CursorMovedEvent
 from .delete_range_event import DeleteRangeEvent
 from .modified_changed_event import ModifiedChangedEvent
 from .text_changed_event import TextChangedEvent
+from .text_insert_event import TextInsertEvent
 from .text_inserted_event import TextInsertedEvent
 from .focused_view_event import FocusedViewEvent
 from .set_active_file_event import SetActiveFileEvent

src/libs/dto/code/events/text_insert_event.py

@@ -0,0 +1,20 @@
+# Python imports
+from dataclasses import dataclass, field
+
+# Lib imports
+import gi
+
+gi.require_version('Gtk', '3.0')
+
+from gi.repository import Gtk
+
+# Application imports
+from .code_event import CodeEvent
+
+
+
+@dataclass
+class TextInsertEvent(CodeEvent):
+    location: Gtk.TextIter = None
+    text: str              = ""
+    length: int            = 0

src/libs/event_factory.py

@@ -31,7 +31,7 @@ class EventFactory(Singleton):
             event_type = self._class_name_to_event_type(name)
 
             self._event_classes[event_type] = obj
-            Code_Event_Types.add_event_class(name, obj)
+            App_Event_Types.add_event_class(name, obj)
             i += 1
 
         logger.debug(f"Registered {i} event types:")
@@ -44,7 +44,7 @@ class EventFactory(Singleton):
             event_type = self._class_name_to_event_type(name)
 
             del self._event_classes[event_type]
-            Code_Event_Types.remove_event_class(name)
+            App_Event_Types.remove_event_class(name)
             i += 1
 
         logger.debug(f"Unregistered {i} event types:")
@@ -98,6 +98,7 @@ class EventNamespace:
 
 
 
-Code_Event_Types = EventNamespace()
+App_Event_Types  = EventNamespace()
+Code_Event_Types = App_Event_Types
 Event_Factory    = EventFactory()
 

src/libs/settings/options/config.py

@@ -35,5 +35,5 @@ class Config:
     main_window_height: int          = 600
     application_dirs: list           = field(default_factory=lambda: [
         "/usr/share/applications",
-        f"{settings_manager.get_home_path()}/.local/share/applications"
+        f"{settings_manager.path_manager.get_home_path()}/.local/share/applications"
     ])

src/libs/settings/path_manager.py

@@ -88,6 +88,7 @@ class PathManager:
     def get_ui_widgets_path(self)  -> str: return self._UI_WIDGETS_PATH
     def get_context_path(self)     -> str: return self._CONTEXT_PATH
     def get_plugins_path(self)     -> str: return self._PLUGINS_PATH
+    def get_icons_path(self)       -> str: return self._DEFAULT_ICONS
     def get_css_file(self)         -> str: return self._CSS_FILE
     def get_home_config_path(self) -> str: return self._HOME_CONFIG_PATH
     def get_window_icon(self)      -> str: return self._WINDOW_ICON

src/libs/settings/webkit/webkit_ui_settings.py

@@ -2,7 +2,7 @@
 
 # Lib imports
 import gi
-gi.require_version('WebKit2', '4.0')
+gi.require_version('WebKit2', '4.1')
 from gi.repository import WebKit2
 
 # Application imports

src/libs/widget_registery.py

@@ -30,6 +30,7 @@ class WidgetRegisteryController(ControllerBase):
 
         widgets = self._builder.get_objects()
         for widget in widgets:
+            if not hasattr(widget, "get_name"): continue
             self.builder_keys.append( widget.get_name() )
 
     def _controller_message(self, event: BaseEvent):

src/plugins/controller.py

@@ -13,7 +13,7 @@ from gi.repository import Gtk
 from gi.repository import GLib
 
 # Application imports
-from libs.event_factory import Event_Factory, Code_Event_Types
+from libs.event_factory import Event_Factory, App_Event_Types, Code_Event_Types
 from libs.controllers.controller_base import ControllerBase
 from libs.dto.plugins.manifest_meta import ManifestMeta
 from libs.dto.base_event import BaseEvent
@@ -58,7 +58,7 @@ class PluginsController(ControllerBase, PluginsControllerMixin, PluginReloadMixi
             item = Gtk.MenuItem(label = "Plugins")
             item.connect("activate", self.toggle_plugins_ui)
             event.menu.append(item)
-        elif isinstance(event, Code_Event_Types.TogglePluginsUiEvent):
+        elif isinstance(event, App_Event_Types.TogglePluginsUiEvent):
             self.toggle_plugins_ui()
 
     def _collect_search_locations(self, path: str, locations: list):

src/plugins/plugins_ui.py

@@ -2,7 +2,10 @@
 
 # Lib imports
 import gi
+gi.require_version('Gdk', '3.0')
 from gi.repository import Gtk
+from gi.repository import Gdk
+from gi.repository import GLib
 
 # Application imports
 
@@ -25,6 +28,7 @@ class PluginsUI(Gtk.Dialog):
 
         self.set_title("Plugins")
         self.set_size_request(450, 530)
+        self.set_modal(False)
         self.set_deletable(False)
         self.set_skip_pager_hint(True)
         self.set_skip_taskbar_hint(True)
@@ -35,9 +39,13 @@ class PluginsUI(Gtk.Dialog):
 
         window = widget_registery.get_object("main-window")
         self.set_transient_for(window)
+        self.set_destroy_with_parent(True)
+
+        self.set_position(Gtk.WindowPosition.CENTER_ON_PARENT)
 
     def _setup_signals(self):
-        ...
+        self.connect("focus-out-event", self._on_focus_out)
+        self.connect("key-release-event", self._on_key_release)
 
     def _subscribe_to_events(self):
         ...
@@ -59,6 +67,19 @@ class PluginsUI(Gtk.Dialog):
 
         scrolled_win.show_all()
 
+    def _on_key_release(self, widget, event):
+        ctrl_pressed  = event.state & Gdk.ModifierType.CONTROL_MASK
+        shift_pressed = event.state & Gdk.ModifierType.SHIFT_MASK
+
+        if ctrl_pressed:
+            if shift_pressed:
+                if event.keyval == Gdk.KEY_P:
+                    self.hide()
+
+    def _on_focus_out(self, *args):
+        self.hide()
+        GLib.idle_add(self.hide)
+
     def add_row(self, manifest_meta, callback: callable):
         box         = Gtk.Box()
         plugin_lbl  = Gtk.Label(label = manifest_meta.manifest.name)