head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.124 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.122 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.120 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.118 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.116 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.114 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.112 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.110 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.108 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.106 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.104 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.102 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.100 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.98 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.96 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.94 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.92 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.90 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.88 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.86 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.84 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.82 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.80 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.76 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.56 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.78 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.74 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.72 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.70 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.68 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.66 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.64 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.62 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.60 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.58 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.54 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.52 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.50 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.48 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.46 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.44 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.42 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.40 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.38 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.36 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.34 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.32 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.30 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.28 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.26 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.24 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.22 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.20 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.18 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.16 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.14 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.12 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.10 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.8 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.6 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.4 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.2 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q1:1.1.0.4 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.2 pkgsrc-2009Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2010.11.30.20.15.49; author drochner; state Exp; branches; next 1.2; 1.2 date 2010.04.13.17.44.30; author drochner; state dead; branches; next 1.1; 1.1 date 2009.10.29.22.58.39; author tnn; state Exp; branches; next ; desc @@ 1.3 log @fix build with newer gtk2 (needs more cleanup, but looks OK for now) @ text @$NetBSD$ --- gtkextra/gtkitementry.c.orig 2010-03-13 05:49:00.000000000 +0000 +++ gtkextra/gtkitementry.c @@@@ -131,7 +131,9 @@@@ static void gtk_entry_draw_curso static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry, gboolean include_preedit); static void gtk_entry_queue_draw (GtkEntry *entry); +#if 0 static void gtk_entry_reset_im_context (GtkEntry *entry); +#endif static void gtk_entry_recompute (GtkEntry *entry); static void gtk_entry_get_cursor_locations (GtkEntry *entry, CursorType type, @@@@ -1754,6 +1756,7 @@@@ gtk_entry_queue_draw (GtkEntry *entry) gdk_window_invalidate_rect (entry->text_area, NULL, FALSE); } +#if 0 static void gtk_entry_reset_im_context (GtkEntry *entry) { @@@@ -1763,6 +1766,7 @@@@ gtk_entry_reset_im_context (GtkEntry *en gtk_im_context_reset (entry->im_context); } } +#endif static void gtk_entry_get_cursor_locations (GtkEntry *entry, @ 1.2 log @update to 2.1.2 changes: -bugfixes -compatibility with GTK+2.18 -adds some documentation @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.1 2009/10/29 22:58:39 tnn Exp $ d3 1 a3 1 --- gtkextra/gtkitementry.c.orig 2002-06-27 18:57:19.000000000 +0200 d5 20 a24 40 @@@@ -693,23 +693,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); } @@@@ -718,19 +718,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); d26 2 d29 2 a30 64 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; @@@@ -763,9 +763,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; @@@@ -1028,7 +1028,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; @@@@ -1229,7 +1229,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 @@@@ -1238,7 +1238,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; @@@@ -1272,7 +1272,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 { @ 1.1 log @Fix build with the latest GTK+ @ text @d1 1 a1 1 $NetBSD$ @