Fixed problem with deleting while text is selected.

Changed behavior so that motion keys remove selection.
Added new gtk_entry_select_region () call.

                                        -owt

diff --git a/ChangeLog b/ChangeLog
index e33b28e72a6bc5bd63bf6ee6a17da9bb8b6575e3..d3f3fc7437f7fdc92f45f6d25c0dd34f4822191a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Jan  6 17:07:29 1998  Owen Taylor  <owt1@cornell.edu>
+       * gtk/gtkentry.c gtk/gtkentry.h gtk/testgtk.c : 
+          Fixed problem with deleting while text is selected.
+          Changed behavior so that motion keys remove selection.
+          Added new gtk_entry_select_region () call.
+
+Sat Jan  3 20:23:25 1998  Owen Taylor  <owt1@cornell.edu>
+       * glib/glib.h: Changed guint32 -> guint for bitfields. 
+         (Bitfields must be int or unsigned int?)
+
 Sat Jan  3 15:39:45 PST 1998 Jay Painter <jpaint@serv.net>
        * gtk/testgtk.c: better CList test
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e33b28e72a6bc5bd63bf6ee6a17da9bb8b6575e3..d3f3fc7437f7fdc92f45f6d25c0dd34f4822191a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+Tue Jan  6 17:07:29 1998  Owen Taylor  <owt1@cornell.edu>
+       * gtk/gtkentry.c gtk/gtkentry.h gtk/testgtk.c : 
+          Fixed problem with deleting while text is selected.
+          Changed behavior so that motion keys remove selection.
+          Added new gtk_entry_select_region () call.
+
+Sat Jan  3 20:23:25 1998  Owen Taylor  <owt1@cornell.edu>
+       * glib/glib.h: Changed guint32 -> guint for bitfields. 
+         (Bitfields must be int or unsigned int?)
+
 Sat Jan  3 15:39:45 PST 1998 Jay Painter <jpaint@serv.net>
        * gtk/testgtk.c: better CList test
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e33b28e72a6bc5bd63bf6ee6a17da9bb8b6575e3..d3f3fc7437f7fdc92f45f6d25c0dd34f4822191a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Tue Jan  6 17:07:29 1998  Owen Taylor  <owt1@cornell.edu>
+       * gtk/gtkentry.c gtk/gtkentry.h gtk/testgtk.c : 
+          Fixed problem with deleting while text is selected.
+          Changed behavior so that motion keys remove selection.
+          Added new gtk_entry_select_region () call.
+
+Sat Jan  3 20:23:25 1998  Owen Taylor  <owt1@cornell.edu>
+       * glib/glib.h: Changed guint32 -> guint for bitfields. 
+         (Bitfields must be int or unsigned int?)
+
 Sat Jan  3 15:39:45 PST 1998 Jay Painter <jpaint@serv.net>
        * gtk/testgtk.c: better CList test
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e33b28e72a6bc5bd63bf6ee6a17da9bb8b6575e3..d3f3fc7437f7fdc92f45f6d25c0dd34f4822191a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Tue Jan  6 17:07:29 1998  Owen Taylor  <owt1@cornell.edu>
+       * gtk/gtkentry.c gtk/gtkentry.h gtk/testgtk.c : 
+          Fixed problem with deleting while text is selected.
+          Changed behavior so that motion keys remove selection.
+          Added new gtk_entry_select_region () call.
+
+Sat Jan  3 20:23:25 1998  Owen Taylor  <owt1@cornell.edu>
+       * glib/glib.h: Changed guint32 -> guint for bitfields. 
+         (Bitfields must be int or unsigned int?)
+
 Sat Jan  3 15:39:45 PST 1998 Jay Painter <jpaint@serv.net>
        * gtk/testgtk.c: better CList test
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e33b28e72a6bc5bd63bf6ee6a17da9bb8b6575e3..d3f3fc7437f7fdc92f45f6d25c0dd34f4822191a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Tue Jan  6 17:07:29 1998  Owen Taylor  <owt1@cornell.edu>
+       * gtk/gtkentry.c gtk/gtkentry.h gtk/testgtk.c : 
+          Fixed problem with deleting while text is selected.
+          Changed behavior so that motion keys remove selection.
+          Added new gtk_entry_select_region () call.
+
+Sat Jan  3 20:23:25 1998  Owen Taylor  <owt1@cornell.edu>
+       * glib/glib.h: Changed guint32 -> guint for bitfields. 
+         (Bitfields must be int or unsigned int?)
+
 Sat Jan  3 15:39:45 PST 1998 Jay Painter <jpaint@serv.net>
        * gtk/testgtk.c: better CList test
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e33b28e72a6bc5bd63bf6ee6a17da9bb8b6575e3..d3f3fc7437f7fdc92f45f6d25c0dd34f4822191a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Tue Jan  6 17:07:29 1998  Owen Taylor  <owt1@cornell.edu>
+       * gtk/gtkentry.c gtk/gtkentry.h gtk/testgtk.c : 
+          Fixed problem with deleting while text is selected.
+          Changed behavior so that motion keys remove selection.
+          Added new gtk_entry_select_region () call.
+
+Sat Jan  3 20:23:25 1998  Owen Taylor  <owt1@cornell.edu>
+       * glib/glib.h: Changed guint32 -> guint for bitfields. 
+         (Bitfields must be int or unsigned int?)
+
 Sat Jan  3 15:39:45 PST 1998 Jay Painter <jpaint@serv.net>
        * gtk/testgtk.c: better CList test
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e33b28e72a6bc5bd63bf6ee6a17da9bb8b6575e3..d3f3fc7437f7fdc92f45f6d25c0dd34f4822191a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Tue Jan  6 17:07:29 1998  Owen Taylor  <owt1@cornell.edu>
+       * gtk/gtkentry.c gtk/gtkentry.h gtk/testgtk.c : 
+          Fixed problem with deleting while text is selected.
+          Changed behavior so that motion keys remove selection.
+          Added new gtk_entry_select_region () call.
+
+Sat Jan  3 20:23:25 1998  Owen Taylor  <owt1@cornell.edu>
+       * glib/glib.h: Changed guint32 -> guint for bitfields. 
+         (Bitfields must be int or unsigned int?)
+
 Sat Jan  3 15:39:45 PST 1998 Jay Painter <jpaint@serv.net>
        * gtk/testgtk.c: better CList test
 

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 1e9684b39b66ecd8eae817167af48c161a8d087d..3cb48d076eae8fdcfefaf7049c9ca1be4365d75e 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -134,9 +134,6 @@ static void gtk_delete_to_line_end        (GtkEntry          *entry);
 static void gtk_delete_selection          (GtkEntry          *entry);
 static void gtk_select_word               (GtkEntry          *entry);
 static void gtk_select_line               (GtkEntry          *entry);
