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, 184 insertions, 77 deletions

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 14d683e3c6..a11f37a267 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -284,6 +284,27 @@ static void move_cursor_page_ver (GtkText *text, int dir);
 static void move_cursor_ver (GtkText *text, int count);
 static void move_cursor_hor (GtkText *text, int count);
 
+/* Binding actions */
+static void gtk_text_move_cursor         (GtkEditable *editable,
+					  gint         x,
+					  gint         y);
+static void gtk_text_move_word           (GtkEditable *editable,
+					  gint         n);
+static void gtk_text_move_page           (GtkEditable *editable,
+					  gint         x,
+					  gint         y);
+static void gtk_text_move_to_row         (GtkEditable *editable,
+					  gint         row);
+static void gtk_text_move_to_column      (GtkEditable *editable,
+					  gint         row);
+static void gtk_text_kill_char           (GtkEditable *editable,
+					  gint         direction);
+static void gtk_text_kill_word           (GtkEditable *editable,
+					  gint         direction);
+static void gtk_text_kill_line           (GtkEditable *editable,
+					  gint         direction);
+
+/* To be removed */
 static void gtk_text_move_forward_character    (GtkText          *text);
 static void gtk_text_move_backward_character   (GtkText          *text);
 static void gtk_text_move_forward_word         (GtkText          *text);
@@ -363,7 +384,7 @@ static GtkTextFunction control_keys[26] =
 {
   (GtkTextFunction)gtk_text_move_beginning_of_line,    /* a */
   (GtkTextFunction)gtk_text_move_backward_character,   /* b */
-  gtk_editable_copy_clipboard,                         /* c */
+  (GtkTextFunction)gtk_editable_copy_clipboard,        /* c */
   (GtkTextFunction)gtk_text_delete_forward_character,  /* d */
   (GtkTextFunction)gtk_text_move_end_of_line,          /* e */
   (GtkTextFunction)gtk_text_move_forward_character,    /* f */
@@ -382,9 +403,9 @@ static GtkTextFunction control_keys[26] =
   NULL,                                                /* s */
   NULL,                                                /* t */
   (GtkTextFunction)gtk_text_delete_line,               /* u */
-  gtk_editable_paste_clipboard,                        /* v */
+  (GtkTextFunction)gtk_editable_paste_clipboard,       /* v */
   (GtkTextFunction)gtk_text_delete_backward_word,      /* w */
-  gtk_editable_cut_clipboard,                          /* x */
+  (GtkTextFunction)gtk_editable_cut_clipboard,         /* x */
   NULL,                                                /* y */
   NULL,                                                /* z */
 };
@@ -481,6 +502,17 @@ gtk_text_class_init (GtkTextClass *class)
 
   editable_class->insert_text = gtk_text_insert_text;
   editable_class->delete_text = gtk_text_delete_text;
+
+  editable_class->move_cursor = gtk_text_move_cursor;
+  editable_class->move_word = gtk_text_move_word;
+  editable_class->move_page = gtk_text_move_page;
+  editable_class->move_to_row = gtk_text_move_to_row;
+  editable_class->move_to_column = gtk_text_move_to_column;
+
+  editable_class->kill_char = gtk_text_kill_char;
+  editable_class->kill_word = gtk_text_kill_word;
+  editable_class->kill_line = gtk_text_kill_line;
+
   editable_class->update_text = gtk_text_update_text;
   editable_class->get_chars   = gtk_text_get_chars;
   editable_class->set_selection = gtk_text_set_selection;
@@ -1793,11 +1825,11 @@ gtk_text_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
 	    {
@@ -1810,7 +1842,7 @@ gtk_text_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_text_delete_forward_character (text);
@@ -3434,6 +3466,34 @@ move_cursor_hor (GtkText *text, int count)
   draw_cursor (text, FALSE);
 }
 
