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

dded GTK3 draw handling while keeping GTK2 expose handling wrapped under #if !HAVE_GTK3 for the spell entry widget.

Browse Source 
Updated gtk_entry_find_position to use GTK3-safe layout offsets and cursor position APIs while preserving GTK2-only field access behind #if !HAVE_GTK3.
This commit is contained in:
deepend
2026-01-31 16:22:35 -07:00
parent e44e801e3a
commit d8a8e6ce73
4 changed files with 61 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fe-gtk/meson.build
View File

@@ -55,8 +55,16 @@ endif
zoitechat_gtk_deps += gtk_dep
if gtk_dep.get_pkgconfig_variable('target') == 'x11'
zoitechat_gtk_deps += dependency('x11')
if get_option('gtk3') and host_machine.system() != 'windows'
gdk_x11_dep = dependency('gdk-x11-3.0', required: false)
if gdk_x11_dep.found()
zoitechat_gtk_deps += gdk_x11_dep
endif
x11_dep = dependency('x11', required: false)
if x11_dep.found()
zoitechat_gtk_deps += x11_dep
endif
endif
zoitechat_gtk_ldflags = []

3
src/fe-gtk/plugin-tray.c
View File

@@ -33,6 +33,9 @@
#if HAVE_GTK3
#include <gio/gio.h>
#if defined(GTK_DISABLE_DEPRECATED)
typedef struct _GtkStatusIcon GtkStatusIcon;
#endif
#if defined(HAVE_AYATANA_APPINDICATOR)
#include <libayatana-appindicator/app-indicator.h>
#else

48
src/fe-gtk/sexy-spell-entry.c
View File

@@ -116,7 +116,12 @@ static void sexy_spell_entry_editable_init (GtkEditableClass *iface);
static void sexy_spell_entry_init(SexySpellEntry *entry);
static void sexy_spell_entry_finalize(GObject *obj);
static void sexy_spell_entry_destroy(GObject *obj);
#if HAVE_GTK3
static gboolean sexy_spell_entry_draw(GtkWidget *widget, cairo_t *cr);
#endif
#if !HAVE_GTK3
static gint sexy_spell_entry_expose(GtkWidget *widget, GdkEventExpose *event);
#endif
static gint sexy_spell_entry_button_press(GtkWidget *widget, GdkEventButton *event);
/* GtkEditable handlers */
@@ -260,7 +265,12 @@ sexy_spell_entry_class_init(SexySpellEntryClass *klass)
object_class->dispose = sexy_spell_entry_destroy;
#if HAVE_GTK3
widget_class->draw = sexy_spell_entry_draw;
#endif
#if !HAVE_GTK3
widget_class->expose_event = sexy_spell_entry_expose;
#endif
widget_class->button_press_event = sexy_spell_entry_button_press;
/**
@@ -316,15 +326,34 @@ gtk_entry_find_position (GtkEntry *entry, gint x)
gint pos;
gboolean trailing;
#if HAVE_GTK3
{
gint layout_x;
gint layout_y;
gtk_entry_get_layout_offsets(entry, &layout_x, &layout_y);
x -= layout_x;
}
#endif
#if !HAVE_GTK3
x = x + entry->scroll_offset;
#endif
layout = gtk_entry_get_layout(entry);
text = pango_layout_get_text(layout);
#if HAVE_GTK3
cursor_index = g_utf8_offset_to_pointer(
text,
gtk_editable_get_position(GTK_EDITABLE(entry))) - text;
#endif
#if !HAVE_GTK3
cursor_index = g_utf8_offset_to_pointer(text, entry->current_pos) - text;
#endif
line = pango_layout_get_lines(layout)->data;
pango_layout_line_x_to_index(line, x * PANGO_SCALE, &index, &trailing);
#if !HAVE_GTK3
if (index >= cursor_index && entry->preedit_length) {
if (index >= cursor_index + entry->preedit_length) {
index -= entry->preedit_length;
@@ -333,6 +362,7 @@ gtk_entry_find_position (GtkEntry *entry, gint x)
trailing = FALSE;
}
}
#endif
pos = g_utf8_pointer_to_offset (text, text + index);
pos += trailing;
@@ -1184,6 +1214,22 @@ sexy_spell_entry_recheck_all(SexySpellEntry *entry)
}
}
#if HAVE_GTK3
static gboolean
sexy_spell_entry_draw(GtkWidget *widget, cairo_t *cr)
{
SexySpellEntry *entry = SEXY_SPELL_ENTRY(widget);
GtkEntry *gtk_entry = GTK_ENTRY(widget);
PangoLayout *layout;
layout = gtk_entry_get_layout(gtk_entry);
pango_layout_set_attributes(layout, entry->priv->attr_list);
return GTK_WIDGET_CLASS(parent_class)->draw (widget, cr);
}
#endif
#if !HAVE_GTK3
static gint
sexy_spell_entry_expose(GtkWidget *widget, GdkEventExpose *event)
{
@@ -1191,7 +1237,6 @@ sexy_spell_entry_expose(GtkWidget *widget, GdkEventExpose *event)
GtkEntry *gtk_entry = GTK_ENTRY(widget);
PangoLayout *layout;
layout = gtk_entry_get_layout(gtk_entry);
if (gtk_entry->preedit_length == 0)
{
@@ -1204,6 +1249,7 @@ sexy_spell_entry_expose(GtkWidget *widget, GdkEventExpose *event)
return GTK_WIDGET_CLASS(parent_class)->expose_event (widget, event);
}
#endif
static gint
sexy_spell_entry_button_press(GtkWidget *widget, GdkEventButton *event)

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

@@ -1015,7 +1015,7 @@ gtk_xtext_realize (GtkWidget * widget)
gdk_window_set_user_data (window, widget);
xtext->depth = gdk_window_get_visual (window)->depth;
xtext->depth = gdk_visual_get_depth (gdk_window_get_visual (window));
/* for the separator bar (light) */
xtext->light_gc.red = 1.0;