1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
Index: geda-gattrib-1.4.3/src/gtkitementry_2_2.c
===================================================================
--- geda-gattrib-1.4.3.orig/src/gtkitementry_2_2.c
+++ geda-gattrib-1.4.3/src/gtkitementry_2_2.c
@@ -811,23 +811,23 @@ gtk_entry_real_insert_text (GtkEditable
new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
}
- if (new_text_length + entry->n_bytes + 1 > entry->text_size)
+ if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
{
- while (new_text_length + entry->n_bytes + 1 > entry->text_size)
+ while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
{
- if (entry->text_size == 0)
- entry->text_size = MIN_SIZE;
+ if (entry->x_text_size == 0)
+ entry->x_text_size = MIN_SIZE;
else
{
- if (2 * (guint)entry->text_size < MAX_SIZE &&
- 2 * (guint)entry->text_size > entry->text_size)
- entry->text_size *= 2;
+ if (2 * (guint)entry->x_text_size < MAX_SIZE &&
+ 2 * (guint)entry->x_text_size > entry->x_text_size)
+ entry->x_text_size *= 2;
else
{
- entry->text_size = MAX_SIZE;
- if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
+ entry->x_text_size = MAX_SIZE;
+ if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1)
{
- new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
+ new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1;
new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
n_chars = g_utf8_strlen (new_text, new_text_length);
}
@@ -836,19 +836,19 @@ gtk_entry_real_insert_text (GtkEditable
}
}
- entry->text = g_realloc (entry->text, entry->text_size);
+ entry->text = g_realloc (entry->text, entry->x_text_size);
}
index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
- g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
+ g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index);
memcpy (entry->text + index, new_text, new_text_length);
- entry->n_bytes += new_text_length;
+ entry->x_n_bytes += new_text_length;
entry->text_length += n_chars;
/* NUL terminate for safety and convenience */
- entry->text[entry->n_bytes] = '\0';
+ entry->text[entry->x_n_bytes] = '\0';
if (entry->current_pos > *position)
entry->current_pos += n_chars;
@@ -881,9 +881,9 @@ gtk_entry_real_delete_text (GtkEditable
gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
- g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
+ g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index);
entry->text_length -= (end_pos - start_pos);
- entry->n_bytes -= (end_index - start_index);
+ entry->x_n_bytes -= (end_index - start_index);
if (entry->current_pos > start_pos)
entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
@@ -1157,7 +1157,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIM
{
gtk_im_context_set_surrounding (context,
entry->text,
- entry->n_bytes,
+ entry->x_n_bytes,
g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
return TRUE;
@@ -1364,7 +1364,7 @@ gtk_entry_create_layout (GtkEntry *entry
if (entry->visible)
{
- g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
+ g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes);
g_string_insert (tmp_string, cursor_index, preedit_string);
}
else
@@ -1373,7 +1373,7 @@ gtk_entry_create_layout (GtkEntry *entry
gint preedit_len_chars;
gunichar invisible_char;
- ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
+ ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes);
preedit_len_chars = g_utf8_strlen (preedit_string, -1);
ch_len += preedit_len_chars;
@@ -1407,7 +1407,7 @@ gtk_entry_create_layout (GtkEntry *entry
{
if (entry->visible)
{
- pango_layout_set_text (layout, entry->text, entry->n_bytes);
+ pango_layout_set_text (layout, entry->text, entry->x_n_bytes);
}
else
{
|
