--- a/gntentry.c Fri Apr 19 23:18:00 2019 -0400
+++ b/gntentry.c Fri Apr 19 23:38:43 2019 -0400
@@ -96,10 +96,9 @@
G_DEFINE_TYPE_WITH_PRIVATE(GntEntry, gnt_entry, GNT_TYPE_WIDGET)
-update_kill_ring(GntEntry *entry, GntEntryAction action, const char *text, int len)
+update_kill_ring(GntEntryPrivate *priv, GntEntryAction action, const char *text, - GntEntryPrivate *priv = gnt_entry_get_instance_private(entry);
priv->killring->last = action;
@@ -152,9 +151,8 @@
-destroy_suggest(GntEntry *entry)
+destroy_suggest(GntEntryPrivate *priv) - GntEntryPrivate *priv = gnt_entry_get_instance_private(entry);
gnt_widget_destroy(priv->ddown->parent);
@@ -162,9 +160,8 @@
-get_beginning_of_word(GntEntry *entry)
+get_beginning_of_word(GntEntryPrivate *priv) - GntEntryPrivate *priv = gnt_entry_get_instance_private(entry);
while (s > priv->start) {
char *t = g_utf8_find_prev_char(priv->start, s);
@@ -182,7 +179,7 @@
int offstart = 0, offend = 0;
- char *s = get_beginning_of_word(entry);
+ char *s = get_beginning_of_word(priv); offstart = g_utf8_pointer_to_offset(priv->start, s);
while (*iter && toupper(*s) == toupper(*iter)) {
@@ -200,7 +197,7 @@
g_signal_emit(G_OBJECT(entry), signals[SIG_COMPLETION], 0,
priv->start + offstart, priv->start + offend);
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); @@ -227,7 +224,7 @@
- char *s = get_beginning_of_word(entry);
+ char *s = get_beginning_of_word(priv); suggest = g_strndup(s, priv->cursor - s);
offset = gnt_util_onscreen_width(priv->scroll, s);
@@ -276,13 +273,13 @@
- destroy_suggest(entry);
char *store = g_strndup(priv->start, priv->end - priv->start);
- destroy_suggest(entry);
complete_suggest(entry, sgst);
ret = (strncmp(store, priv->start, priv->end - priv->start) !=
@@ -387,7 +384,7 @@
priv->scroll = priv->cursor;
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); entry_redraw(GNT_WIDGET(entry));
@@ -408,7 +405,7 @@
priv->scroll = g_utf8_find_next_char(priv->scroll, NULL);
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); entry_redraw(GNT_WIDGET(entry));
@@ -425,7 +422,7 @@
len = priv->cursor - g_utf8_find_prev_char(priv->start, priv->cursor);
- update_kill_ring(entry, ENTRY_JAIL, priv->cursor, -len);
+ update_kill_ring(priv, ENTRY_JAIL, priv->cursor, -len); memmove(priv->cursor, priv->cursor + len, priv->end - priv->cursor);
@@ -456,7 +453,7 @@
len = g_utf8_find_next_char(priv->cursor, NULL) - priv->cursor;
- update_kill_ring(entry, ENTRY_JAIL, priv->cursor, len);
+ update_kill_ring(priv, ENTRY_JAIL, priv->cursor, len); memmove(priv->cursor, priv->cursor + len,
priv->end - priv->cursor - len + 1);
@@ -477,7 +474,7 @@
GntEntryPrivate *priv = gnt_entry_get_instance_private(entry);
priv->scroll = priv->cursor = priv->start;
entry_redraw(GNT_WIDGET(entry));
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); @@ -496,7 +493,7 @@
entry_redraw(GNT_WIDGET(entry));
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); @@ -508,10 +505,10 @@
if (priv->histlength && priv->history->prev) {
priv->history = priv->history->prev;
gnt_entry_set_text_internal(entry, priv->history->data);
- destroy_suggest(entry);
entry_text_changed(entry);
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); @@ -532,10 +529,10 @@
priv->history = priv->history->next;
gnt_entry_set_text_internal(entry, priv->history->data);
- destroy_suggest(entry);
entry_text_changed(entry);
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); @@ -583,10 +580,10 @@
gnt_entry_set_text_internal(entry, priv->history->data);
- destroy_suggest(entry);
entry_text_changed(entry);
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); @@ -605,7 +602,7 @@
a = g_strndup(priv->start, priv->cursor - priv->start);
all = g_strconcat(a, text, priv->cursor, NULL);
gnt_entry_set_text_internal(entry, all);
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); @@ -687,7 +684,7 @@
- update_kill_ring(entry, ENTRY_DEL_BOL, priv->start,
+ update_kill_ring(priv, ENTRY_DEL_BOL, priv->start, priv->cursor - priv->start);
memmove(priv->start, priv->cursor, priv->end - priv->cursor);
priv->end -= (priv->cursor - priv->start);
@@ -708,7 +705,7 @@
- update_kill_ring(entry, ENTRY_DEL_EOL, priv->cursor,
+ update_kill_ring(priv, ENTRY_DEL_EOL, priv->cursor, priv->end - priv->cursor);
priv->end = priv->cursor;
memset(priv->end, '\0', priv->buffer - (priv->end - priv->start));
@@ -774,7 +771,7 @@
if (priv->cursor < priv->scroll) {
priv->scroll = priv->cursor;
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); entry_redraw(GNT_WIDGET(bind));
@@ -794,7 +791,7 @@
iter = (char *)begin_word(iter, priv->start);
count = priv->cursor - iter;
- update_kill_ring(entry, ENTRY_DEL_BWD_WORD, iter, count);
+ update_kill_ring(priv, ENTRY_DEL_BWD_WORD, iter, count); memmove(iter, priv->cursor, priv->end - priv->cursor);
@@ -822,7 +819,7 @@
priv->scroll = g_utf8_find_next_char(priv->scroll, NULL);
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); @@ -837,7 +834,7 @@
int len = priv->end - iter + 1;
- update_kill_ring(entry, ENTRY_DEL_FWD_WORD, priv->cursor,
+ update_kill_ring(priv, ENTRY_DEL_FWD_WORD, priv->cursor, memmove(priv->cursor, iter, len);
len = iter - priv->cursor;
@@ -873,7 +870,7 @@
memmove(prev, current, priv->cursor - current);
memcpy(prev + (priv->cursor - current), hold, current - prev);
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); entry_redraw(GNT_WIDGET(entry));
entry_text_changed(entry);
@@ -898,7 +895,7 @@
- destroy_suggest(entry);
@@ -909,10 +906,10 @@
gnt_tree_get_selection_data(GNT_TREE(priv->ddown)));
- destroy_suggest(entry);
complete_suggest(entry, text);
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); entry_text_changed(entry);
@@ -986,7 +983,7 @@
show_suggest_dropdown(entry);
- update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+ update_kill_ring(priv, ENTRY_JAIL, NULL, 0); entry_text_changed(entry);
@@ -1037,7 +1034,8 @@
gnt_entry_lost_focus(GntWidget *widget)
GntEntry *entry = GNT_ENTRY(widget);
- destroy_suggest(entry);
+ GntEntryPrivate *priv = gnt_entry_get_instance_private(entry); @@ -1295,7 +1293,7 @@
gnt_entry_set_text_internal(entry, NULL);
priv->scroll = priv->cursor = priv->end = priv->start;
entry_redraw(GNT_WIDGET(entry));
- destroy_suggest(entry);
entry_text_changed(entry);