Remove --g-fatal-warnings flag from argv.

Thu Jun 18 21:13:54 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag
	  from argv.

Thu Jun 18 20:22:28 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/genmarshal.pl: Modified to be more idiomatic Perl,
	  to be more readable perl, to spit out stuff that looks
	  more like readable C, and to pipe output through indent
	  so output looks a lot like readable C. No functional
	  changes.

Thu Jun 18 17:43:31 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if
	  necessary when switching to a masked pixmap. (Based on a patch
	  from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>)

Thu Jun 18 16:18:10 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkeditable.[ch]: Added action signals for keyboard
   	  bindings. (move_cursor, kill_word, etc, etc, etc).

          removed the time argument from
	  gtk_editable_cut/copy/paste_clipboard (source but not
          binary incompatible...) Instead get time from
	  gtk_get_current_event ().

	* gtk/gtktext.c gtk/gtkentry.c: Support the new editable
	  signals.

Thu Jun 18 02:52:09 1998  Owen Taylor  <otaylor@gtk.org>

	Patches from Damon Chaplin <DAChaplin@email.msn.com>:

        gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change
	     parent class to GtkNotebookClass when splitting the widget in
	     two.  Also updated some comments.

        gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps'
               button without a font selected.

             Fixed bug in set_font_name - I hadn't updated the code to
               search for the style in the font_style clist - it was
               still assuming the style row was equal to its index,
               but it isn't any more.

             Changed 'Reset' button on filter page to 'Clear Filter'.
             Deleted old code relating to the old 'Filter Fonts' toggle
             Updated some comments.
             Cleared 'Actual Fontname' if no font is set.

        gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was
	     destroying the GtkFontSelection instead of the
             GtkFontSelectionDialog.

Thu Jun 18 02:15:31 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings
	  flag to make all warnings fatal errors.

	* gtk/testthreads.c: moved <pthreads.h> include inside
	  #ifdef USE_PTHREADS

Thu Jun 18 01:37:31 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c
	  gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c:

	- Added new function gtk_container_set_resize_mode() for
	  fine-grained control of where resize-queueing is done.

	- Removed GtkContainer::need_resize and GtkWindow::move_resize
	- Added GtkContainer::check_resize to replace need_resize.

	- Added function gtk_container_check_resize() to trigger
	  queued resizes, and gtk_container_resize_children() to
	  Figure which children need to be size-allocated. (logic
	  moved from gtkwindow.c)

	- Reorganized code in gtkwindow.c

	- Set the resize-mode for viewports so that resizes within
	  a viewport don't propagate out of it.

1 files changed, 157 insertions, 70 deletions

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 60c1ddacc9..db4a957cb0 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -88,6 +88,22 @@ static gchar *gtk_entry_get_chars         (GtkEditable       *editable,
 					   gint               start_pos,
 					   gint               end_pos);
 
+/* Binding actions */
+static void gtk_entry_move_cursor         (GtkEditable *editable,
+					   gint         x,
+					   gint         y);
+static void gtk_entry_move_word           (GtkEditable *editable,
+					   gint         n);
+static void gtk_entry_move_to_column      (GtkEditable *editable,
+					   gint         row);
+static void gtk_entry_kill_char           (GtkEditable *editable,
+					   gint         direction);
+static void gtk_entry_kill_word           (GtkEditable *editable,
+					   gint         direction);
+static void gtk_entry_kill_line           (GtkEditable *editable,
+					   gint         direction);
+
+/* To be removed */
 static void gtk_move_forward_character    (GtkEntry          *entry);
 static void gtk_move_backward_character   (GtkEntry          *entry);
 static void gtk_move_forward_word         (GtkEntry          *entry);
@@ -125,7 +141,7 @@ static GtkTextFunction control_keys[26] =
 {
   (GtkTextFunction)gtk_move_beginning_of_line,    /* a */
   (GtkTextFunction)gtk_move_backward_character,   /* b */
-  gtk_editable_copy_clipboard,                    /* c */
+  (GtkTextFunction)gtk_editable_copy_clipboard,   /* c */
   (GtkTextFunction)gtk_delete_forward_character,  /* d */
   (GtkTextFunction)gtk_move_end_of_line,          /* e */
   (GtkTextFunction)gtk_move_forward_character,    /* f */
@@ -144,9 +160,9 @@ static GtkTextFunction control_keys[26] =
   NULL,                                           /* s */
   NULL,                                           /* t */
   (GtkTextFunction)gtk_delete_line,               /* u */
-  gtk_editable_paste_clipboard,                   /* v */
+  (GtkTextFunction)gtk_editable_paste_clipboard,  /* v */
   (GtkTextFunction)gtk_delete_backward_word,      /* w */
-  gtk_editable_cut_clipboard,                     /* x */
+  (GtkTextFunction)gtk_editable_cut_clipboard,    /* x */
   NULL,                                           /* y */
   NULL,                                           /* z */
 };
@@ -238,11 +254,19 @@ gtk_entry_class_init (GtkEntryClass *class)
 
   editable_class->insert_text = gtk_entry_insert_text;
   editable_class->delete_text = gtk_entry_delete_text;
