Move the code in "column.c" that implements the column preferences tab

into "gtk/column_prefs.c".

Get rid of "get_column_width()" - instead, export
"get_column_longest_string()", and have "get_column_width()"'s callers
make the GDK call to get the width of that string, so that "column.c"
contains no GTK+/GDK code.

svn path=/trunk/; revision=1447

8 files changed, 434 insertions, 373 deletions

diff --git a/column.c b/column.c
index e9d56e1f1e..9bff391618 100644
--- a/column.c
+++ b/column.c
@@ -1,7 +1,7 @@
 /* column.c
  * Routines for handling column preferences
  *
- * $Id: column.c,v 1.26 1999/12/29 10:48:01 guy Exp $
+ * $Id: column.c,v 1.27 2000/01/10 01:43:47 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -31,8 +31,6 @@
 #include <sys/types.h>
 #endif
 
-#include <gtk/gtk.h>
-
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
@@ -48,27 +46,9 @@
 #include "column.h"
 #include "packet.h"
 
-static GtkWidget *column_l, *chg_bt, *del_bt, *title_te, *fmt_m, *up_bt,
-                 *dn_bt;
-static gint       cur_fmt;
-
-#define E_COL_NAME_KEY "column_name"
-#define E_COL_LBL_KEY  "column_label"
-#define E_COL_CM_KEY   "in_col_cancel_mode"
-
-static gchar *col_format_to_string(gint);
-static gchar *col_format_desc(gint);
-static gint   get_column_format_from_str(gchar *str);
-static void   column_sel_list_cb(GtkWidget *, gpointer);
-static void   column_sel_new_cb(GtkWidget *, gpointer);
-static void   column_sel_chg_cb(GtkWidget *, gpointer);
-static void   column_sel_del_cb(GtkWidget *, gpointer);
-static void   column_sel_arrow_cb(GtkWidget *, gpointer);
-static void   column_set_fmt_cb(GtkWidget *, gpointer);
-
 /* Given a format number (as defined in packet.h), returns its equivalent
    string */