+static void 
+gtk_text_move_cursor (GtkEditable *editable,
+		      gint         x,
+		      gint         y)
+{
+  if (x > 0)
+    {
+      while (x-- != 0)
+	move_cursor_hor (GTK_TEXT (editable), 1);
+    }
+  else if (x < 0)
+    {
+      while (x++ != 0)
+	move_cursor_hor (GTK_TEXT (editable), -1);
+    }
+
+  if (y > 0)
+    {
+      while (y-- != 0)
+	move_cursor_ver (GTK_TEXT (editable), 1);
+    }
+  else if (x < 0)
+    {
+      while (y++ != 0)
+	move_cursor_ver (GTK_TEXT (editable), -1);
+    }
+}
+
 static void
 gtk_text_move_forward_character (GtkText *text)
 {
@@ -3458,6 +3518,22 @@ gtk_text_move_previous_line (GtkText *text)
   move_cursor_ver (text, -1);
 }
 
+static void 
+gtk_text_move_word (GtkEditable *editable,
+		    gint         n)
+{
+  if (n > 0)
+    {
+      while (n-- != 0)
+	gtk_text_move_forward_word (GTK_TEXT (editable));
+    }
+  else if (n < 0)
+    {
+      while (n++ != 0)
+	gtk_text_move_backward_word (GTK_TEXT (editable));
+    }
+}
+
 static void
 gtk_text_move_forward_word (GtkText *text)
 {
@@ -3496,135 +3572,166 @@ gtk_text_move_backward_word (GtkText *text)
   draw_cursor (text, FALSE);
 }
 
-static void
-gtk_text_move_beginning_of_line (GtkText *text)
+static void 
+gtk_text_move_page (GtkEditable *editable,
+		    gint         x,
+		    gint         y)
 {
-  text->cursor_virtual_x = 0;
+  if (y != 0)
+    scroll_int (GTK_TEXT (editable), 
+		y * GTK_TEXT(editable)->vadj->page_increment);  
+}
+
+static void 
+gtk_text_move_to_row (GtkEditable *editable,
+		      gint         row)
+{
+}
+
+static void 
+gtk_text_move_to_column (GtkEditable *editable,
+			 gint         column)
+{
+  GtkText *text;
+
+  text = GTK_TEXT (editable);
+
+  text->cursor_virtual_x = 0;	/* FIXME */
 
   undraw_cursor (text, FALSE);
-  
+
+  /* Move to the beginning of the line */
   while ((text->cursor_mark.index > 0) &&
 	 (GTK_TEXT_INDEX (text, text->cursor_mark.index - 1) != LINE_DELIM))
     decrement_mark (&text->cursor_mark);
-	  
+
+  while (!LAST_INDEX (text, text->cursor_mark) &&
+	 (GTK_TEXT_INDEX (text, text->cursor_mark.index) != LINE_DELIM))
+    {
+      if (column > 0)
+	column--;
+      else if (column == 0)
+	break;
+
+      advance_mark (&text->cursor_mark);
+    }
+
   find_cursor (text, TRUE);
   draw_cursor (text, FALSE);
 }
 
 static void
-gtk_text_move_end_of_line (GtkText *text)
+gtk_text_move_beginning_of_line (GtkText *text)
 {
-  text->cursor_virtual_x = 0;
+  gtk_text_move_to_column (GTK_EDITABLE (text), 0);
 
-  undraw_cursor (text, FALSE);
-
-  while (!LAST_INDEX (text, text->cursor_mark) &&
-	 (GTK_TEXT_INDEX (text, text->cursor_mark.index) != LINE_DELIM))
-    advance_mark (&text->cursor_mark);
-	  
-  find_cursor (text, TRUE);
-  draw_cursor (text, FALSE);
 }
 
 static void
-gtk_text_delete_forward_character (GtkText *text)
+gtk_text_move_end_of_line (GtkText *text)
 {
-  GtkEditable *editable;
-  editable = GTK_EDITABLE (text);
+  gtk_text_move_to_column (GTK_EDITABLE (text), -1);
+}
+
+static void 
+gtk_text_kill_char (GtkEditable *editable,
+		    gint         direction)
+{
+  GtkText *text;
 
+  text = GTK_TEXT (editable);
+  
   if (editable->selection_start_pos != editable->selection_end_pos)
     gtk_editable_delete_selection (editable);
   else
     {
-      if (text->point.index + 1 <= TEXT_LENGTH (text))
-	gtk_editable_delete_text (editable, text->point.index, text->point.index + 1);
+      if (direction >= 0)
+	{
+	  if (text->point.index + 1 <= TEXT_LENGTH (text))
+	    gtk_editable_delete_text (editable, text->point.index, text->point.index + 1);
+	}
+      else
+	{
+	  if (text->point.index > 0)
+	    gtk_editable_delete_text (editable, text->point.index - 1, text->point.index);
+	}
     }
 }
 
 static void