+  editable_class->changed = (void (*)(GtkEditable *)) gtk_entry_adjust_scroll;
+
+  editable_class->move_cursor = gtk_entry_move_cursor;
+  editable_class->move_word = gtk_entry_move_word;
+  editable_class->move_to_column = gtk_entry_move_to_column;
+
+  editable_class->kill_char = gtk_entry_kill_char;
+  editable_class->kill_word = gtk_entry_kill_word;
+  editable_class->kill_line = gtk_entry_kill_line;
+
   editable_class->update_text = gtk_entry_update_text;
   editable_class->get_chars   = gtk_entry_get_chars;
   editable_class->set_selection = gtk_entry_set_selection;
-  editable_class->changed = (void (*)(GtkEditable *)) gtk_entry_adjust_scroll;
-  editable_class->activate = NULL;
   editable_class->set_position = gtk_entry_set_position_from_editable;
 }
 
@@ -940,11 +964,11 @@ gtk_entry_key_press (GtkWidget   *widget,
       if (event->state & GDK_SHIFT_MASK)
 	{
 	  extend_selection = FALSE;
-	  gtk_editable_paste_clipboard (editable, event->time);
+	  gtk_editable_paste_clipboard (editable);
 	}
       else if (event->state & GDK_CONTROL_MASK)
 	{
-	  gtk_editable_copy_clipboard (editable, event->time);
+	  gtk_editable_copy_clipboard (editable);
 	}
       else
 	{
@@ -958,7 +982,7 @@ gtk_entry_key_press (GtkWidget   *widget,
       else if (event->state & GDK_SHIFT_MASK)
 	{
 	  extend_selection = FALSE;
-	  gtk_editable_cut_clipboard (editable, event->time);
+	  gtk_editable_cut_clipboard (editable);
 	}
       else
 	gtk_delete_forward_character (entry);
@@ -1796,45 +1820,81 @@ gtk_entry_get_chars      (GtkEditable   *editable,
     return NULL;
 }
 
-static void
-gtk_move_forward_character (GtkEntry *entry)
+static void 
+gtk_entry_move_cursor (GtkEditable *editable,
+		       gint         x,
+		       gint         y)
 {
   gint len;
 
-  GtkEditable *editable;
-  editable = GTK_EDITABLE (entry);
+  GtkEntry *entry;
+  entry = GTK_ENTRY (editable);
 
-  if (gtk_use_mb)
+  /* Horizontal motion */
+  if (x > 0)
     {
-      if (editable->current_pos < entry->text_length)
+      while (x-- != 0)
 	{
-	  len = mblen (entry->text+editable->current_pos, MB_CUR_MAX);
-	  editable->current_pos += (len>0)? len:1;
+	  if (gtk_use_mb)
+	    {
+	      if (editable->current_pos < entry->text_length)
+		{
+		  len = mblen (entry->text+editable->current_pos, MB_CUR_MAX);
+		  editable->current_pos += (len>0)? len:1;
+		}
+	  if (editable->current_pos > entry->text_length)
+	    editable->current_pos = entry->text_length;
+	    }
+	  else
+	    {
+	      if (editable->current_pos < entry->text_length)
+		editable->current_pos ++;
+	    }
 	}
-      if (editable->current_pos > entry->text_length)
-	editable->current_pos = entry->text_length;
     }
-  else
+  else if (x < 0)
     {
-      if (editable->current_pos < entry->text_length)
-	editable->current_pos ++;
+      while (x++ != 0)
+	{
+	  if (0 < editable->current_pos)
+	    {
+	      if (gtk_use_mb)
+		editable->current_pos = 
+		  entry->char_pos[gtk_entry_find_char (entry, editable->current_pos - 1)];
+	      else
+		editable->current_pos--;
+	    }
+	}
     }
+
+  /* Ignore vertical motion */
 }
 
 static void
-gtk_move_backward_character (GtkEntry *entry)
+gtk_move_forward_character (GtkEntry *entry)
 {
-  GtkEditable *editable;
+  gtk_entry_move_cursor (GTK_EDITABLE (entry), 1, 0);
+}
 
-  editable = GTK_EDITABLE (entry);
+static void
+gtk_move_backward_character (GtkEntry *entry)
+{
+  gtk_entry_move_cursor (GTK_EDITABLE (entry), -1, 0);
+}
 
-  if (0 < editable->current_pos)
+static void 
+gtk_entry_move_word (GtkEditable *editable,
+		     gint         n)
+{
+  if (n > 0)
     {
-      if (gtk_use_mb)
-	editable->current_pos = 
-	  entry->char_pos[gtk_entry_find_char (entry, editable->current_pos - 1)];
-      else
-	editable->current_pos--;
+      while (n-- != 0)
+	gtk_move_forward_word (GTK_ENTRY (editable));
+    }
+  else if (n < 0)
+    {
+      while (n++ != 0)
+	gtk_move_backward_word (GTK_ENTRY (editable));
     }
 }
 
@@ -1968,85 +2028,111 @@ gtk_move_backward_word (GtkEntry *entry)
 }
 
 static void
+gtk_entry_move_to_column (GtkEditable *editable, gint column)
+{
+  GtkEntry *entry;
+
+  entry = GTK_ENTRY (editable);
+  
+  if (column < 0 || column > entry->nchars)
+    editable->current_pos = entry->text_length;
+  else
+    editable->current_pos = entry->char_pos[column];
+}
+
+static void
 gtk_move_beginning_of_line (GtkEntry *entry)
 {
-  GTK_EDITABLE (entry)->current_pos = 0;
+  gtk_entry_move_to_column (GTK_EDITABLE (entry), 0);
 }
 
 static void
 gtk_move_end_of_line (GtkEntry *entry)
 {
-  GTK_EDITABLE (entry)->current_pos = entry->text_length;
+  gtk_entry_move_to_column (GTK_EDITABLE (entry), -1);
 }
 
 static void
-gtk_delete_forward_character (GtkEntry *entry)
+gtk_entry_kill_char (GtkEditable *editable,
+		     gint         direction)
 {
-  GtkEditable *editable;
-  gint old_pos;
-
-  editable = GTK_EDITABLE (entry);
-
   if (editable->selection_start_pos != editable->selection_end_pos)
     gtk_editable_delete_selection (editable);
   else
     {
-      old_pos = editable->current_pos;
-      gtk_move_forward_character (entry);
-      gtk_editable_delete_text (editable, old_pos, editable->current_pos);
+      gint old_pos = editable->current_pos;
+      if (direction >= 0)
+	{
+	  gtk_entry_move_cursor (editable, 1, 0);
+	  gtk_editable_delete_text (editable, old_pos, editable->current_pos);
+	}
+      else
+	{
+	  gtk_entry_move_cursor (editable, -1, 0);
+	  gtk_editable_delete_text (editable, editable->current_pos, old_pos);
+	}
     }
 }
 
 static void
-gtk_delete_backward_character (GtkEntry *entry)
+gtk_delete_forward_character (GtkEntry *entry)
 {
-  GtkEditable *editable;
-  gint old_pos;
+  gtk_entry_kill_char (GTK_EDITABLE (entry), 1);
+}
 
-  editable = GTK_EDITABLE (entry);
+static void
+gtk_delete_backward_character (GtkEntry *entry)
+{
+  gtk_entry_kill_char (GTK_EDITABLE (entry), -1);
+}
 
+static void
+gtk_entry_kill_word (GtkEditable *editable,
+		     gint         direction)
+{
   if (editable->selection_start_pos != editable->selection_end_pos)
     gtk_editable_delete_selection (editable);
   else
     {
-      old_pos = editable->current_pos;
-      gtk_move_backward_character (entry);
-      gtk_editable_delete_text (editable, editable->current_pos, old_pos);
+      gint old_pos = editable->current_pos;
+      if (direction >= 0)
+	{
+	  gtk_entry_move_word (editable, 1);
+	  gtk_editable_delete_text (editable, old_pos, editable->current_pos);
+	}
+      else
+	{
+	  gtk_entry_move_word (editable, -1);
+	  gtk_editable_delete_text (editable, editable->current_pos, old_pos);
+	}
     }
 }
 
 static void
 gtk_delete_forward_word (GtkEntry *entry)
 {
-  GtkEditable *editable;
-  gint old_pos;
-
-  editable = GTK_EDITABLE (entry);
-
-  if (editable->selection_start_pos != editable->selection_end_pos)
-    gtk_editable_delete_selection (editable);
-  else
-    {
-      old_pos = editable->current_pos;
-      gtk_move_forward_word (entry);
-      gtk_editable_delete_text (editable, old_pos, editable->current_pos);
-    }
+  gtk_entry_kill_word (GTK_EDITABLE (entry), 1);
 }
 
 static void
 gtk_delete_backward_word (GtkEntry *entry)
 {
-  GtkEditable *editable;
-  gint old_pos;
-
-  editable = GTK_EDITABLE (entry);
+  gtk_entry_kill_word (GTK_EDITABLE (entry), -1);
+}
 
-  if (editable->selection_start_pos != editable->selection_end_pos)
-    gtk_editable_delete_selection (editable);
+static void
+gtk_entry_kill_line (GtkEditable *editable,
+		     gint         direction)
+{
+  gint old_pos = editable->current_pos;
+  if (direction >= 0)
+    {
+      gtk_entry_move_to_column (editable, -1);
+      gtk_editable_delete_text (editable, old_pos, editable->current_pos);
+    }
   else
     {
-      old_pos = editable->current_pos;
-      gtk_move_backward_word (entry);
+      gtk_entry_move_to_column (editable, 0);
       gtk_editable_delete_text (editable, editable->current_pos, old_pos);
     }
 }
@@ -2054,7 +2140,8 @@ gtk_delete_backward_word (GtkEntry *entry)
 static void
 gtk_delete_line (GtkEntry *entry)
 {
-  gtk_editable_delete_text (GTK_EDITABLE(entry), 0, entry->text_length);
+  gtk_entry_move_to_column (GTK_EDITABLE (entry), 0);
+  gtk_entry_kill_line (GTK_EDITABLE (entry), 1);
 }
 
 static void