-static gchar *
+gchar *
 col_format_to_string(gint fmt) {
   gchar *slist[] = { "%m", "%t", "%Rt", "%At", "%Tt", "%s", "%rs", "%us",
                      "%hs", "%rhs", "%uhs", "%ns", "%rns", "%uns", "%d",
@@ -84,7 +64,7 @@ col_format_to_string(gint fmt) {
 
 /* Given a format number (as defined in packet.h), returns its
   description */
-static gchar *
+gchar *
 col_format_desc(gint fmt) {
   gchar *dlist[] = { "Number", "Time (command line specified)",
                      "Relative time", "Absolute time", "Delta time",
@@ -169,8 +149,18 @@ get_column_format_matches(gboolean *fmt_list, gint format) {
 }
 
 /* Returns a string representing the longest possible value for a
-   particular column type. */
-static char *
+   particular column type.
+
+   Except for the COL...SRC and COL...DST columns, these are used
+   only when a capture is being displayed while it's taking place;
+   they are arguably somewhat fragile, as changes to the code that
+   generates them don't cause these widths to change, but that's
+   probably not too big a problem, given that the sizes are
+   recomputed based on the actual data in the columns when the capture
+   is done, and given that the width for COL...SRC and COL...DST columns
+   is somewhat arbitrary in any case.  We should probably clean
+   that up eventually, though. */
+char *
 get_column_longest_string(gint format)
 {
   switch (format) {
@@ -230,24 +220,6 @@ get_column_longest_string(gint format)
   }
 }
 
-/* Returns the longest possible width, using the specified font,
-   for a particular column type.
-
-   Except for the COL...SRC and COL...DST columns, these are used
-   only when a capture is being displayed while it's taking place;
-   they are arguably somewhat fragile, as changes to the code that
-   generates them don't cause these widths to change, but that's
-   probably not too big a problem, given that the sizes are
-   recomputed based on the actual data in the columns when the capture
-   is done, and given that the width for COL...SRC and COL...DST columns
-   is somewhat arbitrary in any case.  We should probably clean
-   that up eventually, though. */
-gint
-get_column_width(gint format, GdkFont *font)
-{
-  return (gdk_string_width(font, get_column_longest_string(format)));
-}
-
 /* Returns the longest possible width, in characters, for a particular
    column type. */
 gint
@@ -333,7 +305,7 @@ get_column_format(gint col) {
   return(get_column_format_from_str(cfmt->fmt));
 }
 
-static gint
+gint
 get_column_format_from_str(gchar *str) {
   gchar *cptr = str;
   gint      res_off = RES_DEF, addr_off = ADDR_DEF, time_off = TIME_DEF;
@@ -451,316 +423,3 @@ col_format_to_pref_str() {
 
   return(pref_str);
 }    
-
-/* Create and display the column selection widgets. */
-/* Called when the 'Columns' preference notebook page is selected. */
-GtkWidget *
-column_prefs_show() {
-  GtkWidget   *main_vb, *top_hb, *list_bb, *new_bt, *column_sc, *nl_item,
-              *nl_lb, *tb, *lb, *menu, *mitem, *arrow_hb;
-  GList       *clp = NULL;
-  fmt_data    *cfmt;
-  gint         i;
-
-  /* Container for each row of widgets */
-  main_vb = gtk_vbox_new(FALSE, 5);
-  gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
-  gtk_widget_show(main_vb);
-  gtk_object_set_data(GTK_OBJECT(main_vb), E_COL_CM_KEY, (gpointer)FALSE);
-  
-  /* Top row: Column list and buttons */
-  top_hb = gtk_hbox_new(FALSE, 5);
-  gtk_container_add(GTK_CONTAINER(main_vb), top_hb);
-  gtk_widget_show(top_hb);
-  
-  list_bb = gtk_vbutton_box_new();
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (list_bb), GTK_BUTTONBOX_START);
-  gtk_container_add(GTK_CONTAINER(top_hb), list_bb);
-  gtk_widget_show(list_bb);
-
-  new_bt = gtk_button_new_with_label ("New");
-  gtk_signal_connect(GTK_OBJECT(new_bt), "clicked",
-    GTK_SIGNAL_FUNC(column_sel_new_cb), NULL);
-  gtk_container_add(GTK_CONTAINER(list_bb), new_bt);
-  gtk_widget_show(new_bt);
-  
-  chg_bt = gtk_button_new_with_label ("Change");
-  gtk_widget_set_sensitive(chg_bt, FALSE);
-  gtk_signal_connect(GTK_OBJECT(chg_bt), "clicked",
-    GTK_SIGNAL_FUNC(column_sel_chg_cb), NULL);
-  gtk_container_add(GTK_CONTAINER(list_bb), chg_bt);
-  gtk_widget_show(chg_bt);
-  
-  del_bt = gtk_button_new_with_label ("Delete");
-  gtk_widget_set_sensitive(del_bt, FALSE);
-  gtk_signal_connect(GTK_OBJECT(del_bt), "clicked",
-    GTK_SIGNAL_FUNC(column_sel_del_cb), NULL);
-  gtk_container_add(GTK_CONTAINER(list_bb), del_bt);
-  gtk_widget_show(del_bt);
-  
-  arrow_hb = gtk_hbox_new(TRUE, 3);
-  gtk_container_add(GTK_CONTAINER(list_bb), arrow_hb);
-  gtk_widget_show(arrow_hb);
-  
-  up_bt = gtk_button_new_with_label("Up");
-  gtk_widget_set_sensitive(up_bt, FALSE);
-  gtk_signal_connect(GTK_OBJECT(up_bt), "clicked",
-    GTK_SIGNAL_FUNC(column_sel_arrow_cb), NULL);
-  gtk_box_pack_start(GTK_BOX(arrow_hb), up_bt, TRUE, TRUE, 0);
-  gtk_widget_show(up_bt);
-  
-  dn_bt = gtk_button_new_with_label("Down");
-  gtk_widget_set_sensitive(dn_bt, FALSE);
-  gtk_signal_connect(GTK_OBJECT(dn_bt), "clicked",
-    GTK_SIGNAL_FUNC(column_sel_arrow_cb), NULL);
-  gtk_box_pack_start(GTK_BOX(arrow_hb), dn_bt, TRUE, TRUE, 0);
-  gtk_widget_show(dn_bt);
-  
-  column_sc = gtk_scrolled_window_new(NULL, NULL);
-  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(column_sc),
-    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-  gtk_widget_set_usize(column_sc, 250, 150);
-  gtk_container_add(GTK_CONTAINER(top_hb), column_sc);
-  gtk_widget_show(column_sc);
-
-  column_l = gtk_list_new();
-  gtk_list_set_selection_mode(GTK_LIST(column_l), GTK_SELECTION_SINGLE);
-  gtk_signal_connect(GTK_OBJECT(column_l), "selection_changed",
-    GTK_SIGNAL_FUNC(column_sel_list_cb), main_vb);
-  gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(column_sc), column_l);
-  gtk_widget_show(column_l);
-
-  clp = g_list_first(prefs.col_list);
-  while (clp) {
-    cfmt    = (fmt_data *) clp->data;
-    nl_lb   = gtk_label_new(cfmt->title);
-    nl_item = gtk_list_item_new();
-    gtk_misc_set_alignment (GTK_MISC (nl_lb), 0.0, 0.5);
-    gtk_container_add(GTK_CONTAINER(nl_item), nl_lb);
-    gtk_widget_show(nl_lb);
-    gtk_container_add(GTK_CONTAINER(column_l), nl_item);
-    gtk_widget_show(nl_item);
-    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_LBL_KEY, nl_lb);
-    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_NAME_KEY, clp);
- 
-    clp = clp->next;
-  }
-  
-  /* Colunm name entry and format selection */
-  tb = gtk_table_new(2, 2, FALSE);
-  gtk_container_add(GTK_CONTAINER(main_vb), tb);
-  gtk_table_set_row_spacings(GTK_TABLE(tb), 10);
-  gtk_table_set_col_spacings(GTK_TABLE(tb), 15);
-  gtk_widget_show(tb);
-  
-  lb = gtk_label_new("Column title:");
-  gtk_misc_set_alignment(GTK_MISC(lb), 1.0, 0.5);
-  gtk_table_attach_defaults(GTK_TABLE(tb), lb, 0, 1, 0, 1);
-  gtk_widget_show(lb);
-  
-  title_te = gtk_entry_new();
-  gtk_table_attach_defaults(GTK_TABLE(tb), title_te, 1, 2, 0, 1);
-  gtk_widget_show(title_te);
-
-  lb = gtk_label_new("Column format:");
-  gtk_misc_set_alignment(GTK_MISC(lb), 1.0, 0.5);
-  gtk_table_attach_defaults(GTK_TABLE(tb), lb, 0, 1, 1, 2);
-  gtk_widget_show(lb);
-
-  fmt_m = gtk_option_menu_new();
-  menu  = gtk_menu_new();
-  for (i = 0; i < NUM_COL_FMTS; i++) {
-    mitem = gtk_menu_item_new_with_label(col_format_desc(i));
-    gtk_menu_append(GTK_MENU(menu), mitem);
-    gtk_signal_connect( GTK_OBJECT(mitem), "activate",
-      GTK_SIGNAL_FUNC(column_set_fmt_cb), (gpointer) i);
-    gtk_widget_show(mitem);
-  }
-  gtk_option_menu_set_menu(GTK_OPTION_MENU(fmt_m), menu);
-  cur_fmt = 0;
-  gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt);
-  gtk_table_attach_defaults(GTK_TABLE(tb), fmt_m, 1, 2, 1, 2);
-  gtk_widget_show(fmt_m);  
-      
-  return(main_vb);
-}
-
-static void
-column_sel_list_cb(GtkWidget *l, gpointer data) {
-  fmt_data   *cfmt;
-  gchar      *title = "";
-  GList      *sl, *clp;
-  GtkObject  *l_item;
-  gint        sensitivity = FALSE, up_sens = FALSE, dn_sens = FALSE;
-
-  sl = GTK_LIST(l)->selection;
-          
-  if (sl) {  /* Something was selected */
-    l_item = GTK_OBJECT(sl->data);
-    clp    = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
-    if (clp) {
-      cfmt   = (fmt_data *) clp->data;
-      title   = cfmt->title;
-      cur_fmt = get_column_format_from_str(cfmt->fmt);
-      gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt);
-      sensitivity = TRUE;
-      if (clp != g_list_first(prefs.col_list))
-        up_sens = TRUE;
-      if (clp != g_list_last(prefs.col_list))
-        dn_sens = TRUE;
-    }
-  }
-
-  /* Did you know that this function is called when the window is destroyed? */
-  /* Funny, that. */
-  if (!gtk_object_get_data(GTK_OBJECT(data), E_COL_CM_KEY)) {
-    gtk_entry_set_text(GTK_ENTRY(title_te), title);
-    gtk_widget_set_sensitive(chg_bt, sensitivity);
-    gtk_widget_set_sensitive(del_bt, sensitivity);
-    gtk_widget_set_sensitive(up_bt, up_sens);
-    gtk_widget_set_sensitive(dn_bt, dn_sens);
-  }
-}
-
-/* To do: add input checking to each of these callbacks */
- 
-static void
-column_sel_new_cb(GtkWidget *w, gpointer data) {
-  fmt_data   *cfmt;
-  gchar      *title;
-  GtkWidget  *nl_item, *nl_lb;
-  
-  title = gtk_entry_get_text(GTK_ENTRY(title_te));
-  
-  if (strlen(title) > 0) {
-    cfmt           = (fmt_data *) g_malloc(sizeof(fmt_data));
-    cfmt->title    = g_strdup(title);
-    cfmt->fmt      = g_strdup(col_format_to_string(cur_fmt));
-    prefs.col_list = g_list_append(prefs.col_list, cfmt);
-    nl_lb          = gtk_label_new(cfmt->title);
-    nl_item        = gtk_list_item_new();
-    gtk_misc_set_alignment (GTK_MISC (nl_lb), 0.0, 0.5);
-    gtk_container_add(GTK_CONTAINER(nl_item), nl_lb);
-    gtk_widget_show(nl_lb);
-    gtk_container_add(GTK_CONTAINER(column_l), nl_item);
-    gtk_widget_show(nl_item);
-    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_LBL_KEY, nl_lb);
-    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_NAME_KEY,
-      g_list_last(prefs.col_list));
-    gtk_list_select_child(GTK_LIST(column_l), nl_item);
-  }
-}
-
-static void
-column_sel_chg_cb(GtkWidget *w, gpointer data) {
-  fmt_data   *cfmt;
-  gchar      *title = "";
-  GList      *sl, *clp;
-  GtkObject  *l_item;
-  GtkLabel   *nl_lb;
-
-  sl     = GTK_LIST(column_l)->selection;
-  title  = gtk_entry_get_text(GTK_ENTRY(title_te));
-
-  if (sl) {  /* Something was selected */
-    l_item = GTK_OBJECT(sl->data);
-    clp    = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
-    nl_lb  = (GtkLabel *) gtk_object_get_data(l_item, E_COL_LBL_KEY);
-    if (clp && nl_lb) {
-      cfmt = (fmt_data *) clp->data;
-      
-      if (strlen(title) > 0 && cfmt) {
-        g_free(cfmt->title);
-        g_free(cfmt->fmt);
-        cfmt->title = g_strdup(title);
-        cfmt->fmt   = g_strdup(col_format_to_string(cur_fmt));
-        gtk_label_set(nl_lb, cfmt->title);
-      }
-    }
-  }
-}
-
-static void
-column_sel_del_cb(GtkWidget *w, gpointer data) {
-  GList      *sl, *clp;
-  fmt_data   *cfmt;
-  GtkObject  *l_item;
-  gint        pos;
-  
-  sl = GTK_LIST(column_l)->selection;
-  if (sl) {  /* Something was selected */
-    l_item = GTK_OBJECT(sl->data);
-    pos    = gtk_list_child_position(GTK_LIST(column_l), GTK_WIDGET(l_item));
-    clp    = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
-    if (clp) {
-      cfmt = (fmt_data *) clp->data;
-      g_free(cfmt->title);
-      g_free(cfmt->fmt);
-      g_free(cfmt);
-      prefs.col_list = g_list_remove_link(prefs.col_list, clp);
-      gtk_list_clear_items(GTK_LIST(column_l), pos, pos + 1);
-    } 
-  }
-}
-
-static void
-column_sel_arrow_cb(GtkWidget *w, gpointer data) {
-  GList      *sl, *clp, *il;
-  fmt_data   *cfmt;
-  GtkObject  *l_item;
-  gint        pos, inc = 1;
-  
-  if (w == up_bt)
-    inc = -1;
-  
-  sl = GTK_LIST(column_l)->selection;
-  if (sl) {  /* Something was selected */
-    l_item  = GTK_OBJECT(sl->data);
-    pos     = gtk_list_child_position(GTK_LIST(column_l), GTK_WIDGET(l_item));
-    clp     = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
-    if (clp) {
-      cfmt = (fmt_data *) clp->data;
-      prefs.col_list = g_list_remove(prefs.col_list, cfmt);
-      g_list_insert(prefs.col_list, cfmt, pos + inc);
-      il = (GList *) g_malloc(sizeof(GList));
-      il->next = NULL;
-      il->prev = NULL;
-      il->data = l_item;
-      gtk_widget_ref(GTK_WIDGET(l_item));
-      gtk_list_clear_items(GTK_LIST(column_l), pos, pos + 1);
-      gtk_list_insert_items(GTK_LIST(column_l), il, pos + inc);
-      gtk_widget_unref(GTK_WIDGET(l_item));
-      gtk_list_select_item(GTK_LIST(column_l), pos + inc);
-    } 
-  }
-}
-
-void
-column_set_fmt_cb(GtkWidget *w, gpointer data) {
-  cur_fmt = (gint) data;
-}
-
-void
-column_prefs_ok(GtkWidget *w) {
-
-  column_prefs_delete(w);
-}
-
-void
-column_prefs_save(GtkWidget *w) {
-}
-
-void
-column_prefs_cancel(GtkWidget *w) {
-
-  column_prefs_delete(w);
-}
-
-void
-column_prefs_delete(GtkWidget *w) {
- 
-  /* Let the list cb know we're about to destroy the widget tree, so it */
-  /* doesn't operate on widgets that don't exist. */  
-  gtk_object_set_data(GTK_OBJECT(w), E_COL_CM_KEY, (gpointer)TRUE);
-  gtk_widget_destroy(GTK_WIDGET(w));
-} 
diff --git a/column.h b/column.h
index da46744780..579ec29434 100644
--- a/column.h
+++ b/column.h
@@ -1,7 +1,7 @@
 /* column.h
  * Definitions for column handling routines
  *
- * $Id: column.h,v 1.6 1999/09/12 06:11:34 guy Exp $
+ * $Id: column.h,v 1.7 2000/01/10 01:43:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -37,17 +37,15 @@ enum col_resize_type {
   RESIZE_MANUAL         /* Don't automatically resize */
 };
 