-static void gtk_select_region             (GtkEntry          *entry,
-                                          gint               start,
-                                          gint               end);
 static void gtk_entry_cut_clipboard     (GtkEntry *entry, 
                                         GdkEventKey *event);
 static void gtk_entry_copy_clipboard    (GtkEntry *entry, 
@@ -844,19 +841,16 @@ gtk_entry_button_press (GtkWidget      *widget,
          gtk_grab_add (widget);
 
          tmp_pos = gtk_entry_position (entry, event->x + entry->scroll_offset);
-         gtk_select_region (entry, tmp_pos, tmp_pos);
+         gtk_entry_select_region (entry, tmp_pos, tmp_pos);
          entry->current_pos = entry->selection_start_pos;
-         gtk_entry_queue_draw (entry);
          break;
 
        case GDK_2BUTTON_PRESS:
          gtk_select_word (entry);
-         gtk_entry_queue_draw (entry);
          break;
 
        case GDK_3BUTTON_PRESS:
          gtk_select_line (entry);
-         gtk_entry_queue_draw (entry);
          break;
 
        default:
@@ -878,10 +872,9 @@ gtk_entry_button_press (GtkWidget      *widget,
          gtk_grab_add (widget);
 
          tmp_pos = gtk_entry_position (entry, event->x + entry->scroll_offset);
-         gtk_select_region (entry, tmp_pos, tmp_pos);
+         gtk_entry_select_region (entry, tmp_pos, tmp_pos);
          entry->have_selection = FALSE;
          entry->current_pos = entry->selection_start_pos;
-         gtk_entry_queue_draw (entry);
        }
     }
 
@@ -1116,6 +1109,11 @@ gtk_entry_key_press (GtkWidget   *widget,
                entry->selection_end_pos = entry->current_pos;
            }
        }
+      else
+       {
+         entry->selection_start_pos = 0;
+         entry->selection_end_pos = 0;
+       }
 
       /* alex stuff */
       if (entry->selection_start_pos != entry->selection_end_pos)
@@ -1353,7 +1351,7 @@ gtk_entry_selection_received  (GtkWidget         *widget,
     }
 
   if (reselect)
-    gtk_select_region (entry, old_pos, entry->current_pos);
+    gtk_entry_select_region (entry, old_pos, entry->current_pos);
 
   gtk_entry_queue_draw (entry);
 }
