aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>1999-12-02 04:30:15 +0000
committerGerald Combs <gerald@wireshark.org>1999-12-02 04:30:15 +0000
commitee51e6534af130b550fbc12f06323322db379bd0 (patch)
tree35e0d1883cf89babafe2e173a87c0e78c3295196 /gtk
parent2478a404c8d3fa6244cac8512458e092f6a2fe20 (diff)
Add stream window color preferences. We don't (yet) use cmaps, so this
may not work with pseudocolor systems. svn path=/trunk/; revision=1179
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Makefile.am6
-rw-r--r--gtk/main.c32
-rw-r--r--gtk/prefs_dlg.c24
-rw-r--r--gtk/stream_prefs.c226
-rw-r--r--gtk/stream_prefs.h31
5 files changed, 292 insertions, 27 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4b6f5ecd3d..3154e6b3e6 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.10 1999/11/08 01:03:40 guy Exp $
+# $Id: Makefile.am,v 1.11 1999/12/02 04:30:13 gerald Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@@ -57,4 +57,6 @@ libui_a_SOURCES = \
print_prefs.c \
print_prefs.h \
proto_draw.c \
- proto_draw.h
+ proto_draw.h \
+ stream_prefs.c \
+ stream_prefs.h
diff --git a/gtk/main.c b/gtk/main.c
index a20feff9e5..ac67ae047f 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.57 1999/11/30 20:50:15 guy Exp $
+ * $Id: main.c,v 1.58 1999/12/02 04:30:13 gerald Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -436,19 +436,17 @@ static void follow_print_stream(GtkWidget *w, gpointer parent_w)
static void
follow_load_text(GtkWidget *text, char *filename, gboolean show_ascii)
{
- int bytes_already, bcount;
- tcp_stream_chunk sc;
- guint32 client_addr = 0;
- guint16 client_port = 0;
- GdkColor client = { 0, 16383, 0, 0 };
- GdkColor server = { 0, 0, 0, 16383 };
-
- /* Delete any info already in text box */
- bytes_already = gtk_text_get_length(GTK_TEXT(text));
- if (bytes_already > 0) {
- gtk_text_set_point(GTK_TEXT(text), 0);
- gtk_text_forward_delete(GTK_TEXT(text), bytes_already);
- }
+ int bytes_already, bcount;
+ tcp_stream_chunk sc;
+ guint32 client_addr = 0;
+ guint16 client_port = 0;
+
+ /* Delete any info already in text box */
+ bytes_already = gtk_text_get_length(GTK_TEXT(text));
+ if (bytes_already > 0) {
+ gtk_text_set_point(GTK_TEXT(text), 0);
+ gtk_text_forward_delete(GTK_TEXT(text), bytes_already);
+ }
/* stop the updates while we fill the text box */
gtk_text_freeze( GTK_TEXT(text) );
@@ -478,9 +476,11 @@ follow_load_text(GtkWidget *text, char *filename, gboolean show_ascii)
EBCDIC_to_ASCII(buffer, nchars);
}
if (client_addr == sc.src_addr && client_port == sc.src_port)
- gtk_text_insert( GTK_TEXT(text), m_r_font, &client, NULL, buffer, nchars );
+ gtk_text_insert( GTK_TEXT(text), m_r_font, &prefs.st_client_fg,
+ &prefs.st_client_bg, buffer, nchars );
else
- gtk_text_insert( GTK_TEXT(text), m_r_font, &server, NULL, buffer, nchars );
+ gtk_text_insert( GTK_TEXT(text), m_r_font, &prefs.st_server_fg,
+ &prefs.st_server_bg, buffer, nchars );
}
}
if( ferror( data_out_file ) ) {
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 40e9891f7b..a3bd6250fd 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.2 1999/09/10 06:53:31 guy Exp $
+ * $Id: prefs_dlg.c,v 1.3 1999/12/02 04:30:15 gerald Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -52,6 +52,7 @@
#include "prefs_dlg.h"
#include "print_prefs.h"
#include "filter_prefs.h"
+#include "stream_prefs.h"
#include "util.h"
e_prefs prefs;
@@ -65,12 +66,13 @@ static gboolean prefs_main_delete_cb(GtkWidget *, gpointer);
#define E_PRINT_PAGE_KEY "printer_options_page"
#define E_FILTER_PAGE_KEY "filter_options_page"
#define E_COLUMN_PAGE_KEY "column_options_page"
+#define E_STREAM_PAGE_KEY "tcp_stream_options_page"
void
prefs_cb(GtkWidget *w, gpointer sp) {
GtkWidget *prefs_w, *main_vb, *top_hb, *bbox, *prefs_nb,
*ok_bt, *save_bt, *cancel_bt;
- GtkWidget *print_pg, *filter_pg, *column_pg, *filter_te, *label;
+ GtkWidget *print_pg, *filter_pg, *column_pg, *stream_pg, *filter_te, *label;
/* GtkWidget *nlabel; */
gint start_page = (gint) sp;
@@ -98,13 +100,6 @@ prefs_cb(GtkWidget *w, gpointer sp) {
gtk_container_add(GTK_CONTAINER(main_vb), prefs_nb);
gtk_widget_show(prefs_nb);
- /* General prefs */
-/* nlabel = gtk_label_new("Nothing here yet...");
- gtk_widget_show (nlabel);
-
- label = gtk_label_new ("General");
- gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), nlabel, label);
- */
/* Printing prefs */
print_pg = printer_prefs_show();
gtk_object_set_data(GTK_OBJECT(prefs_w), E_PRINT_PAGE_KEY, print_pg);
@@ -121,12 +116,19 @@ prefs_cb(GtkWidget *w, gpointer sp) {
gtk_object_set_data(GTK_OBJECT(prefs_w), E_FILTER_PAGE_KEY, filter_pg);
label = gtk_label_new ("Filters");
gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), filter_pg, label);
+
/* Column prefs */
column_pg = column_prefs_show();
gtk_object_set_data(GTK_OBJECT(prefs_w), E_COLUMN_PAGE_KEY, column_pg);
label = gtk_label_new ("Columns");
gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), column_pg, label);
+ /* Column prefs */
+ stream_pg = stream_prefs_show();
+ gtk_object_set_data(GTK_OBJECT(prefs_w), E_STREAM_PAGE_KEY, stream_pg);
+ label = gtk_label_new ("TCP Streams");
+ gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), stream_pg, label);
+
/* Jump to the specified page, if it was supplied */
if (start_page > E_PR_PG_NONE)
gtk_notebook_set_page(GTK_NOTEBOOK(prefs_nb), start_page);
@@ -169,6 +171,7 @@ prefs_main_ok_cb(GtkWidget *ok_bt, gpointer parent_w)
printer_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
filter_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
column_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
+ stream_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_STREAM_PAGE_KEY));
gtk_widget_destroy(GTK_WIDGET(parent_w));
}
@@ -178,6 +181,7 @@ prefs_main_save_cb(GtkWidget *save_bt, gpointer parent_w)
printer_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
filter_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
column_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
+ stream_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_STREAM_PAGE_KEY));
write_prefs();
}
@@ -187,6 +191,7 @@ prefs_main_cancel_cb(GtkWidget *cancel_bt, gpointer parent_w)
printer_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
filter_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
column_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
+ stream_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_STREAM_PAGE_KEY));
gtk_widget_destroy(GTK_WIDGET(parent_w));
}
@@ -196,5 +201,6 @@ prefs_main_delete_cb(GtkWidget *prefs_w, gpointer dummy)
printer_prefs_delete(gtk_object_get_data(GTK_OBJECT(prefs_w), E_PRINT_PAGE_KEY));
filter_prefs_delete(gtk_object_get_data(GTK_OBJECT(prefs_w), E_FILTER_PAGE_KEY));
column_prefs_delete(gtk_object_get_data(GTK_OBJECT(prefs_w), E_COLUMN_PAGE_KEY));
+ stream_prefs_delete(gtk_object_get_data(GTK_OBJECT(prefs_w), E_STREAM_PAGE_KEY));
return FALSE;
}
diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c
new file mode 100644
index 0000000000..8f50b2706e
--- /dev/null
+++ b/gtk/stream_prefs.c
@@ -0,0 +1,226 @@
+/* stream_prefs.c
+ * Dialog boxes for preferences for the stream window
+ *
+ * $Id: stream_prefs.c,v 1.1 1999/12/02 04:30:15 gerald 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 "stream_prefs.h"
+
+#ifndef __KEYS_H__
+#include "keys.h"
+#endif
+
+#ifndef __PRINT_H__
+#include "print.h"
+#endif
+
+#ifndef __PREFS_DLG_H__
+#include "prefs_dlg.h"
+#endif
+
+#ifndef __UTIL_H__
+#include "util.h"
+#endif
+
+static void update_text_color(GtkWidget *, gpointer);
+static void update_current_color(GtkWidget *, gpointer);
+static void copy_color_vals(GdkColor *, GdkColor *);
+
+static GdkColor tcolors[4], *curcolor = NULL;
+
+#define SAMPLE_CLIENT_TEXT "Sample client text\n"
+#define SAMPLE_SERVER_TEXT "Sample server text\n"
+#define CFG_IDX 0
+#define CBG_IDX 1
+#define SFG_IDX 2
+#define SBG_IDX 3
+#define STREAM_SAMPLE_KEY "stream_entry"
+#define STREAM_CS_KEY "stream_colorselection"
+#define CS_RED 0
+#define CS_GREEN 1
+#define CS_BLUE 2
+#define CS_OPACITY 3
+
+GtkWidget *
+stream_prefs_show()
+{
+ GtkWidget *main_vb, *main_tb, *label, *optmenu, *menu, *menuitem;
+ GtkWidget *sample, *colorsel;
+ int width, height, i;
+ gchar *mt[] = { "Client foreground", "Client background",
+ "Server foreground", "Server background" };
+ int mcount = sizeof(mt) / sizeof (gchar *);
+ gdouble scolor[4];
+
+ copy_color_vals(&tcolors[CFG_IDX], &prefs.st_client_fg);
+ copy_color_vals(&tcolors[CBG_IDX], &prefs.st_client_bg);
+ copy_color_vals(&tcolors[SFG_IDX], &prefs.st_server_fg);
+ copy_color_vals(&tcolors[SBG_IDX], &prefs.st_server_bg);
+
+ curcolor = &tcolors[CFG_IDX];
+
+ scolor[CS_RED] = (gdouble) (curcolor->red) / 65535.0;
+ scolor[CS_GREEN] = (gdouble) (curcolor->green) / 65535.0;
+ scolor[CS_BLUE] = (gdouble) (curcolor->blue) / 65535.0;
+ scolor[CS_OPACITY] = 1.0;
+
+ /* Enclosing containers for each row of widgets */
+ main_vb = gtk_vbox_new(FALSE, 5);
+ gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
+
+ main_tb = gtk_table_new(3, 3, FALSE);
+ gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0);
+ gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
+ gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
+ gtk_widget_show(main_tb);
+
+ label = gtk_label_new("Set:");
+ gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), label, 0, 1, 0, 1);
+ gtk_widget_show(label);
+
+ /* We have to create this now, and configure it below. */
+ colorsel = gtk_color_selection_new();
+
+ optmenu = gtk_option_menu_new ();
+ menu = gtk_menu_new ();
+ for (i = 0; i < mcount; i++){
+ menuitem = gtk_menu_item_new_with_label (mt[i]);
+ gtk_object_set_data(GTK_OBJECT(menuitem), STREAM_CS_KEY,
+ (gpointer) colorsel);
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+ GTK_SIGNAL_FUNC(update_current_color), &tcolors[i]);
+ gtk_widget_show (menuitem);
+ gtk_menu_append (GTK_MENU (menu), menuitem);
+ }
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), menu);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), optmenu, 1, 2, 0, 1);
+ gtk_widget_show(optmenu);
+
+ sample = gtk_text_new(FALSE, FALSE);
+ height = 2 * (sample->style->font->ascent + sample->style->font->descent);
+ width = gdk_string_width(sample->style->font, "Sample server text");
+ gtk_widget_set_usize(GTK_WIDGET(sample), width, height);
+ gtk_text_set_editable(GTK_TEXT(sample), FALSE);
+ gtk_text_insert(GTK_TEXT(sample), NULL, &tcolors[CFG_IDX], &tcolors[CBG_IDX],
+ SAMPLE_CLIENT_TEXT, -1);
+ gtk_text_insert(GTK_TEXT(sample), NULL, &tcolors[SFG_IDX], &tcolors[SBG_IDX],
+ SAMPLE_SERVER_TEXT, -1);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), sample, 2, 3, 0, 2);
+ gtk_widget_show(sample);
+
+ gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel), &scolor[CS_RED]);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), colorsel, 0, 3, 2, 3);
+ gtk_object_set_data(GTK_OBJECT(colorsel), STREAM_SAMPLE_KEY,
+ (gpointer) sample);
+ gtk_signal_connect(GTK_OBJECT(colorsel), "color-changed",
+ GTK_SIGNAL_FUNC(update_text_color), NULL);
+ gtk_widget_show(colorsel);
+
+ gtk_widget_show(main_vb);
+ return(main_vb);
+}
+
+static void
+update_text_color(GtkWidget *w, gpointer data) {
+ GtkText *sample = gtk_object_get_data(GTK_OBJECT(w), STREAM_SAMPLE_KEY);
+ gdouble scolor[4];
+
+ gtk_color_selection_get_color(GTK_COLOR_SELECTION(w), &scolor[CS_RED]);
+
+ curcolor->red = (gushort) (scolor[CS_RED] * 65535.0);
+ curcolor->green = (gushort) (scolor[CS_GREEN] * 65535.0);
+ curcolor->blue = (gushort) (scolor[CS_BLUE] * 65535.0);
+
+ gtk_text_freeze(sample);
+ gtk_text_set_point(sample, 0);
+ gtk_text_forward_delete(sample, gtk_text_get_length(sample));
+ gtk_text_insert(sample, NULL, &tcolors[CFG_IDX], &tcolors[CBG_IDX],
+ SAMPLE_CLIENT_TEXT, -1);
+ gtk_text_insert(sample, NULL, &tcolors[SFG_IDX], &tcolors[SBG_IDX],
+ SAMPLE_SERVER_TEXT, -1);
+ gtk_text_thaw(sample);
+}
+
+static void
+update_current_color(GtkWidget *w, gpointer data)
+{
+ GtkColorSelection *colorsel = GTK_COLOR_SELECTION(gtk_object_get_data(GTK_OBJECT(w),
+ STREAM_CS_KEY));
+ gdouble scolor[4];
+
+ curcolor = (GdkColor *) data;
+
+ scolor[CS_RED] = (gdouble) (curcolor->red) / 65535.0;
+ scolor[CS_GREEN] = (gdouble) (curcolor->green) / 65535.0;
+ scolor[CS_BLUE] = (gdouble) (curcolor->blue) / 65535.0;
+ scolor[CS_OPACITY] = 1.0;
+
+ gtk_color_selection_set_color(colorsel, &scolor[CS_RED]);
+}
+
+static void
+copy_color_vals(GdkColor *target, GdkColor *source)
+{
+ target->pixel = source->pixel;
+ target->red = source->red;
+ target->green = source->green;
+ target->blue = source->blue;
+}
+
+void
+stream_prefs_ok(GtkWidget *w)
+{
+ copy_color_vals(&prefs.st_client_fg, &tcolors[CFG_IDX]);
+ copy_color_vals(&prefs.st_client_bg, &tcolors[CBG_IDX]);
+ copy_color_vals(&prefs.st_server_fg, &tcolors[SFG_IDX]);
+ copy_color_vals(&prefs.st_server_bg, &tcolors[SBG_IDX]);
+
+ stream_prefs_delete(w);
+}
+
+void
+stream_prefs_save(GtkWidget *w)
+{
+ stream_prefs_ok(w);
+}
+
+void
+stream_prefs_cancel(GtkWidget *w)
+{
+ stream_prefs_delete(w);
+}
+
+void
+stream_prefs_delete(GtkWidget *w)
+{
+}
diff --git a/gtk/stream_prefs.h b/gtk/stream_prefs.h
new file mode 100644
index 0000000000..9a306d19cc
--- /dev/null
+++ b/gtk/stream_prefs.h
@@ -0,0 +1,31 @@
+/* stream_prefs.h
+ * Definitions for stream preferences window
+ *
+ * $Id: stream_prefs.h,v 1.1 1999/12/02 04:30:15 gerald Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1999 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 *stream_prefs_show(void);
+void stream_prefs_ok(GtkWidget *w);
+void stream_prefs_save(GtkWidget *w);
+void stream_prefs_cancel(GtkWidget *w);
+void stream_prefs_delete(GtkWidget *w);