callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warning when moving between paragraphs.

Browse Source 
Sun Nov 12 19:11:42 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):
	Fix warning when moving between paragraphs.

	* gtk/gtkentry.[ch]: Change move => move_cursor,
	delete => delete_from_cursor, insert => insert_at_cursor
This commit is contained in:
Owen Taylor
2000-11-13 00:30:05 +00:00
committed by Owen Taylor
parent 4835157161
commit 549e225c8b
10 changed files with 114 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sun Nov 12 19:11:42 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):
Fix warning when moving between paragraphs.
* gtk/gtkentry.[ch]: Change move => move_cursor,
delete => delete_from_cursor, insert => insert_at_cursor
Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk> Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk>
* modules/input/imviqr.c: A vietnamese VIQR-based input method. * modules/input/imviqr.c: A vietnamese VIQR-based input method.

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,11 @@
Sun Nov 12 19:11:42 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):
Fix warning when moving between paragraphs.
* gtk/gtkentry.[ch]: Change move => move_cursor,
delete => delete_from_cursor, insert => insert_at_cursor
Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk> Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk>
* modules/input/imviqr.c: A vietnamese VIQR-based input method. * modules/input/imviqr.c: A vietnamese VIQR-based input method.

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Sun Nov 12 19:11:42 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):
Fix warning when moving between paragraphs.
* gtk/gtkentry.[ch]: Change move => move_cursor,
delete => delete_from_cursor, insert => insert_at_cursor
Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk> Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk>
* modules/input/imviqr.c: A vietnamese VIQR-based input method. * modules/input/imviqr.c: A vietnamese VIQR-based input method.

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
Sun Nov 12 19:11:42 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):
Fix warning when moving between paragraphs.
* gtk/gtkentry.[ch]: Change move => move_cursor,
delete => delete_from_cursor, insert => insert_at_cursor
Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk> Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk>
* modules/input/imviqr.c: A vietnamese VIQR-based input method. * modules/input/imviqr.c: A vietnamese VIQR-based input method.

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Sun Nov 12 19:11:42 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):
Fix warning when moving between paragraphs.
* gtk/gtkentry.[ch]: Change move => move_cursor,
delete => delete_from_cursor, insert => insert_at_cursor
Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk> Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk>
* modules/input/imviqr.c: A vietnamese VIQR-based input method. * modules/input/imviqr.c: A vietnamese VIQR-based input method.

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Sun Nov 12 19:11:42 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):
Fix warning when moving between paragraphs.
* gtk/gtkentry.[ch]: Change move => move_cursor,
delete => delete_from_cursor, insert => insert_at_cursor
Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk> Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk>
* modules/input/imviqr.c: A vietnamese VIQR-based input method. * modules/input/imviqr.c: A vietnamese VIQR-based input method.

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Sun Nov 12 19:11:42 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):
Fix warning when moving between paragraphs.
* gtk/gtkentry.[ch]: Change move => move_cursor,
delete => delete_from_cursor, insert => insert_at_cursor
Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk> Sun Nov 12 22:52:51 2000 Robert Brady <robert@suse.co.uk>
* modules/input/imviqr.c: A vietnamese VIQR-based input method. * modules/input/imviqr.c: A vietnamese VIQR-based input method.

70
gtk/gtkentry.c
View File

