]> Pileus Git - ~andy/gtk/blobdiff - tests/testselection.c
gtk: remove "gboolean homogeneous" from gtk_box_new()
[~andy/gtk] / tests / testselection.c
index 6f33be989d55313c8f1bb40c6a58aa9d2e24a352..b6b79d3a2f6ff84bc8b74e8dc055e46a7a1d19ba 100644 (file)
@@ -2,21 +2,33 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
-#include "gtk.h"
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+
+#include "config.h"
+#include <stdio.h>
+#include <string.h>
+#include "gtk/gtk.h"
 
 typedef enum {
   SEL_TYPE_NONE,
@@ -35,7 +47,7 @@ typedef enum {
   STRING,
   TEXT,
   WINDOW,
-  LAST_SEL_TYPE,
+  LAST_SEL_TYPE
 } SelType;
 
 GdkAtom seltypes[LAST_SEL_TYPE];
@@ -45,62 +57,62 @@ typedef struct _Target {
   SelType type;
   GdkAtom target;
   gint format;
-  GtkSelectionFunction *handler;
 } Target;
 
 /* The following is a list of all the selection targets defined
    in the ICCCM */
 
 static Target targets[] = {
-  { "ADOBE_PORTABLE_DOCUMENT_FORMAT",      STRING,        0, 8,  NULL },
-  { "APPLE_PICT",                          APPLE_PICT,    0, 8,  NULL },
-  { "BACKGROUND",                          PIXEL,         0, 32, NULL },
-  { "BITMAP",                              BITMAP,        0, 32, NULL },
-  { "CHARACTER_POSITION",                   SPAN,         0, 32, NULL },
-  { "CLASS",                               TEXT,          0, 8,  NULL },
-  { "CLIENT_WINDOW",                       WINDOW,        0, 32, NULL },
-  { "COLORMAP",                            COLORMAP,      0, 32, NULL },
-  { "COLUMN_NUMBER",                       SPAN,          0, 32, NULL },
-  { "COMPOUND_TEXT",                       COMPOUND_TEXT, 0, 8,  NULL },
-  /*  { "DELETE", "NULL", 0, ?, NULL }, */
-  { "DRAWABLE",                            DRAWABLE,      0, 32, NULL },
-  { "ENCAPSULATED_POSTSCRIPT",                     STRING,        0, 8,  NULL },
-  { "ENCAPSULATED_POSTSCRIPT_INTERCHANGE",  STRING,       0, 8,  NULL },
-  { "FILE_NAME",                           TEXT,          0, 8,  NULL },
-  { "FOREGROUND",                          PIXEL,         0, 32, NULL },
-  { "HOST_NAME",                           TEXT,          0, 8,  NULL },
+  { "ADOBE_PORTABLE_DOCUMENT_FORMAT",      STRING,        NULL, 8 },
+  { "APPLE_PICT",                          APPLE_PICT,    NULL, 8 },
+  { "BACKGROUND",                          PIXEL,         NULL, 32 },
+  { "BITMAP",                              BITMAP,        NULL, 32 },
+  { "CHARACTER_POSITION",                   SPAN,         NULL, 32 },
+  { "CLASS",                               TEXT,          NULL, 8 },
+  { "CLIENT_WINDOW",                       WINDOW,        NULL, 32 },
+  { "COLORMAP",                            COLORMAP,      NULL, 32 },
+  { "COLUMN_NUMBER",                       SPAN,          NULL, 32 },
+  { "COMPOUND_TEXT",                       COMPOUND_TEXT, NULL, 8 },
+  /*  { "DELETE", "NULL", 0, ? }, */
+  { "DRAWABLE",                            DRAWABLE,      NULL, 32 },
+  { "ENCAPSULATED_POSTSCRIPT",                     STRING,        NULL, 8 },
+  { "ENCAPSULATED_POSTSCRIPT_INTERCHANGE",  STRING,       NULL, 8 },
+  { "FILE_NAME",                           TEXT,          NULL, 8 },
+  { "FOREGROUND",                          PIXEL,         NULL, 32 },
+  { "HOST_NAME",                           TEXT,          NULL, 8 },
   /*  { "INSERT_PROPERTY", "NULL", 0, ? NULL }, */
   /*  { "INSERT_SELECTION", "NULL", 0, ? NULL }, */
-  { "LENGTH",                              INTEGER,       0, 32, NULL },
-  { "LINE_NUMBER",                         SPAN,          0, 32, NULL },
-  { "LIST_LENGTH",                         INTEGER,       0, 32, NULL },
-  { "MODULE",                              TEXT,          0, 8,  NULL },
-  /*  { "MULTIPLE", "ATOM_PAIR", 0, 32, NULL }, */
-  { "NAME",                                TEXT,          0, 8,  NULL },
-  { "ODIF",                                TEXT,          0, 8,  NULL },
-  { "OWNER_OS",                            TEXT,          0, 8,  NULL },
-  { "PIXMAP",                              PIXMAP,        0, 32, NULL },
-  { "POSTSCRIPT",                          STRING,        0, 8,  NULL },
-  { "PROCEDURE",                           TEXT,          0, 8,  NULL },
-  { "PROCESS",                             INTEGER,       0, 32, NULL },
-  { "STRING",                              STRING,        0, 8,  NULL },
-  { "TARGETS",                                     ATOM,          0, 32, NULL },
-  { "TASK",                                INTEGER,       0, 32, NULL },
-  { "TEXT",                                TEXT,          0, 8 , NULL },
-  { "TIMESTAMP",                           INTEGER,       0, 32, NULL },
-  { "USER",                                TEXT,          0, 8,  NULL },
+  { "LENGTH",                              INTEGER,       NULL, 32 },
+  { "LINE_NUMBER",                         SPAN,          NULL, 32 },
+  { "LIST_LENGTH",                         INTEGER,       NULL, 32 },
+  { "MODULE",                              TEXT,          NULL, 8 },
+  /*  { "MULTIPLE", "ATOM_PAIR", 0, 32 }, */
+  { "NAME",                                TEXT,          NULL, 8 },
+  { "ODIF",                                TEXT,          NULL, 8 },
+  { "OWNER_OS",                            TEXT,          NULL, 8 },
+  { "PIXMAP",                              PIXMAP,        NULL, 32 },
+  { "POSTSCRIPT",                          STRING,        NULL, 8 },
+  { "PROCEDURE",                           TEXT,          NULL, 8 },
+  { "PROCESS",                             INTEGER,       NULL, 32 },
+  { "STRING",                              STRING,        NULL, 8 },
+  { "TARGETS",                                     ATOM,          NULL, 32 },
+  { "TASK",                                INTEGER,       NULL, 32 },
+  { "TEXT",                                TEXT,          NULL, 8  },
+  { "TIMESTAMP",                           INTEGER,       NULL, 32 },
+  { "USER",                                TEXT,          NULL, 8 },
 };
 
 static int num_targets = sizeof(targets)/sizeof(Target);
 
 static int have_selection = FALSE;
 
+GtkWidget *selection_widget;
 GtkWidget *selection_text;
 GtkWidget *selection_button;
 GString *selection_string = NULL;
 
 static void
-init_atoms ()
+init_atoms (void)
 {
   int i;
 
@@ -128,19 +140,19 @@ init_atoms ()
 void
 selection_toggled (GtkWidget *widget)
 {
-  if (GTK_TOGGLE_BUTTON(widget)->active)
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
     {
-      have_selection = gtk_selection_owner_set (widget,
+      have_selection = gtk_selection_owner_set (selection_widget,
                                                GDK_SELECTION_PRIMARY,
                                                GDK_CURRENT_TIME);
       if (!have_selection)
-       gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(widget), FALSE);
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(widget), FALSE);
     }
   else
     {
       if (have_selection)
        {
-         if (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == widget->window)
+          if (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == gtk_widget_get_window (widget))
            gtk_selection_owner_set (NULL, GDK_SELECTION_PRIMARY,
                                     GDK_CURRENT_TIME);
          have_selection = FALSE;
@@ -149,11 +161,15 @@ selection_toggled (GtkWidget *widget)
 }
 
 void
-selection_handle (GtkWidget *widget, 
-                 GtkSelectionData *selection_data, gpointer data)
+selection_get (GtkWidget *widget, 
+              GtkSelectionData *selection_data,
+              guint      info,
+              guint      time,
+              gpointer   data)
 {
   guchar *buffer;
   gint len;
+  GdkAtom type = GDK_NONE;
 
   if (!selection_string)
     {
@@ -162,21 +178,27 @@ selection_handle (GtkWidget *widget,
     }      
   else
     {
-      buffer = selection_string->str;
+      buffer = (guchar *)selection_string->str;
       len = selection_string->len;
     }
+
+  switch (info)
+    {
+    case COMPOUND_TEXT:
+    case TEXT:
+      type = seltypes[COMPOUND_TEXT];
+    case STRING:
+      type = seltypes[STRING];
+    }
   
-  gtk_selection_data_set (selection_data,
-                         selection_data->target == seltypes[COMPOUND_TEXT] ?
-                                 seltypes[COMPOUND_TEXT] : seltypes[STRING],
-                         8, buffer, len);
+  gtk_selection_data_set (selection_data, type, 8, buffer, len);
 }
 
 gint
 selection_clear (GtkWidget *widget, GdkEventSelection *event)
 {
   have_selection = FALSE;
-  gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(widget), FALSE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(selection_button), FALSE);
 
   return TRUE;
 }
@@ -249,6 +271,7 @@ selection_received (GtkWidget *widget, GtkSelectionData *data)
   int i;
   SelType seltype;
   char *str;
+  GtkTextBuffer *buffer;
   
   if (data->length < 0)
     {
@@ -269,9 +292,8 @@ selection_received (GtkWidget *widget, GtkSelectionData *data)
   if (seltype == SEL_TYPE_NONE)
     {
       char *name = gdk_atom_name (data->type);
-      g_print("Don't know how to handle type: %s (%ld)\n",
-             name?name:"<unknown>",
-             data->type);
+      g_print("Don't know how to handle type: %s\n",
+             name?name:"<unknown>");
       return;
     }
 
@@ -280,10 +302,8 @@ selection_received (GtkWidget *widget, GtkSelectionData *data)
 
   selection_string = g_string_new (NULL);
 
-  gtk_text_freeze (GTK_TEXT (selection_text));
-  gtk_text_set_point (GTK_TEXT (selection_text), 0);
-  gtk_text_forward_delete (GTK_TEXT (selection_text), 
-                          gtk_text_get_length (GTK_TEXT (selection_text)));
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (selection_text));
+  gtk_text_buffer_set_text (buffer, "", -1);
 
   position = 0;
   while (position < data->length)
@@ -315,29 +335,23 @@ selection_received (GtkWidget *widget, GtkSelectionData *data)
        default:
          {
            char *name = gdk_atom_name (data->type);
-           g_print("Can't convert type %s (%ld) to string\n",
-                   name?name:"<unknown>",
-                   data->type);
+           g_print("Can't convert type %s to string\n",
+                   name?name:"<unknown>");
            position = data->length;
            continue;
          }
        }
-      gtk_text_insert (GTK_TEXT (selection_text), NULL, 
-                      &selection_text->style->black, 
-                      NULL, str, -1);
-      gtk_text_insert (GTK_TEXT (selection_text), NULL, 
-                      &selection_text->style->black, 
-                      NULL, "\n", -1);
+      gtk_text_buffer_insert_at_cursor (buffer, str, -1);
+      gtk_text_buffer_insert_at_cursor (buffer, "\n", -1);
       g_string_append (selection_string, str);
       g_free (str);
     }
-  gtk_text_thaw (GTK_TEXT (selection_text));
 }
 
 void
 paste (GtkWidget *widget, GtkWidget *entry)
 {
-  char *name;
+  const char *name;
   GdkAtom atom;
 
   name = gtk_entry_get_text (GTK_ENTRY(entry));
@@ -349,48 +363,59 @@ paste (GtkWidget *widget, GtkWidget *entry)
       return;
     }
 
