deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-22 13:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added GTK3 window guard handling for scrolling/selection height calculations while keeping GTK2 direct window access for those paths.

Browse Source 
Switched sizing/visibility calculations and buffer show sizing to use GTK3 window retrieval with GTK2 fallbacks in layout/rendering paths.
This commit is contained in:
deepend
2026-01-29 21:21:40 -07:00
parent c009c30211
commit 667a56ca6c
1 changed files with 59 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/fe-gtk/xtext.c
View File

@@ -1642,10 +1642,11 @@ gtk_xtext_scrolldown_timeout (GtkXText * xtext)
if (!window) if (!window)
return 0; return 0;
gtk_xtext_get_pointer (window, NULL, &p_y, NULL); gtk_xtext_get_pointer (window, NULL, &p_y, NULL);
win_height = gdk_window_get_height (window);
#else #else
gtk_xtext_get_pointer (GTK_WIDGET (xtext)->window, NULL, &p_y, NULL); gtk_xtext_get_pointer (GTK_WIDGET (xtext)->window, NULL, &p_y, NULL);
win_height = gdk_window_get_height (GTK_WIDGET (xtext)->window);
#endif #endif
win_height = gdk_window_get_height (gtk_widget_get_window (GTK_WIDGET (xtext)));
if (buf->last_ent_end == NULL || /* If context has changed OR */ if (buf->last_ent_end == NULL || /* If context has changed OR */
buf->pagetop_ent == NULL || /* pagetop_ent is reset OR */ buf->pagetop_ent == NULL || /* pagetop_ent is reset OR */
@@ -1724,13 +1725,22 @@ gtk_xtext_selection_update (GtkXText * xtext, GdkEventMotion * event, int p_y, g
{ {
int win_height; int win_height;
int moved; int moved;
#if HAVE_GTK3
GdkWindow *window = gtk_widget_get_window (GTK_WIDGET (xtext));
#endif
if (xtext->scroll_tag) if (xtext->scroll_tag)
{ {
return; return;
} }
win_height = gdk_window_get_height (gtk_widget_get_window (GTK_WIDGET (xtext))); #if HAVE_GTK3
if (!window)
return;
win_height = gdk_window_get_height (window);
#else
win_height = gdk_window_get_height (GTK_WIDGET (xtext)->window);
#endif
/* selecting past top of window, scroll up! */ /* selecting past top of window, scroll up! */
if (p_y < 0 && xtext->adj->value >= 0) if (p_y < 0 && xtext->adj->value >= 0)
@@ -3904,9 +3914,19 @@ gtk_xtext_calc_lines (xtext_buffer *buf, int fire_signal)
int width; int width;
int height; int height;
int lines; int lines;
#if HAVE_GTK3
GdkWindow *window = gtk_widget_get_window (GTK_WIDGET (buf->xtext));
#endif
height = gdk_window_get_height (gtk_widget_get_window (GTK_WIDGET (buf->xtext))); #if HAVE_GTK3
width = gdk_window_get_width (gtk_widget_get_window (GTK_WIDGET (buf->xtext))); if (!window)
return;
height = gdk_window_get_height (window);
width = gdk_window_get_width (window);
#else
height = gdk_window_get_height (GTK_WIDGET (buf->xtext)->window);
width = gdk_window_get_width (GTK_WIDGET (buf->xtext)->window);
#endif
width -= MARGIN; width -= MARGIN;
if (width < 30 || height < buf->xtext->fontsize || width < buf->indent + 30) if (width < 30 || height < buf->xtext->fontsize || width < buf->indent + 30)
@@ -3996,12 +4016,22 @@ gtk_xtext_render_ents (GtkXText * xtext, textentry * enta, textentry * entb)
int height; int height;
int subline; int subline;
int drawing = FALSE; int drawing = FALSE;
#if HAVE_GTK3
GdkWindow *window = gtk_widget_get_window (GTK_WIDGET (xtext));
#endif
if (xtext->buffer->indent < MARGIN) if (xtext->buffer->indent < MARGIN)
xtext->buffer->indent = MARGIN; /* 2 pixels is our left margin */ xtext->buffer->indent = MARGIN; /* 2 pixels is our left margin */
height = gdk_window_get_height (gtk_widget_get_window (GTK_WIDGET (xtext))); #if HAVE_GTK3
width = gdk_window_get_width (gtk_widget_get_window (GTK_WIDGET (xtext))); if (!window)
return 0;
height = gdk_window_get_height (window);
width = gdk_window_get_width (window);
#else
height = gdk_window_get_height (GTK_WIDGET (xtext)->window);
width = gdk_window_get_width (GTK_WIDGET (xtext)->window);
#endif
width -= MARGIN; width -= MARGIN;
if (width < 32 || height < xtext->fontsize || width < xtext->buffer->indent + 30) if (width < 32 || height < xtext->fontsize || width < xtext->buffer->indent + 30)
@@ -4444,13 +4474,22 @@ gtk_xtext_check_ent_visibility (GtkXText * xtext, textentry *find_ent, int add)
int lines; int lines;
xtext_buffer *buf = xtext->buffer; xtext_buffer *buf = xtext->buffer;
int height; int height;
#if HAVE_GTK3
GdkWindow *window = gtk_widget_get_window (GTK_WIDGET (xtext));
#endif
if (find_ent == NULL) if (find_ent == NULL)
{ {
return FALSE; return FALSE;
} }
height = gdk_window_get_height (gtk_widget_get_window (GTK_WIDGET (xtext))); #if HAVE_GTK3
if (!window)
return FALSE;
height = gdk_window_get_height (window);
#else
height = gdk_window_get_height (GTK_WIDGET (xtext)->window);
#endif
ent = buf->pagetop_ent; ent = buf->pagetop_ent;
/* If top line not completely displayed return FALSE */ /* If top line not completely displayed return FALSE */
@@ -5289,6 +5328,9 @@ void
gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render) gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render)
{ {
int w, h; int w, h;
#if HAVE_GTK3
GdkWindow *window;
#endif
buf->xtext = xtext; buf->xtext = xtext;
@@ -5312,8 +5354,16 @@ gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render)
if (!gtk_widget_get_realized (GTK_WIDGET (xtext))) if (!gtk_widget_get_realized (GTK_WIDGET (xtext)))
gtk_widget_realize (GTK_WIDGET (xtext)); gtk_widget_realize (GTK_WIDGET (xtext));
h = gdk_window_get_height (gtk_widget_get_window (GTK_WIDGET (xtext))); #if HAVE_GTK3
w = gdk_window_get_width (gtk_widget_get_window (GTK_WIDGET (xtext))); window = gtk_widget_get_window (GTK_WIDGET (xtext));
if (!window)
return;
h = gdk_window_get_height (window);
w = gdk_window_get_width (window);
#else
h = gdk_window_get_height (GTK_WIDGET (xtext)->window);
w = gdk_window_get_width (GTK_WIDGET (xtext)->window);
#endif
/* after a font change */ /* after a font change */
if (buf->needs_recalc) if (buf->needs_recalc)