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

Improve GTK3 Performance

Browse Source
This commit is contained in:
deepend-tildeclub
2026-09-09 16:45:28 -06:00
parent bb3893d36c
commit b0a5c6f5e5
4 changed files with 39 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fe-gtk/fe-gtk.h
View File

@@ -114,7 +114,7 @@ typedef struct restore_gui
/* information stored when this tab isn't front-most */ /* information stored when this tab isn't front-most */
GtkListStore *user_model; /* for filling the GtkTreeView */ GtkListStore *user_model; /* for filling the GtkTreeView */
GHashTable *user_row_refs; GHashTable *user_row_iters; /* User * -> persistent GtkTreeIter * */
void *buffer; /* xtext_Buffer */ void *buffer; /* xtext_Buffer */
char *input_text; /* input text buffer (while not-front tab) */ char *input_text; /* input text buffer (while not-front tab) */
char *topic_text; /* topic GtkEntry buffer */ char *topic_text; /* topic GtkEntry buffer */

4
src/fe-gtk/maingui.c
View File

@@ -5786,9 +5786,9 @@ void
fe_session_callback (session *sess) fe_session_callback (session *sess)
{ {
gtk_xtext_buffer_free (sess->res->buffer); gtk_xtext_buffer_free (sess->res->buffer);
if (sess->res->user_row_iters)
g_hash_table_destroy (sess->res->user_row_iters);
g_object_unref (G_OBJECT (sess->res->user_model)); g_object_unref (G_OBJECT (sess->res->user_model));
if (sess->res->user_row_refs)
g_hash_table_destroy (sess->res->user_row_refs);
if (sess->res->banlist && sess->res->banlist->window) if (sess->res->banlist && sess->res->banlist->window)
mg_close_gen (NULL, sess->res->banlist->window); mg_close_gen (NULL, sess->res->banlist->window);

67
src/fe-gtk/userlistgui.c
View File

@@ -218,75 +218,49 @@ scroll_to_iter (GtkTreeIter *iter, GtkTreeView *treeview, GtkTreeModel *model)
static GHashTable * static GHashTable *
userlist_row_map_ensure (session *sess) userlist_row_map_ensure (session *sess)
{ {
if (!sess->res->user_row_refs) if (!sess->res->user_row_iters)
sess->res->user_row_refs = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) gtk_tree_row_reference_free); sess->res->user_row_iters = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) gtk_tree_iter_free);
return sess->res->user_row_refs; return sess->res->user_row_iters;
} }
static void static void
userlist_row_map_remove (session *sess, struct User *user) userlist_row_map_remove (session *sess, struct User *user)
{ {
if (!sess->res->user_row_refs) if (!sess->res->user_row_iters)
return; return;
g_hash_table_remove (sess->res->user_row_refs, user); g_hash_table_remove (sess->res->user_row_iters, user);
} }
static void static void
userlist_row_map_set (session *sess, GtkTreeModel *model, struct User *user, GtkTreeIter *iter) userlist_row_map_set (session *sess, GtkTreeModel *model, struct User *user, GtkTreeIter *iter)
{ {
GtkTreePath *path; /* The shared tree view can still show another session's model while a
GtkTreeRowReference *ref; * tab switch is pending. Never cache an iterator from that model. */
if (model != GTK_TREE_MODEL (sess->res->user_model))
path = gtk_tree_model_get_path (model, iter);
if (!path)
return; return;
ref = gtk_tree_row_reference_new (model, path); /* GtkListStore guarantees persistent iterators until their row is
gtk_tree_path_free (path); * removed, including across sorting. Unlike row references, these do
if (!ref) * not require every cached position to be updated on each insertion. */
return; g_hash_table_replace (userlist_row_map_ensure (sess), user, gtk_tree_iter_copy (iter));
g_hash_table_replace (userlist_row_map_ensure (sess), user, ref);
} }
static gboolean static gboolean
userlist_row_map_get_iter (session *sess, GtkTreeModel *model, struct User *user, GtkTreeIter *iter) userlist_row_map_get_iter (session *sess, GtkTreeModel *model, struct User *user, GtkTreeIter *iter)
{ {
GtkTreeRowReference *ref; GtkTreeIter *cached;
GtkTreePath *path;
struct User *row_user;
if (!sess->res->user_row_refs) if (model != GTK_TREE_MODEL (sess->res->user_model) || !sess->res->user_row_iters)
return FALSE; return FALSE;
ref = g_hash_table_lookup (sess->res->user_row_refs, user); cached = g_hash_table_lookup (sess->res->user_row_iters, user);
if (!ref) if (!cached)
return FALSE; return FALSE;
path = gtk_tree_row_reference_get_path (ref); /* Removal and clear invalidate the cache before deleting model rows. */
if (!path) *iter = *cached;
{
g_hash_table_remove (sess->res->user_row_refs, user);
return FALSE;
}
if (!gtk_tree_model_get_iter (model, iter, path))
{
gtk_tree_path_free (path);
g_hash_table_remove (sess->res->user_row_refs, user);
return FALSE;
}
gtk_tree_path_free (path);
gtk_tree_model_get (model, iter, COL_USER, &row_user, -1);
if (row_user != user)
{
g_hash_table_remove (sess->res->user_row_refs, user);
return FALSE;
}
return TRUE; return TRUE;
} }
@@ -587,7 +561,6 @@ fe_userlist_rehash (session *sess, struct User *user)
GTK_TREE_MODEL(sess->res->user_model), user, &sel); GTK_TREE_MODEL(sess->res->user_model), user, &sel);
if (!iter) if (!iter)
return; return;
userlist_row_map_set (sess, GTK_TREE_MODEL (sess->res->user_model), user, iter);
if (prefs.hex_away_track && user->away) if (prefs.hex_away_track && user->away)
{ {
@@ -698,8 +671,8 @@ fe_userlist_insert (session *sess, struct User *newuser, gboolean sel)
void void
fe_userlist_clear (session *sess) fe_userlist_clear (session *sess)
{ {
if (sess->res->user_row_refs) if (sess->res->user_row_iters)
g_hash_table_remove_all (sess->res->user_row_refs); g_hash_table_remove_all (sess->res->user_row_iters);
gtk_list_store_clear (sess->res->user_model); gtk_list_store_clear (sess->res->user_model);
} }

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

@@ -3130,6 +3130,7 @@ gtk_xtext_class_init (GtkXTextClass * class)
typedef struct chunk_s { typedef struct chunk_s {
GSList *slp; GSList *slp;
gboolean collect_metadata;
int off1, len1, emph; int off1, len1, emph;
offlen_t meta; offlen_t meta;
} chunk_t; } chunk_t;
@@ -3142,12 +3143,19 @@ xtext_do_chunk(chunk_t *c)
if (c->len1 == 0) if (c->len1 == 0)
return; return;
/* Copying, searching and saving only need the stripped text. */
if (!c->collect_metadata)
{
c->len1 = 0;
return;
}
meta = g_new (offlen_t, 1); meta = g_new (offlen_t, 1);
meta->off = c->off1; meta->off = c->off1;
meta->len = c->len1; meta->len = c->len1;
meta->emph = c->emph; meta->emph = c->emph;
meta->width = 0; meta->width = 0;
c->slp = g_slist_append (c->slp, meta); c->slp = g_slist_prepend (c->slp, meta);
c->len1 = 0; c->len1 = 0;
} }
@@ -3170,6 +3178,7 @@ gtk_xtext_strip_color (unsigned char *text, int len, unsigned char *outbuf,
new_str = outbuf; new_str = outbuf;
c.slp = NULL; c.slp = NULL;
c.collect_metadata = slpp != NULL;
c.off1 = 0; c.off1 = 0;
c.len1 = 0; c.len1 = 0;
c.emph = 0; c.emph = 0;
@@ -3240,9 +3249,7 @@ bad_utf8: /* Normal ending sequence, and give up if bad utf8 */
*newlen = i; *newlen = i;
if (slpp) if (slpp)
*slpp = c.slp; *slpp = g_slist_reverse (c.slp);
else
g_slist_free_full (c.slp, g_free);
return new_str; return new_str;
} }
@@ -4341,7 +4348,7 @@ gtk_xtext_lines_taken (xtext_buffer *buf, textentry * ent)
if (win_width >= ent->indent + ent->str_width) if (win_width >= ent->indent + ent->str_width)
{ {
ent->sublines = g_slist_append (ent->sublines, GINT_TO_POINTER (ent->str_len)); ent->sublines = g_slist_prepend (ent->sublines, GINT_TO_POINTER (ent->str_len));
ent->subline_count = 1; ent->subline_count = 1;
return ent->subline_count; return ent->subline_count;
} }
@@ -4352,13 +4359,15 @@ gtk_xtext_lines_taken (xtext_buffer *buf, textentry * ent)
do do
{ {
len = find_next_wrap (buf->xtext, ent, str, win_width, indent); len = find_next_wrap (buf->xtext, ent, str, win_width, indent);
ent->sublines = g_slist_append (ent->sublines, GINT_TO_POINTER (str + len - ent->str)); ent->sublines = g_slist_prepend (ent->sublines, GINT_TO_POINTER (str + len - ent->str));
ent->subline_count++;
indent = buf->indent; indent = buf->indent;
str += len; str += len;
} }
while (str < ent->str + ent->str_len); while (str < ent->str + ent->str_len);
ent->subline_count = g_slist_length (ent->sublines); /* Preserve display order without walking the growing list per wrap. */
ent->sublines = g_slist_reverse (ent->sublines);
return ent->subline_count; return ent->subline_count;
} }