@@ -1704,6 +1702,11 @@ gtk_real_entry_delete_text (GtkEntry *entry,
   g_return_if_fail (entry != NULL);
   g_return_if_fail (GTK_IS_ENTRY (entry));
 
+  if (entry->selection_start_pos > start_pos)
+    entry->selection_start_pos -= MIN(end_pos, entry->selection_start_pos) - start_pos;
+  if (entry->selection_end_pos > start_pos)
+    entry->selection_end_pos -= MIN(end_pos, entry->selection_end_pos) - start_pos;
+
   if ((start_pos < end_pos) &&
       (start_pos >= 0) &&
       (end_pos <= entry->text_length))
@@ -1944,24 +1947,27 @@ gtk_select_word (GtkEntry *entry)
   gtk_move_forward_word (entry);
   end_pos = entry->current_pos;
 
-  gtk_select_region (entry, start_pos, end_pos);
+  gtk_entry_select_region (entry, start_pos, end_pos);
 }
 
 static void
 gtk_select_line (GtkEntry *entry)
 {
-  gtk_select_region (entry, 0, entry->text_length);
+  gtk_entry_select_region (entry, 0, entry->text_length);
   entry->current_pos = entry->selection_end_pos;
 }
 
-static void
-gtk_select_region (GtkEntry *entry,
+void
+gtk_entry_select_region (GtkEntry *entry,
                   gint      start,
                   gint      end)
 {
   entry->have_selection = TRUE;
+
   entry->selection_start_pos = start;
   entry->selection_end_pos = end;
+
+  gtk_widget_queue_draw (GTK_WIDGET (entry));
 }
 
 static void

diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index a1f6c77d4505569c1c0302d4cf7ea2c941cbb662..e1e4bc067912320051988da6e450dd3b1d5b51d7 100644 (file)
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -75,19 +75,22 @@ struct _GtkEntryClass
 };
 
 
-guint      gtk_entry_get_type     (void);
-GtkWidget* gtk_entry_new          (void);
-GtkWidget* gtk_entry_new_with_max_length (guint16 max);
-void       gtk_entry_set_text     (GtkEntry      *entry,
-                                  const gchar   *text);
-void       gtk_entry_append_text  (GtkEntry      *entry,
-                                  const gchar   *text);
-void       gtk_entry_prepend_text (GtkEntry      *entry,
-                                  const gchar   *text);
-void       gtk_entry_set_position (GtkEntry      *entry,
-                                  gint           position);
-gchar*     gtk_entry_get_text     (GtkEntry      *entry);
-void       gtk_entry_set_visibility (GtkEntry    *entry,
+guint      gtk_entry_get_type       (void);
+GtkWidget* gtk_entry_new            (void);
+GtkWidget* gtk_entry_new_with_max_length (guint16   max);
+void       gtk_entry_set_text       (GtkEntry      *entry,
+                                    const gchar   *text);
+void       gtk_entry_append_text    (GtkEntry      *entry,
+                                    const gchar   *text);
+void       gtk_entry_prepend_text   (GtkEntry      *entry,
+                                    const gchar   *text);
+void       gtk_entry_set_position   (GtkEntry      *entry,
+                                    gint           position);
+gchar*     gtk_entry_get_text       (GtkEntry      *entry);
+void       gtk_entry_select_region  (GtkEntry      *entry,
+                                    gint           start,
+                                    gint           end);
+void       gtk_entry_set_visibility (GtkEntry      *entry,
                                     gint           visible);
 
 

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index e34e141ef72e48dcf52c9dc2b988b0a095ab01a5..cf0a793ff626c487ec1dff201c7d8cba8ae33349 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -1370,6 +1370,8 @@ create_entry ()
       entry = gtk_entry_new ();
       /* gtk_widget_set_usize (entry, 0, 25); */
       gtk_entry_set_text (GTK_ENTRY (entry), "hello world");
+      gtk_entry_select_region (GTK_ENTRY (entry), 
+                              0, GTK_ENTRY(entry)->text_length);
       gtk_box_pack_start (GTK_BOX (box2), entry, TRUE, TRUE, 0);
       gtk_widget_show (entry);
 

diff --git a/tests/testgtk.c b/tests/testgtk.c
index e34e141ef72e48dcf52c9dc2b988b0a095ab01a5..cf0a793ff626c487ec1dff201c7d8cba8ae33349 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1370,6 +1370,8 @@ create_entry ()
       entry = gtk_entry_new ();
       /* gtk_widget_set_usize (entry, 0, 25); */
       gtk_entry_set_text (GTK_ENTRY (entry), "hello world");
+      gtk_entry_select_region (GTK_ENTRY (entry), 
+                              0, GTK_ENTRY(entry)->text_length);
       gtk_box_pack_start (GTK_BOX (box2), entry, TRUE, TRUE, 0);
       gtk_widget_show (entry);