-  gtk_selection_convert (selection_button, GDK_SELECTION_PRIMARY, atom, 
+  gtk_selection_convert (selection_widget, GDK_SELECTION_PRIMARY, atom, 
                         GDK_CURRENT_TIME);
 }
 
 void
-quit ()
+quit (void)
 {
-  gtk_exit (0);
+  gtk_main_quit ();
 }
 
 int
 main (int argc, char *argv[])
 {
+  GtkWidget *action_area, *content_area;
   GtkWidget *dialog;
   GtkWidget *button;
   GtkWidget *table;
   GtkWidget *label;
   GtkWidget *entry;
-  GtkWidget *hscrollbar;
-  GtkWidget *vscrollbar;
   GtkWidget *hbox;
+  GtkWidget *scrolled;
+
+  static GtkTargetEntry targetlist[] = {
+    { "STRING",        0, STRING },
+    { "TEXT",          0, TEXT },
+    { "COMPOUND_TEXT", 0, COMPOUND_TEXT }
+  };
+  static gint ntargets = sizeof(targetlist) / sizeof(targetlist[0]);
   
   gtk_init (&argc, &argv);
 
   init_atoms();
 
+  selection_widget = gtk_invisible_new ();
+
   dialog = gtk_dialog_new ();
   gtk_widget_set_name (dialog, "Test Input");
-  gtk_container_border_width (GTK_CONTAINER(dialog), 0);
+  gtk_container_set_border_width (GTK_CONTAINER(dialog), 0);
+
+  g_signal_connect (dialog, "destroy",
+                   G_CALLBACK (quit), NULL);
 
-  gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
-                     GTK_SIGNAL_FUNC (quit), NULL);
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+  action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
 
   table = gtk_table_new (4, 2, FALSE);
