From aa0b271aa93602138555a0e9c8322a13376d0640 Mon Sep 17 00:00:00 2001
From: deepend <deepend@tilde.club>
Date: Thu, 29 Jan 2026 22:07:58 -0700
Subject: [PATCH] Made GTK2 window access explicitly guarded in
 scroll/selection update code paths to keep GTK3 using gtk_widget_get_window.
 Applied the same explicit GTK3/GTK2 window guards in render paths to keep
 direct GTK2 field access isolated.

---
 src/fe-gtk/xtext.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c
index 44e5f8b8..395a11e1 100644
--- a/src/fe-gtk/xtext.c
+++ b/src/fe-gtk/xtext.c
@@ -1642,7 +1642,8 @@ gtk_xtext_scrolldown_timeout (GtkXText * xtext)
 
 #if HAVE_GTK3
 	window = gtk_widget_get_window (GTK_WIDGET (xtext));
-#else
+#endif
+#if !HAVE_GTK3
 	window = GTK_WIDGET (xtext)->window;
 #endif
 	if (!window)
@@ -1684,7 +1685,8 @@ gtk_xtext_scrollup_timeout (GtkXText * xtext)
 
 #if HAVE_GTK3
 	window = gtk_widget_get_window (GTK_WIDGET (xtext));
-#else
+#endif
+#if !HAVE_GTK3
 	window = GTK_WIDGET (xtext)->window;
 #endif
 	if (!window)
@@ -1735,7 +1737,8 @@ gtk_xtext_selection_update (GtkXText * xtext, GdkEventMotion * event, int p_y, g
 
 #if HAVE_GTK3
 	window = gtk_widget_get_window (GTK_WIDGET (xtext));
-#else
+#endif
+#if !HAVE_GTK3
 	window = GTK_WIDGET (xtext)->window;
 #endif
 	if (!window)
@@ -4029,7 +4032,8 @@ gtk_xtext_render_ents (GtkXText * xtext, textentry * enta, textentry * entb)
 
 #if HAVE_GTK3
 	window = gtk_widget_get_window (GTK_WIDGET (xtext));
-#else
+#endif
+#if !HAVE_GTK3
 	window = GTK_WIDGET (xtext)->window;
 #endif
 	if (!window)
@@ -4126,7 +4130,8 @@ gtk_xtext_render_page (GtkXText * xtext)
 
 #if HAVE_GTK3
 	window = gtk_widget_get_window (GTK_WIDGET (xtext));
-#else
+#endif
+#if !HAVE_GTK3
 	window = GTK_WIDGET (xtext)->window;
 #endif
 	if (!window)