+gchar               *col_format_to_string(gint);
+gchar               *col_format_desc(gint);
 gint                 get_column_format(gint);
+void                 get_column_format_matches(gboolean *, gint);
+gint                 get_column_format_from_str(gchar *);
 enum col_resize_type get_column_resize_type(gint);
 gchar               *get_column_title(gint);
 gchar               *col_format_to_pref_str(void);
-void                 get_column_format_matches(gboolean *, gint);
-gint                 get_column_width(gint format, GdkFont *font);
+char                *get_column_longest_string(gint);
 gint                 get_column_char_width(gint format);
-GtkWidget           *column_prefs_show(void);
-void                 column_prefs_ok(GtkWidget *);
-void                 column_prefs_save(GtkWidget *);
-void                 column_prefs_cancel(GtkWidget *);
-void                 column_prefs_delete(GtkWidget *);
 
 #endif /* column.h */
diff --git a/file.c b/file.c
index e7f1e65eac..87e1d9bd81 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /* file.c
  * File I/O routines
  *
- * $Id: file.c,v 1.150 2000/01/08 23:49:25 guy Exp $
+ * $Id: file.c,v 1.151 2000/01/10 01:43:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1053,7 +1053,7 @@ change_time_formats(capture_file *cf)
   for (i = 0; i < cf->cinfo.num_cols; i++) {
     if (cf->cinfo.fmt_matx[i][COL_CLS_TIME]) {
       gtk_clist_set_column_width(GTK_CLIST(packet_list), i,
-        get_column_width(COL_CLS_TIME, pl_style->font));
+        gdk_string_width(pl_style->font, get_column_longest_string(COL_CLS_TIME)));
     }
   }
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7cb6832dd7..202b5ac1d0 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for the GTK interface routines for Ethereal
 #
-# $Id: Makefile.am,v 1.18 2000/01/03 06:59:19 guy Exp $
+# $Id: Makefile.am,v 1.19 2000/01/10 01:43:58 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -31,6 +31,8 @@ CLEANFILES = \
 libui_a_SOURCES = \
 	capture_dlg.c	\
 	capture_dlg.h	\
+	column_prefs.c	\
+	column_prefs.h	\
 	display_opts.c	\
 	display_opts.h	\
 	file_dlg.c	\
diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
new file mode 100644
index 0000000000..f206310783
--- /dev/null
+++ b/gtk/column_prefs.c
@@ -0,0 +1,372 @@
+/* column_prefs.c
+ * Dialog box for column preferences
+ *
+ * $Id: column_prefs.c,v 1.1 2000/01/10 01:43:58 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program 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 General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <errno.h>
+
+#ifndef __GLOBALS_H__
+#include "globals.h"
+#endif
+
+#include "column_prefs.h"
+#include "gtkglobals.h"
+
+#ifndef __PREFS_DLG_H__
+#include "prefs_dlg.h"
+#endif
+
+#include "prefs.h"
+#include "column.h"
+
+static GtkWidget *column_l, *chg_bt, *del_bt, *title_te, *fmt_m, *up_bt,
+                 *dn_bt;
+static gint       cur_fmt;
+
+static void   column_sel_list_cb(GtkWidget *, gpointer);
+static void   column_sel_new_cb(GtkWidget *, gpointer);
+static void   column_sel_chg_cb(GtkWidget *, gpointer);
+static void   column_sel_del_cb(GtkWidget *, gpointer);
+static void   column_sel_arrow_cb(GtkWidget *, gpointer);
+static void   column_set_fmt_cb(GtkWidget *, gpointer);
+
+#define E_COL_NAME_KEY "column_name"
+#define E_COL_LBL_KEY  "column_label"
+#define E_COL_CM_KEY   "in_col_cancel_mode"
+
+/* Create and display the column selection widgets. */
+/* Called when the 'Columns' preference notebook page is selected. */
+GtkWidget *
+column_prefs_show() {
+  GtkWidget   *main_vb, *top_hb, *list_bb, *new_bt, *column_sc, *nl_item,
+              *nl_lb, *tb, *lb, *menu, *mitem, *arrow_hb;
+  GList       *clp = NULL;
+  fmt_data    *cfmt;
+  gint         i;
+
+  /* Container for each row of widgets */
+  main_vb = gtk_vbox_new(FALSE, 5);
+  gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
+  gtk_widget_show(main_vb);
+  gtk_object_set_data(GTK_OBJECT(main_vb), E_COL_CM_KEY, (gpointer)FALSE);
+  
+  /* Top row: Column list and buttons */
+  top_hb = gtk_hbox_new(FALSE, 5);
+  gtk_container_add(GTK_CONTAINER(main_vb), top_hb);
+  gtk_widget_show(top_hb);
+  
+  list_bb = gtk_vbutton_box_new();
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (list_bb), GTK_BUTTONBOX_START);
+  gtk_container_add(GTK_CONTAINER(top_hb), list_bb);
+  gtk_widget_show(list_bb);
+
+  new_bt = gtk_button_new_with_label ("New");
+  gtk_signal_connect(GTK_OBJECT(new_bt), "clicked",
+    GTK_SIGNAL_FUNC(column_sel_new_cb), NULL);
+  gtk_container_add(GTK_CONTAINER(list_bb), new_bt);
+  gtk_widget_show(new_bt);
+  
+  chg_bt = gtk_button_new_with_label ("Change");
+  gtk_widget_set_sensitive(chg_bt, FALSE);
+  gtk_signal_connect(GTK_OBJECT(chg_bt), "clicked",
+    GTK_SIGNAL_FUNC(column_sel_chg_cb), NULL);
+  gtk_container_add(GTK_CONTAINER(list_bb), chg_bt);
+  gtk_widget_show(chg_bt);
+  
+  del_bt = gtk_button_new_with_label ("Delete");
+  gtk_widget_set_sensitive(del_bt, FALSE);
+  gtk_signal_connect(GTK_OBJECT(del_bt), "clicked",
+    GTK_SIGNAL_FUNC(column_sel_del_cb), NULL);
+  gtk_container_add(GTK_CONTAINER(list_bb), del_bt);
+  gtk_widget_show(del_bt);
+  
+  arrow_hb = gtk_hbox_new(TRUE, 3);
+  gtk_container_add(GTK_CONTAINER(list_bb), arrow_hb);
+  gtk_widget_show(arrow_hb);
+  
+  up_bt = gtk_button_new_with_label("Up");
+  gtk_widget_set_sensitive(up_bt, FALSE);
+  gtk_signal_connect(GTK_OBJECT(up_bt), "clicked",
+    GTK_SIGNAL_FUNC(column_sel_arrow_cb), NULL);
+  gtk_box_pack_start(GTK_BOX(arrow_hb), up_bt, TRUE, TRUE, 0);
+  gtk_widget_show(up_bt);
+  
+  dn_bt = gtk_button_new_with_label("Down");
+  gtk_widget_set_sensitive(dn_bt, FALSE);
+  gtk_signal_connect(GTK_OBJECT(dn_bt), "clicked",
+    GTK_SIGNAL_FUNC(column_sel_arrow_cb), NULL);
+  gtk_box_pack_start(GTK_BOX(arrow_hb), dn_bt, TRUE, TRUE, 0);
+  gtk_widget_show(dn_bt);
+  
+  column_sc = gtk_scrolled_window_new(NULL, NULL);
+  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(column_sc),
+    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+  gtk_widget_set_usize(column_sc, 250, 150);
+  gtk_container_add(GTK_CONTAINER(top_hb), column_sc);
+  gtk_widget_show(column_sc);
+
+  column_l = gtk_list_new();
+  gtk_list_set_selection_mode(GTK_LIST(column_l), GTK_SELECTION_SINGLE);
+  gtk_signal_connect(GTK_OBJECT(column_l), "selection_changed",
+    GTK_SIGNAL_FUNC(column_sel_list_cb), main_vb);
+  gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(column_sc), column_l);
+  gtk_widget_show(column_l);
+
+  clp = g_list_first(prefs.col_list);
+  while (clp) {
+    cfmt    = (fmt_data *) clp->data;
+    nl_lb   = gtk_label_new(cfmt->title);
+    nl_item = gtk_list_item_new();
+    gtk_misc_set_alignment (GTK_MISC (nl_lb), 0.0, 0.5);
+    gtk_container_add(GTK_CONTAINER(nl_item), nl_lb);
+    gtk_widget_show(nl_lb);
+    gtk_container_add(GTK_CONTAINER(column_l), nl_item);
+    gtk_widget_show(nl_item);
+    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_LBL_KEY, nl_lb);
+    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_NAME_KEY, clp);
+ 
+    clp = clp->next;
+  }
+  
+  /* Colunm name entry and format selection */
+  tb = gtk_table_new(2, 2, FALSE);
+  gtk_container_add(GTK_CONTAINER(main_vb), tb);
+  gtk_table_set_row_spacings(GTK_TABLE(tb), 10);
+  gtk_table_set_col_spacings(GTK_TABLE(tb), 15);
+  gtk_widget_show(tb);
+  
+  lb = gtk_label_new("Column title:");
+  gtk_misc_set_alignment(GTK_MISC(lb), 1.0, 0.5);
+  gtk_table_attach_defaults(GTK_TABLE(tb), lb, 0, 1, 0, 1);
+  gtk_widget_show(lb);
+  
+  title_te = gtk_entry_new();
+  gtk_table_attach_defaults(GTK_TABLE(tb), title_te, 1, 2, 0, 1);
+  gtk_widget_show(title_te);
+
+  lb = gtk_label_new("Column format:");
+  gtk_misc_set_alignment(GTK_MISC(lb), 1.0, 0.5);
+  gtk_table_attach_defaults(GTK_TABLE(tb), lb, 0, 1, 1, 2);
+  gtk_widget_show(lb);
+
+  fmt_m = gtk_option_menu_new();
+  menu  = gtk_menu_new();
+  for (i = 0; i < NUM_COL_FMTS; i++) {
+    mitem = gtk_menu_item_new_with_label(col_format_desc(i));
+    gtk_menu_append(GTK_MENU(menu), mitem);
+    gtk_signal_connect( GTK_OBJECT(mitem), "activate",
+      GTK_SIGNAL_FUNC(column_set_fmt_cb), (gpointer) i);
+    gtk_widget_show(mitem);
+  }
+  gtk_option_menu_set_menu(GTK_OPTION_MENU(fmt_m), menu);
+  cur_fmt = 0;
+  gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt);
+  gtk_table_attach_defaults(GTK_TABLE(tb), fmt_m, 1, 2, 1, 2);
+  gtk_widget_show(fmt_m);  
+      
+  return(main_vb);
+}
+
+static void
+column_sel_list_cb(GtkWidget *l, gpointer data) {
+  fmt_data   *cfmt;
+  gchar      *title = "";
+  GList      *sl, *clp;
+  GtkObject  *l_item;
+  gint        sensitivity = FALSE, up_sens = FALSE, dn_sens = FALSE;
+
+  sl = GTK_LIST(l)->selection;
+          
+  if (sl) {  /* Something was selected */
+    l_item = GTK_OBJECT(sl->data);
+    clp    = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
+    if (clp) {
+      cfmt   = (fmt_data *) clp->data;
+      title   = cfmt->title;
+      cur_fmt = get_column_format_from_str(cfmt->fmt);
+      gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt);
+      sensitivity = TRUE;
+      if (clp != g_list_first(prefs.col_list))
+        up_sens = TRUE;
+      if (clp != g_list_last(prefs.col_list))
+        dn_sens = TRUE;
+    }
+  }
+
+  /* Did you know that this function is called when the window is destroyed? */
+  /* Funny, that. */
+  if (!gtk_object_get_data(GTK_OBJECT(data), E_COL_CM_KEY)) {
+    gtk_entry_set_text(GTK_ENTRY(title_te), title);
+    gtk_widget_set_sensitive(chg_bt, sensitivity);
+    gtk_widget_set_sensitive(del_bt, sensitivity);
+    gtk_widget_set_sensitive(up_bt, up_sens);
+    gtk_widget_set_sensitive(dn_bt, dn_sens);
+  }
+}
+
+/* To do: add input checking to each of these callbacks */
+ 
+static void
+column_sel_new_cb(GtkWidget *w, gpointer data) {
+  fmt_data   *cfmt;
+  gchar      *title;
+  GtkWidget  *nl_item, *nl_lb;
+  
+  title = gtk_entry_get_text(GTK_ENTRY(title_te));
+  
+  if (strlen(title) > 0) {
+    cfmt           = (fmt_data *) g_malloc(sizeof(fmt_data));
+    cfmt->title    = g_strdup(title);
+    cfmt->fmt      = g_strdup(col_format_to_string(cur_fmt));
+    prefs.col_list = g_list_append(prefs.col_list, cfmt);
+    nl_lb          = gtk_label_new(cfmt->title);
+    nl_item        = gtk_list_item_new();
+    gtk_misc_set_alignment (GTK_MISC (nl_lb), 0.0, 0.5);
+    gtk_container_add(GTK_CONTAINER(nl_item), nl_lb);
+    gtk_widget_show(nl_lb);
+    gtk_container_add(GTK_CONTAINER(column_l), nl_item);
+    gtk_widget_show(nl_item);
+    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_LBL_KEY, nl_lb);
+    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_NAME_KEY,
+      g_list_last(prefs.col_list));
+    gtk_list_select_child(GTK_LIST(column_l), nl_item);
+  }
+}
+
+static void
+column_sel_chg_cb(GtkWidget *w, gpointer data) {
+  fmt_data   *cfmt;
+  gchar      *title = "";
+  GList      *sl, *clp;
+  GtkObject  *l_item;
+  GtkLabel   *nl_lb;
+
+  sl     = GTK_LIST(column_l)->selection;
+  title  = gtk_entry_get_text(GTK_ENTRY(title_te));
+
+  if (sl) {  /* Something was selected */
+    l_item = GTK_OBJECT(sl->data);
+    clp    = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
+    nl_lb  = (GtkLabel *) gtk_object_get_data(l_item, E_COL_LBL_KEY);
+    if (clp && nl_lb) {
+      cfmt = (fmt_data *) clp->data;
+      
+      if (strlen(title) > 0 && cfmt) {
+        g_free(cfmt->title);
+        g_free(cfmt->fmt);
+        cfmt->title = g_strdup(title);
+        cfmt->fmt   = g_strdup(col_format_to_string(cur_fmt));
+        gtk_label_set(nl_lb, cfmt->title);
+      }
+    }
+  }
+}
+
+static void
+column_sel_del_cb(GtkWidget *w, gpointer data) {
+  GList      *sl, *clp;
+  fmt_data   *cfmt;
+  GtkObject  *l_item;
+  gint        pos;
+  
+  sl = GTK_LIST(column_l)->selection;
+  if (sl) {  /* Something was selected */
+    l_item = GTK_OBJECT(sl->data);
+    pos    = gtk_list_child_position(GTK_LIST(column_l), GTK_WIDGET(l_item));
+    clp    = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
+    if (clp) {
+      cfmt = (fmt_data *) clp->data;
+      g_free(cfmt->title);
+      g_free(cfmt->fmt);
+      g_free(cfmt);
+      prefs.col_list = g_list_remove_link(prefs.col_list, clp);
+      gtk_list_clear_items(GTK_LIST(column_l), pos, pos + 1);
+    } 
+  }
+}
+
+static void
+column_sel_arrow_cb(GtkWidget *w, gpointer data) {
+  GList      *sl, *clp, *il;
+  fmt_data   *cfmt;
+  GtkObject  *l_item;
+  gint        pos, inc = 1;
+  
+  if (w == up_bt)
+    inc = -1;
+  
+  sl = GTK_LIST(column_l)->selection;
+  if (sl) {  /* Something was selected */
+    l_item  = GTK_OBJECT(sl->data);
+    pos     = gtk_list_child_position(GTK_LIST(column_l), GTK_WIDGET(l_item));
+    clp     = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
+    if (clp) {
+      cfmt = (fmt_data *) clp->data;
+      prefs.col_list = g_list_remove(prefs.col_list, cfmt);
+      g_list_insert(prefs.col_list, cfmt, pos + inc);
+      il = (GList *) g_malloc(sizeof(GList));
+      il->next = NULL;
+      il->prev = NULL;
+      il->data = l_item;
+      gtk_widget_ref(GTK_WIDGET(l_item));
+      gtk_list_clear_items(GTK_LIST(column_l), pos, pos + 1);
+      gtk_list_insert_items(GTK_LIST(column_l), il, pos + inc);
+      gtk_widget_unref(GTK_WIDGET(l_item));
+      gtk_list_select_item(GTK_LIST(column_l), pos + inc);
+    } 
+  }
+}
+
+void
+column_set_fmt_cb(GtkWidget *w, gpointer data) {
+  cur_fmt = (gint) data;
+}
+
+void
+column_prefs_ok(GtkWidget *w) {
+
+  column_prefs_delete(w);
+}
+
+void
+column_prefs_save(GtkWidget *w) {
+}
+
+void
+column_prefs_cancel(GtkWidget *w) {
+
+  column_prefs_delete(w);
+}
+
+void
+column_prefs_delete(GtkWidget *w) {
+ 
+  /* Let the list cb know we're about to destroy the widget tree, so it */
+  /* doesn't operate on widgets that don't exist. */  
+  gtk_object_set_data(GTK_OBJECT(w), E_COL_CM_KEY, (gpointer)TRUE);
+  gtk_widget_destroy(GTK_WIDGET(w));
+} 
diff --git a/gtk/column_prefs.h b/gtk/column_prefs.h
new file mode 100644
index 0000000000..3a4f146267
--- /dev/null
+++ b/gtk/column_prefs.h
@@ -0,0 +1,30 @@
+/* gui_prefs.h
+ * Definitions for column preferences window
+ *
+ * $Id: column_prefs.h,v 1.1 2000/01/10 01:43:58 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program 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 General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+GtkWidget           *column_prefs_show(void);
+void                 column_prefs_ok(GtkWidget *);
+void                 column_prefs_save(GtkWidget *);
+void                 column_prefs_cancel(GtkWidget *);
+void                 column_prefs_delete(GtkWidget *);
diff --git a/gtk/main.c b/gtk/main.c
index 5d5cb717d2..7203371484 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.84 2000/01/06 08:20:13 guy Exp $
+ * $Id: main.c,v 1.85 2000/01/10 01:43:59 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1336,8 +1336,8 @@ main(int argc, char *argv[])
 
     /* Save static column sizes to use during a "-S" capture, so that
        the columns don't resize during a live capture. */
-    cf.cinfo.col_width[i] = get_column_width(get_column_format(i),
-						pl_style->font);
+    cf.cinfo.col_width[i] = gdk_string_width(pl_style->font,
+			        get_column_longest_string(get_column_format(i)));
   }
   gtk_widget_set_usize(packet_list, -1, pl_size);
   gtk_widget_show(packet_list);
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 2f381b408a..6377349c3e 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
 /* prefs_dlg.c
  * Routines for handling preferences
  *
- * $Id: prefs_dlg.c,v 1.8 2000/01/03 06:59:23 guy Exp $
+ * $Id: prefs_dlg.c,v 1.9 2000/01/10 01:44:00 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -48,7 +48,7 @@
 #include "packet.h"
 #include "file.h"
 #include "prefs.h"
-#include "column.h"
+#include "column_prefs.h"
 #include "print.h"
 #include "prefs_dlg.h"
 #include "print_prefs.h"