+gtk_text_delete_forward_character (GtkText *text)
+{
+  gtk_text_kill_char (GTK_EDITABLE (text), 1);
+}
+
+static void
 gtk_text_delete_backward_character (GtkText *text)
 {
-  GtkEditable *editable;
-  editable = GTK_EDITABLE (text);
+  gtk_text_kill_char (GTK_EDITABLE (text), -1);
+}
 
+static void 
+gtk_text_kill_word (GtkEditable *editable,
+		    gint         direction)
+{
   if (editable->selection_start_pos != editable->selection_end_pos)
     gtk_editable_delete_selection (editable);
   else
     {
-      if (text->point.index > 0)
-	gtk_editable_delete_text (editable, text->point.index - 1, text->point.index);
+      gint old_pos = editable->current_pos;
+      if (direction >= 0)
+	{
+	  gtk_text_move_word (editable, 1);
+	  gtk_editable_delete_text (editable, old_pos, editable->current_pos);
+	}
+      else
+	{
+	  gtk_text_move_word (editable, -1);
+	  gtk_editable_delete_text (editable, editable->current_pos, old_pos);
+	}
     }
 }
 
 static void
 gtk_text_delete_forward_word (GtkText *text)
 {
-  guint old_pos;
-
-  GtkEditable *editable;
-  editable = GTK_EDITABLE (text);
-
-  if (editable->selection_start_pos != editable->selection_end_pos)
-    gtk_editable_delete_selection (editable);
-  else
-    {
-      old_pos = text->cursor_mark.index;
-      gtk_text_move_forward_word (text);
-      gtk_editable_delete_text (editable, old_pos, text->cursor_mark.index);
-    }
+  gtk_text_kill_word (GTK_EDITABLE (text), 1);
 }
 
 static void
 gtk_text_delete_backward_word (GtkText *text)
 {
-  gint old_pos;
-
-  GtkEditable *editable;
-  editable = GTK_EDITABLE (text);
+  gtk_text_kill_word (GTK_EDITABLE (text), -1);
+}
 
-  if (editable->selection_start_pos != editable->selection_end_pos)
-    gtk_editable_delete_selection (editable);
+static void 
+gtk_text_kill_line (GtkEditable *editable,
+		    gint         direction)
+{
+  gint old_pos = editable->current_pos;
+  if (direction >= 0)
+    {
+      gtk_text_move_to_column (editable, -1);
+      gtk_editable_delete_text (editable, old_pos, editable->current_pos);
+    }
   else
     {
-      old_pos = text->cursor_mark.index;
-      gtk_text_move_backward_word (text);
-      gtk_editable_delete_text (editable, text->cursor_mark.index, old_pos);
+      gtk_text_move_to_column (editable, 0);
+      gtk_editable_delete_text (editable, editable->current_pos, old_pos);
     }
 }
 
 static void
 gtk_text_delete_line (GtkText *text)
 {
-  gint start_pos;
-  gint end_pos;
-  GtkEditable *editable = GTK_EDITABLE (text);
-
-  gtk_text_move_beginning_of_line (text);
-  start_pos = text->cursor_mark.index;
-
-  gtk_text_move_end_of_line (text);
-  gtk_text_move_forward_character (text);
-  end_pos = text->cursor_mark.index;
-
-  gtk_editable_delete_text (editable, start_pos, end_pos);
+  gtk_text_move_to_column (GTK_EDITABLE (text), 0);
+  gtk_text_kill_line (GTK_EDITABLE (text), 1);
 }
 
 static void
 gtk_text_delete_to_line_end (GtkText *text)
 {
-  gint start_pos;
-  gint end_pos;
-  GtkEditable *editable = GTK_EDITABLE (text);
-
-  start_pos = text->cursor_mark.index;
-
-  gtk_text_move_end_of_line (text);
-
-  if (start_pos == text->cursor_mark.index)
-    gtk_text_move_forward_character (text);
-  end_pos = text->cursor_mark.index;
-
-  gtk_editable_delete_text (editable, start_pos, end_pos);
+  gtk_text_kill_line (GTK_EDITABLE (text), 1);
 }
 
 static void