@ -144,26 +144,26 @@ static gboolean gtk_entry_get_selection_bounds (GtkEditable *editable,
/* Default signal handlers /* Default signal handlers
*/ */
static void gtk_entry_real_insert_text (GtkEntry *entry, static void gtk_entry_real_insert_text (GtkEntry *entry,
const gchar *new_text, const gchar *new_text,
gint new_text_length, gint new_text_length,
gint *position); gint *position);
static void gtk_entry_real_delete_text (GtkEntry *entry, static void gtk_entry_real_delete_text (GtkEntry *entry,
gint start_pos, gint start_pos,
gint end_pos); gint end_pos);
static void gtk_entry_move (GtkEntry *entry, static void gtk_entry_move_cursor (GtkEntry *entry,
GtkMovementStep step, GtkMovementStep step,
gint count, gint count,
gboolean extend_selection); gboolean extend_selection);
static void gtk_entry_insert (GtkEntry *entry, static void gtk_entry_insert_at_cursor (GtkEntry *entry,
const gchar *str); const gchar *str);
static void gtk_entry_delete (GtkEntry *entry, static void gtk_entry_delete_from_cursor (GtkEntry *entry,
GtkDeleteType type, GtkDeleteType type,
gint count); gint count);
static void gtk_entry_cut_clipboard (GtkEntry *entry); static void gtk_entry_cut_clipboard (GtkEntry *entry);
static void gtk_entry_copy_clipboard (GtkEntry *entry); static void gtk_entry_copy_clipboard (GtkEntry *entry);
static void gtk_entry_paste_clipboard (GtkEntry *entry); static void gtk_entry_paste_clipboard (GtkEntry *entry);
static void gtk_entry_toggle_overwrite (GtkEntry *entry); static void gtk_entry_toggle_overwrite (GtkEntry *entry);
/* IM Context Callbacks /* IM Context Callbacks
*/ */
@ -333,7 +333,7 @@ gtk_entry_class_init (GtkEntryClass *class)
gtk_signal_new ("move_cursor", gtk_signal_new ("move_cursor",
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkEntryClass, move), GTK_SIGNAL_OFFSET (GtkEntryClass, move_cursor),
gtk_marshal_VOID__ENUM_INT_BOOLEAN, gtk_marshal_VOID__ENUM_INT_BOOLEAN,
GTK_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT, GTK_TYPE_BOOL); GTK_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT, GTK_TYPE_BOOL);
@ -341,7 +341,7 @@ gtk_entry_class_init (GtkEntryClass *class)
gtk_signal_new ("insert_at_cursor", gtk_signal_new ("insert_at_cursor",
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkEntryClass, insert), GTK_SIGNAL_OFFSET (GtkEntryClass, insert_at_cursor),
gtk_marshal_VOID__STRING, gtk_marshal_VOID__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING); GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
@ -349,7 +349,7 @@ gtk_entry_class_init (GtkEntryClass *class)
gtk_signal_new ("delete_from_cursor", gtk_signal_new ("delete_from_cursor",
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkEntryClass, delete), GTK_SIGNAL_OFFSET (GtkEntryClass, delete_from_cursor),
gtk_marshal_VOID__ENUM_INT, gtk_marshal_VOID__ENUM_INT,
GTK_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, GTK_TYPE_INT); GTK_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, GTK_TYPE_INT);
@ -533,9 +533,9 @@ gtk_entry_class_init (GtkEntryClass *class)
class->insert_text = gtk_entry_real_insert_text; class->insert_text = gtk_entry_real_insert_text;
class->delete_text = gtk_entry_real_delete_text; class->delete_text = gtk_entry_real_delete_text;
class->move = gtk_entry_move; class->move_cursor = gtk_entry_move_cursor;
class->insert = gtk_entry_insert; class->insert_at_cursor = gtk_entry_insert_at_cursor;
class->delete = gtk_entry_delete; class->delete_from_cursor = gtk_entry_delete_from_cursor;
class->cut_clipboard = gtk_entry_cut_clipboard; class->cut_clipboard = gtk_entry_cut_clipboard;
class->copy_clipboard = gtk_entry_copy_clipboard; class->copy_clipboard = gtk_entry_copy_clipboard;
class->paste_clipboard = gtk_entry_paste_clipboard; class->paste_clipboard = gtk_entry_paste_clipboard;
@ -1377,10 +1377,10 @@ gtk_entry_real_delete_text (GtkEntry *entry,
static void static void
gtk_entry_move (GtkEntry *entry, gtk_entry_move_cursor (GtkEntry *entry,
GtkMovementStep step, GtkMovementStep step,
gint count, gint count,
gboolean extend_selection) gboolean extend_selection)
{ {
gint new_pos = entry->current_pos; gint new_pos = entry->current_pos;
@ -1424,8 +1424,8 @@ gtk_entry_move (GtkEntry *entry,
} }
static void static void
gtk_entry_insert (GtkEntry *entry, gtk_entry_insert_at_cursor (GtkEntry *entry,
const gchar *str) const gchar *str)
{ {
GtkEditable *editable = GTK_EDITABLE (entry); GtkEditable *editable = GTK_EDITABLE (entry);
gint pos = entry->current_pos; gint pos = entry->current_pos;
@ -1437,9 +1437,9 @@ gtk_entry_insert (GtkEntry *entry,
} }
static void static void
gtk_entry_delete (GtkEntry *entry, gtk_entry_delete_from_cursor (GtkEntry *entry,
GtkDeleteType type, GtkDeleteType type,
gint count) gint count)
{ {
GtkEditable *editable = GTK_EDITABLE (entry); GtkEditable *editable = GTK_EDITABLE (entry);
gint start_pos = entry->current_pos; gint start_pos = entry->current_pos;

28
gtk/gtkentry.h
View File

@ -106,20 +106,20 @@ struct _GtkEntryClass
/* Action signals /* Action signals
*/ */
void (* activate) (GtkEntry *entry); void (* activate) (GtkEntry *entry);
void (* move) (GtkEntry *entry, void (* move_cursor) (GtkEntry *entry,
GtkMovementStep step, GtkMovementStep step,
gint count, gint count,
gboolean extend_selection); gboolean extend_selection);
void (* insert) (GtkEntry *entry, void (* insert_at_cursor) (GtkEntry *entry,
const gchar *str); const gchar *str);
void (* delete) (GtkEntry *entry, void (* delete_from_cursor) (GtkEntry *entry,
GtkDeleteType type, GtkDeleteType type,
gint count); gint count);
void (* cut_clipboard) (GtkEntry *entry); void (* cut_clipboard) (GtkEntry *entry);
void (* copy_clipboard) (GtkEntry *entry); void (* copy_clipboard) (GtkEntry *entry);
void (* paste_clipboard) (GtkEntry *entry); void (* paste_clipboard) (GtkEntry *entry);
void (* toggle_overwrite) (GtkEntry *entry); void (* toggle_overwrite) (GtkEntry *entry);
}; };
GtkType gtk_entry_get_type (void) G_GNUC_CONST; GtkType gtk_entry_get_type (void) G_GNUC_CONST;

10
gtk/gtktextlayout.c
View File

@ -2392,6 +2392,7 @@ gtk_text_layout_move_iter_to_next_line (GtkTextLayout *layout,
gboolean found = FALSE; gboolean found = FALSE;
gboolean found_after = FALSE; gboolean found_after = FALSE;
gboolean first = TRUE;
g_return_if_fail (layout != NULL); g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout)); g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
@ -2405,8 +2406,15 @@ gtk_text_layout_move_iter_to_next_line (GtkTextLayout *layout,
GSList *tmp_list; GSList *tmp_list;
display = gtk_text_layout_get_line_display (layout, line, FALSE); display = gtk_text_layout_get_line_display (layout, line, FALSE);
line_byte = line_display_iter_to_index (layout, display, iter);
if (first)
{
line_byte = line_display_iter_to_index (layout, display, iter);
first = FALSE;
}
else
line_byte = 0;
tmp_list = pango_layout_get_lines (display->layout); tmp_list = pango_layout_get_lines (display->layout);
while (tmp_list && !found_after) while (tmp_list && !found_after)
{ {