-  gtk_container_border_width (GTK_CONTAINER(table), 10);
+  gtk_container_set_border_width (GTK_CONTAINER(table), 10);
 
   gtk_table_set_row_spacing (GTK_TABLE (table), 0, 5);
   gtk_table_set_row_spacing (GTK_TABLE (table), 1, 2);
   gtk_table_set_row_spacing (GTK_TABLE (table), 2, 2);
   gtk_table_set_col_spacing (GTK_TABLE (table), 0, 2);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->vbox), 
-                     table, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (content_area), table, TRUE, TRUE, 0);
   gtk_widget_show (table);
   
   selection_button = gtk_toggle_button_new_with_label ("Claim Selection");
@@ -398,38 +423,26 @@ main (int argc, char *argv[])
                    GTK_EXPAND | GTK_FILL, 0, 0, 0);
   gtk_widget_show (selection_button);
 
-  gtk_signal_connect (GTK_OBJECT(selection_button), "toggled",
-                     GTK_SIGNAL_FUNC (selection_toggled), NULL);
-  gtk_signal_connect (GTK_OBJECT(selection_button), "selection_clear_event",
-                     GTK_SIGNAL_FUNC (selection_clear), NULL);
-  gtk_signal_connect (GTK_OBJECT(selection_button), "selection_received",
-                     GTK_SIGNAL_FUNC (selection_received), NULL);
-
-  gtk_selection_add_handler (selection_button, GDK_SELECTION_PRIMARY,
-                            seltypes[STRING], selection_handle, NULL, NULL);
+  g_signal_connect (selection_button, "toggled",
+                   G_CALLBACK (selection_toggled), NULL);
+  g_signal_connect (selection_widget, "selection_clear_event",
+                   G_CALLBACK (selection_clear), NULL);
+  g_signal_connect (selection_widget, "selection_received",
+                   G_CALLBACK (selection_received), NULL);
 
-  gtk_selection_add_handler (selection_button, GDK_SELECTION_PRIMARY,
-                            seltypes[TEXT], selection_handle, NULL, NULL);
+  gtk_selection_add_targets (selection_widget, GDK_SELECTION_PRIMARY,
+                            targetlist, ntargets);
 
-  gtk_selection_add_handler (selection_button, GDK_SELECTION_PRIMARY,
-                            seltypes[COMPOUND_TEXT],
-                            selection_handle, NULL, NULL);
+  g_signal_connect (selection_widget, "selection_get",
+                   G_CALLBACK (selection_get), NULL);
 
-  selection_text = gtk_text_new (NULL, NULL);
-  gtk_table_attach_defaults (GTK_TABLE (table), selection_text, 0, 1, 1, 2);
+  selection_text = gtk_text_view_new ();
+  scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_container_add (GTK_CONTAINER (scrolled), selection_text);
+  gtk_table_attach_defaults (GTK_TABLE (table), scrolled, 0, 1, 1, 2);
   gtk_widget_show (selection_text);
-  
-  hscrollbar = gtk_hscrollbar_new (GTK_TEXT (selection_text)->hadj);
-  gtk_table_attach (GTK_TABLE (table), hscrollbar, 0, 1, 2, 3,
-                   GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-  gtk_widget_show (hscrollbar);
-  
-  vscrollbar = gtk_vscrollbar_new (GTK_TEXT (selection_text)->vadj);
-  gtk_table_attach (GTK_TABLE (table), vscrollbar, 1, 2, 1, 2,
-                   GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-  gtk_widget_show (vscrollbar);
 
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_table_attach (GTK_TABLE (table), hbox, 0, 2, 3, 4,
                    GTK_EXPAND | GTK_FILL, 0, 0, 0);
   gtk_widget_show (hbox);
@@ -444,19 +457,16 @@ main (int argc, char *argv[])
 
   /* .. And create some buttons */
   button = gtk_button_new_with_label ("Paste");
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->action_area), 
-                     button, TRUE, TRUE, 0);
-  gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                     GTK_SIGNAL_FUNC (paste), entry);
+  gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
+  g_signal_connect (button, "clicked",
+                   G_CALLBACK (paste), entry);
   gtk_widget_show (button);
 
   button = gtk_button_new_with_label ("Quit");
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->action_area), 
-                     button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
 
-  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-                            GTK_SIGNAL_FUNC (gtk_widget_destroy), 
-                            GTK_OBJECT (dialog));
+  g_signal_connect_swapped (button, "clicked",
+                           G_CALLBACK (gtk_widget_destroy), dialog);
   gtk_widget_show (button);
 
   gtk_widget_show (dialog);