/* capture_file_dlg.c
* Dialog boxes for handling capture files
*
- * $Id$
- *
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#include <gtk/gtk.h>
-#include "packet-range.h"
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
#include <epan/addr_resolv.h>
#include <epan/prefs.h>
-#include "../globals.h"
-#include "../color.h"
-#include "../color_filters.h"
-#include "../merge.h"
-#include "ui/util.h"
+#include "globals.h"
+#include "color.h"
+#include "color_filters.h"
+
#include <wsutil/file_util.h>
+#include <wiretap/merge.h>
+
+#include "ui/util.h"
#include "ui/alert_box.h"
-#include "ui/last_open_dir.h"
+#include "ui/file_dialog.h"
#include "ui/recent.h"
-#include "ui/simple_dialog.h"
#include "ui/ui_util.h"
#include "ui/gtk/gtkglobals.h"
+#include "ui/gtk/old-gtk-compat.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/filter_dlg.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/file_dlg.h"
#include "ui/gtk/capture_file_dlg.h"
#include "ui/gtk/drag_and_drop.h"
+#include "ui/gtk/export_pdu_dlg.h"
#include "ui/gtk/main.h"
-#include "ui/gtk/menus.h"
#include "ui/gtk/color_dlg.h"
-#include "ui/gtk/new_packet_list.h"
+#include "ui/gtk/packet_list.h"
#ifdef HAVE_LIBPCAP
#include "ui/gtk/capture_dlg.h"
#endif
#include "ui/gtk/range_utils.h"
#include "ui/gtk/filter_autocomplete.h"
-#if _WIN32
+#ifdef _WIN32
+#define USE_WIN32_FILE_DIALOGS
+#endif
+
+#ifdef USE_WIN32_FILE_DIALOGS
#include <gdk/gdkwin32.h>
#include <windows.h>
#include "ui/win32/file_dlg_win32.h"
#endif
-
-static void file_open_ok_cb(GtkWidget *w, gpointer fs);
-static void file_open_destroy_cb(GtkWidget *win, gpointer user_data);
-static void file_merge_ok_cb(GtkWidget *w, gpointer fs);
-static void file_merge_destroy_cb(GtkWidget *win, gpointer user_data);
-static void file_save_as_select_file_type_cb(GtkWidget *w, gpointer data);
-static void file_save_as_ok_cb(GtkWidget *w, gpointer fs);
-static void file_save_as_destroy_cb(GtkWidget *win, gpointer user_data);
-static void file_export_specified_packets_cb(GtkWidget *w, gpointer fs);
-static void file_export_specified_packets_select_file_type_cb(GtkWidget *w, gpointer data);
-static void file_export_specified_packets_ok_cb(GtkWidget *w, gpointer fs);
-static void file_export_specified_packets_destroy_cb(GtkWidget *win, gpointer user_data);
-static void file_color_import_ok_cb(GtkWidget *w, gpointer filter_list);
-static void file_color_import_destroy_cb(GtkWidget *win, gpointer user_data);
-static void file_color_export_ok_cb(GtkWidget *w, gpointer filter_list);
-static void file_color_export_destroy_cb(GtkWidget *win, gpointer user_data);
-static void set_file_type_list(GtkWidget *combo_box, int default_file_type);
+static void do_file_save(capture_file *cf, gboolean dont_reopen);
+static void file_save_as_cmd(capture_file *cf,
+ gboolean must_support_all_comments,
+ gboolean dont_reopen);
+static void file_select_file_type_cb(GtkWidget *w, gpointer data);
+static int set_file_type_list(GtkWidget *combo_box, capture_file *cf,
+ gboolean must_support_all_comments);
+static gboolean test_file_close(capture_file *cf, gboolean from_quit,
+ const char *before_what);
#define E_FILE_TYPE_COMBO_BOX_KEY "file_type_combo_box"
#define E_COMPRESSED_CB_KEY "compressed_cb"
-#define E_FILE_M_RESOLVE_KEY "file_dlg_mac_resolve_key"
-#define E_FILE_N_RESOLVE_KEY "file_dlg_network_resolve_key"
-#define E_FILE_T_RESOLVE_KEY "file_dlg_transport_resolve_key"
-
-#define E_MERGE_PREPEND_KEY "merge_dlg_prepend_key"
-#define E_MERGE_CHRONO_KEY "merge_dlg_chrono_key"
-#define E_MERGE_APPEND_KEY "merge_dlg_append_key"
-
-
#define PREVIEW_TABLE_KEY "preview_table_key"
-#define PREVIEW_FILENAME_KEY "preview_filename_key"
#define PREVIEW_FORMAT_KEY "preview_format_key"
#define PREVIEW_SIZE_KEY "preview_size_key"
#define PREVIEW_ELAPSED_KEY "preview_elapsed_key"
#define PREVIEW_PACKETS_KEY "preview_packets_key"
#define PREVIEW_FIRST_KEY "preview_first_key"
-
-/*
- * Keep a static pointer to the current "Save Capture File As" window, if
- * any, so that if somebody tries to do "File:Save" or "File:Save As"
- * while there's already a "Save Capture File As" window up, we just pop
- * up the existing one, rather than creating a new one.
- */
-static GtkWidget *file_save_as_w;
-
-/*
- * Keep a static pointer to the current "Export Specified Packets" window, if
- * any, so that if somebody tries to do "File:Export Specified Packets"
- * while there's already a "Export Specified Packets" window up, we just pop
- * up the existing one, rather than creating a new one.
- */
-static GtkWidget *file_export_specified_packets_w;
-
/* XXX - can we make these not be static? */
-static packet_range_t range;
static gboolean color_selected;
-static GtkWidget *range_tb;
#define PREVIEW_STR_MAX 200
static wtap *
preview_set_filename(GtkWidget *prev, const gchar *cf_name)
{
- GtkWidget *label;
- wtap *wth;
- int err = 0;
- gchar *err_info;
- gchar string_buff[PREVIEW_STR_MAX];
- gint64 filesize;
-
+ GtkWidget *label;
+ wtap *wth;
+ int err = 0;
+ gchar *err_info;
+ gchar string_buff[PREVIEW_STR_MAX];
+ gint64 filesize;
+
+
+ /* init preview labels */
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
+ gtk_label_set_text(GTK_LABEL(label), "-");
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_SIZE_KEY);
+ gtk_label_set_text(GTK_LABEL(label), "-");
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_ELAPSED_KEY);
+ gtk_label_set_text(GTK_LABEL(label), "-");
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_PACKETS_KEY);
+ gtk_label_set_text(GTK_LABEL(label), "-");
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FIRST_KEY);
+ gtk_label_set_text(GTK_LABEL(label), "-");
+
+ if (!cf_name) {
+ return NULL;
+ }
- /* init preview labels */
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FILENAME_KEY);
- gtk_label_set_text(GTK_LABEL(label), "-");
+ if (test_for_directory(cf_name) == EISDIR) {
label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
- gtk_label_set_text(GTK_LABEL(label), "-");
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_SIZE_KEY);
- gtk_label_set_text(GTK_LABEL(label), "-");
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_ELAPSED_KEY);
- gtk_label_set_text(GTK_LABEL(label), "-");
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_PACKETS_KEY);
- gtk_label_set_text(GTK_LABEL(label), "-");
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FIRST_KEY);
- gtk_label_set_text(GTK_LABEL(label), "-");
-
- if(!cf_name) {
- return NULL;
- }
-
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FILENAME_KEY);
- gtk_label_set_text(GTK_LABEL(label), get_basename(cf_name));
-
- if (test_for_directory(cf_name) == EISDIR) {
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
- gtk_label_set_text(GTK_LABEL(label), "directory");
- return NULL;
- }
+ gtk_label_set_text(GTK_LABEL(label), "directory");
+ return NULL;
+ }
- wth = wtap_open_offline(cf_name, &err, &err_info, TRUE);
- if (wth == NULL) {
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
- if(err == WTAP_ERR_FILE_UNKNOWN_FORMAT) {
- gtk_label_set_text(GTK_LABEL(label), "unknown file format");
- } else {
- gtk_label_set_text(GTK_LABEL(label), "error opening file");
- }
- return NULL;
+ wth = wtap_open_offline(cf_name, WTAP_TYPE_AUTO, &err, &err_info, TRUE);
+ if (wth == NULL) {
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
+ if (err == WTAP_ERR_FILE_UNKNOWN_FORMAT) {
+ gtk_label_set_text(GTK_LABEL(label), "unknown file format");
+ } else {
+ gtk_label_set_text(GTK_LABEL(label), "error opening file");
}
+ return NULL;
+ }
- /* Find the size of the file. */
- filesize = wtap_file_size(wth, &err);
- if (filesize == -1) {
- gtk_label_set_text(GTK_LABEL(label), "error getting file size");
- wtap_close(wth);
- return NULL;
- }
- g_snprintf(string_buff, PREVIEW_STR_MAX, "%" G_GINT64_MODIFIER "d bytes", filesize);
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_SIZE_KEY);
- gtk_label_set_text(GTK_LABEL(label), string_buff);
+ /* Find the size of the file. */
+ filesize = wtap_file_size(wth, &err);
+ if (filesize == -1) {
+ gtk_label_set_text(GTK_LABEL(label), "error getting file size");
+ wtap_close(wth);
+ return NULL;
+ }
+ g_snprintf(string_buff, PREVIEW_STR_MAX, "%" G_GINT64_MODIFIER "d bytes", filesize);
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_SIZE_KEY);
+ gtk_label_set_text(GTK_LABEL(label), string_buff);
- /* type */
- g_strlcpy(string_buff, wtap_file_type_string(wtap_file_type(wth)), PREVIEW_STR_MAX);
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
- gtk_label_set_text(GTK_LABEL(label), string_buff);
+ /* type */
+ g_strlcpy(string_buff, wtap_file_type_subtype_string(wtap_file_type_subtype(wth)), PREVIEW_STR_MAX);
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
+ gtk_label_set_text(GTK_LABEL(label), string_buff);
- return wth;
+ return wth;
}
static void
preview_do(GtkWidget *prev, wtap *wth)
{
- GtkWidget *label;
- unsigned int elapsed_time;
- time_t time_preview;
- time_t time_current;
- int err = 0;
- gchar *err_info;
- gint64 data_offset;
- const struct wtap_pkthdr *phdr;
- double start_time = 0; /* seconds, with nsec resolution */
- double stop_time = 0; /* seconds, with nsec resolution */
- double cur_time;
- unsigned int packets = 0;
- gboolean is_breaked = FALSE;
- gchar string_buff[PREVIEW_STR_MAX];
- time_t ti_time;
- struct tm *ti_tm;
-
-
- time(&time_preview);
- while ( (wtap_read(wth, &err, &err_info, &data_offset)) ) {
- phdr = wtap_phdr(wth);
- cur_time = wtap_nstime_to_sec(&phdr->ts);
- if(packets == 0) {
- start_time = cur_time;
- stop_time = cur_time;
- }
- if (cur_time < start_time) {
- start_time = cur_time;
- }
- if (cur_time > stop_time){
- stop_time = cur_time;
- }
-
- packets++;
- if(packets%1000 == 0) {
- /* do we have a timeout? */
- time(&time_current);
- if(time_current-time_preview >= (time_t) prefs.gui_fileopen_preview) {
- is_breaked = TRUE;
- break;
- }
- }
+ GtkWidget *label;
+ unsigned int elapsed_time;
+ time_t time_preview;
+ time_t time_current;
+ int err = 0;
+ gchar *err_info;
+ gint64 data_offset;
+ double start_time = 0; /* seconds, with nsec resolution */
+ double stop_time = 0; /* seconds, with nsec resolution */
+ double cur_time;
+ unsigned int packets = 0;
+ gboolean is_breaked = FALSE;
+ gchar string_buff[PREVIEW_STR_MAX];
+ time_t ti_time;
+ struct tm *ti_tm;
+ const struct wtap_pkthdr *phdr;
+
+
+ time(&time_preview);
+ while ( (wtap_read(wth, &err, &err_info, &data_offset)) ) {
+ phdr = wtap_phdr(wth);
+ cur_time = nstime_to_sec(&phdr->ts);
+ if (packets == 0) {
+ start_time = cur_time;
+ stop_time = cur_time;
}
-
- if(err != 0) {
- g_snprintf(string_buff, PREVIEW_STR_MAX, "error after reading %u packets", packets);
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_PACKETS_KEY);
- gtk_label_set_text(GTK_LABEL(label), string_buff);
- wtap_close(wth);
- return;
+ if (cur_time < start_time) {
+ start_time = cur_time;
+ }
+ if (cur_time > stop_time) {
+ stop_time = cur_time;
}
- /* packet count */
- if(is_breaked) {
- g_snprintf(string_buff, PREVIEW_STR_MAX, "more than %u packets (preview timeout)", packets);
- } else {
- g_snprintf(string_buff, PREVIEW_STR_MAX, "%u", packets);
+ packets++;
+ if (packets%1000 == 0) {
+ /* do we have a timeout? */
+ time(&time_current);
+ if (time_current-time_preview >= (time_t) prefs.gui_fileopen_preview) {
+ is_breaked = TRUE;
+ break;
+ }
}
- label = g_object_get_data(G_OBJECT(prev), PREVIEW_PACKETS_KEY);
- gtk_label_set_text(GTK_LABEL(label), string_buff);
+ }
- /* first packet */
- ti_time = (long)start_time;
- ti_tm = localtime( &ti_time );
- if(ti_tm) {
- g_snprintf(string_buff, PREVIEW_STR_MAX,
- "%04d-%02d-%02d %02d:%02d:%02d",
- ti_tm->tm_year + 1900,
- ti_tm->tm_mon + 1,
- ti_tm->tm_mday,
- ti_tm->tm_hour,
- ti_tm->tm_min,
- ti_tm->tm_sec);
- } else {
- g_snprintf(string_buff, PREVIEW_STR_MAX, "?");
- }
- label = g_object_get_data(G_OBJECT(prev), PREVIEW_FIRST_KEY);
+ if (err != 0) {
+ g_snprintf(string_buff, PREVIEW_STR_MAX, "error after reading %u packets", packets);
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_PACKETS_KEY);
gtk_label_set_text(GTK_LABEL(label), string_buff);
+ wtap_close(wth);
+ return;
+ }
- /* elapsed time */
- elapsed_time = (unsigned int)(stop_time-start_time);
- if(elapsed_time/86400) {
- g_snprintf(string_buff, PREVIEW_STR_MAX, "%02u days %02u:%02u:%02u",
- elapsed_time/86400, elapsed_time%86400/3600, elapsed_time%3600/60, elapsed_time%60);
- } else {
- g_snprintf(string_buff, PREVIEW_STR_MAX, "%02u:%02u:%02u",
- elapsed_time%86400/3600, elapsed_time%3600/60, elapsed_time%60);
- }
- if(is_breaked) {
- g_snprintf(string_buff, PREVIEW_STR_MAX, "unknown");
- }
- label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_ELAPSED_KEY);
- gtk_label_set_text(GTK_LABEL(label), string_buff);
+ /* packet count */
+ if (is_breaked) {
+ g_snprintf(string_buff, PREVIEW_STR_MAX, "more than %u packets (preview timeout)", packets);
+ } else {
+ g_snprintf(string_buff, PREVIEW_STR_MAX, "%u", packets);
+ }
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_PACKETS_KEY);
+ gtk_label_set_text(GTK_LABEL(label), string_buff);
+
+ /* first packet */
+ ti_time = (long)start_time;
+ ti_tm = localtime( &ti_time );
+ if (ti_tm) {
+ g_snprintf(string_buff, PREVIEW_STR_MAX,
+ "%04d-%02d-%02d %02d:%02d:%02d",
+ ti_tm->tm_year + 1900,
+ ti_tm->tm_mon + 1,
+ ti_tm->tm_mday,
+ ti_tm->tm_hour,
+ ti_tm->tm_min,
+ ti_tm->tm_sec);
+ } else {
+ g_snprintf(string_buff, PREVIEW_STR_MAX, "?");
+ }
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FIRST_KEY);
+ gtk_label_set_text(GTK_LABEL(label), string_buff);
+
+ /* elapsed time */
+ elapsed_time = (unsigned int)(stop_time-start_time);
+ if (elapsed_time/86400) {
+ g_snprintf(string_buff, PREVIEW_STR_MAX, "%02u days %02u:%02u:%02u",
+ elapsed_time/86400, elapsed_time%86400/3600, elapsed_time%3600/60, elapsed_time%60);
+ } else {
+ g_snprintf(string_buff, PREVIEW_STR_MAX, "%02u:%02u:%02u",
+ elapsed_time%86400/3600, elapsed_time%3600/60, elapsed_time%60);
+ }
+ if (is_breaked) {
+ g_snprintf(string_buff, PREVIEW_STR_MAX, "unknown");
+ }
+ label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_ELAPSED_KEY);
+ gtk_label_set_text(GTK_LABEL(label), string_buff);
- wtap_close(wth);
+ wtap_close(wth);
}
#if 0
static void
update_preview_cb (GtkFileChooser *file_chooser, gpointer data)
{
- GtkWidget *prev = GTK_WIDGET (data);
- char *cf_name;
- gboolean have_preview;
+ GtkWidget *prev = GTK_WIDGET(data);
+ char *cf_name;
+ gboolean have_preview;
- cf_name = gtk_file_chooser_get_preview_filename (file_chooser);
+ cf_name = gtk_file_chooser_get_preview_filename(file_chooser);
- have_preview = preview_set_filename(prev, cf_name);
+ have_preview = preview_set_filename(prev, cf_name);
- g_free (cf_name);
+ g_free(cf_name);
- have_preview = TRUE;
- gtk_file_chooser_set_preview_widget_active (file_chooser, have_preview);
+ have_preview = TRUE;
+ gtk_file_chooser_set_preview_widget_active(file_chooser, have_preview);
}
#endif
static void
file_open_entry_changed(GtkWidget *w _U_, gpointer file_sel)
{
- GtkWidget *prev = (GtkWidget *)g_object_get_data(G_OBJECT(file_sel), PREVIEW_TABLE_KEY);
- gchar *cf_name;
- gboolean have_preview;
- wtap *wth;
+ GtkWidget *prev = (GtkWidget *)g_object_get_data(G_OBJECT(file_sel), PREVIEW_TABLE_KEY);
+ gchar *cf_name;
+ gboolean have_preview;
+ wtap *wth;
- /* get the filename */
- cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_sel));
+ /* get the filename */
+ cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_sel));
- /* set the filename to the preview */
- wth = preview_set_filename(prev, cf_name);
- have_preview = (wth != NULL);
+ /* set the filename to the preview */
+ wth = preview_set_filename(prev, cf_name);
+ have_preview = (wth != NULL);
- g_free(cf_name);
+ g_free(cf_name);
- /* make the preview widget sensitive */
- gtk_widget_set_sensitive(prev, have_preview);
-
- /*
- * XXX - if the Open button isn't sensitive, you can't type into
- * the location bar and select the file or directory you've typed.
- * See
- *
- * https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1791
- *
- * It's not as if allowing users to click Open when they've
- * selected a file that's not a valid capture file will cause
- * anything worse than an error dialog, so we'll leave the Open
- * button sensitive for now. Perhaps making it sensitive if
- * cf_name is NULL would also work, although I don't know whether
- * there are any cases where it would be non-null when you've
- * typed in the location bar.
- *
- * XXX - Bug 1791 also notes that, with the line removed, Bill
- * Meier "somehow managed to get the file chooser window somewhat
- * wedged in that neither the cancel or open buttons were responsive".
- * That seems a bit odd, given that, without this line, we're not
- * monkeying with the Open button's sensitivity, but...
- */
+ /* make the preview widget sensitive */
+ gtk_widget_set_sensitive(prev, have_preview);
+
+ /*
+ * XXX - if the Open button isn't sensitive, you can't type into
+ * the location bar and select the file or directory you've typed.
+ * See
+ *
+ * https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1791
+ *
+ * It's not as if allowing users to click Open when they've
+ * selected a file that's not a valid capture file will cause
+ * anything worse than an error dialog, so we'll leave the Open
+ * button sensitive for now. Perhaps making it sensitive if
+ * cf_name is NULL would also work, although I don't know whether
+ * there are any cases where it would be non-null when you've
+ * typed in the location bar.
+ *
+ * XXX - Bug 1791 also notes that, with the line removed, Bill
+ * Meier "somehow managed to get the file chooser window somewhat
+ * wedged in that neither the cancel or open buttons were responsive".
+ * That seems a bit odd, given that, without this line, we're not
+ * monkeying with the Open button's sensitivity, but...
+ */
#if 0
- /* make the open/save/... dialog button sensitive */
+ /* make the open/save/... dialog button sensitive */
- gtk_dialog_set_response_sensitive(file_sel, GTK_RESPONSE_ACCEPT, have_preview);
+ gtk_dialog_set_response_sensitive(file_sel, GTK_RESPONSE_ACCEPT, have_preview);
#endif
- /* do the actual preview */
- if(have_preview)
- preview_do(prev, wth);
+ /* do the actual preview */
+ if (have_preview)
+ preview_do(prev, wth);
}
/* copied from summary_dlg.c */
static GtkWidget *
-add_string_to_table_sensitive(GtkWidget *list, guint *row, const gchar *title, const gchar *value, gboolean sensitive)
+add_string_to_grid_sensitive(GtkWidget *grid, guint *row, const gchar *title, const gchar *value, gboolean sensitive)
{
- GtkWidget *label;
- gchar *indent;
+ GtkWidget *label;
+ gchar *indent;
- if(strlen(value) != 0) {
- indent = g_strdup_printf(" %s", title);
- } else {
- indent = g_strdup(title);
- }
- label = gtk_label_new(indent);
- g_free(indent);
- gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
- gtk_widget_set_sensitive(label, sensitive);
- gtk_table_attach_defaults(GTK_TABLE(list), label, 0, 1, *row, *row+1);
+ if (strlen(value) != 0) {
+ indent = g_strdup_printf(" %s", title);
+ } else {
+ indent = g_strdup(title);
+ }
+ label = gtk_label_new(indent);
+ g_free(indent);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
+ gtk_widget_set_sensitive(label, sensitive);
+ ws_gtk_grid_attach_defaults(GTK_GRID(grid), label, 0, *row, 1, 1);
- label = gtk_label_new(value);
- gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
- gtk_widget_set_sensitive(label, sensitive);
- gtk_table_attach_defaults(GTK_TABLE(list), label, 1, 2, *row, *row+1);
+ label = gtk_label_new(value);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
+ gtk_widget_set_sensitive(label, sensitive);
+ ws_gtk_grid_attach_defaults(GTK_GRID(grid), label, 1, *row, 1, 1);
- *row = *row + 1;
+ *row = *row + 1;
- return label;
+ return label;
}
static GtkWidget *
-add_string_to_table(GtkWidget *list, guint *row, const gchar *title, const gchar *value)
+add_string_to_grid(GtkWidget *grid, guint *row, const gchar *title, const gchar *value)
{
- return add_string_to_table_sensitive(list, row, title, value, TRUE);
+ return add_string_to_grid_sensitive(grid, row, title, value, TRUE);
}
static GtkWidget *
preview_new(void)
{
- GtkWidget *table, *label;
- guint row;
-
- table = gtk_table_new(1, 2, FALSE);
- gtk_table_set_col_spacings(GTK_TABLE(table), 6);
- gtk_table_set_row_spacings(GTK_TABLE(table), 3);
- row = 0;
-
- label = add_string_to_table(table, &row, "Filename:", "-");
- gtk_widget_set_size_request(label, DEF_WIDTH/3, -1);
- g_object_set_data(G_OBJECT(table), PREVIEW_FILENAME_KEY, label);
- label = add_string_to_table(table, &row, "Format:", "-");
- g_object_set_data(G_OBJECT(table), PREVIEW_FORMAT_KEY, label);
- label = add_string_to_table(table, &row, "Size:", "-");
- g_object_set_data(G_OBJECT(table), PREVIEW_SIZE_KEY, label);
- label = add_string_to_table(table, &row, "Packets:", "-");
- g_object_set_data(G_OBJECT(table), PREVIEW_PACKETS_KEY, label);
- label = add_string_to_table(table, &row, "First Packet:", "-");
- g_object_set_data(G_OBJECT(table), PREVIEW_FIRST_KEY, label);
- label = add_string_to_table(table, &row, "Elapsed time:", "-");
- g_object_set_data(G_OBJECT(table), PREVIEW_ELAPSED_KEY, label);
-
- return table;
+ GtkWidget *grid, *label;
+ guint row;
+
+ grid = ws_gtk_grid_new();
+ ws_gtk_grid_set_column_spacing(GTK_GRID(grid), 6);
+ ws_gtk_grid_set_row_spacing(GTK_GRID(grid), 3);
+ row = 0;
+
+ label = add_string_to_grid(grid, &row, "Format:", "-");
+ g_object_set_data(G_OBJECT(grid), PREVIEW_FORMAT_KEY, label);
+ label = add_string_to_grid(grid, &row, "Size:", "-");
+ g_object_set_data(G_OBJECT(grid), PREVIEW_SIZE_KEY, label);
+ label = add_string_to_grid(grid, &row, "Packets:", "-");
+ g_object_set_data(G_OBJECT(grid), PREVIEW_PACKETS_KEY, label);
+ label = add_string_to_grid(grid, &row, "First Packet:", "-");
+ g_object_set_data(G_OBJECT(grid), PREVIEW_FIRST_KEY, label);
+ label = add_string_to_grid(grid, &row, "Elapsed time:", "-");
+ g_object_set_data(G_OBJECT(grid), PREVIEW_ELAPSED_KEY, label);
+
+ return grid;
}
+#ifndef USE_WIN32_FILE_DIALOGS
+
/*
- * Keep a static pointer to the current "Open Capture File" window, if
- * any, so that if somebody tries to do "File:Open" while there's already
- * an "Open Capture File" window up, we just pop up the existing one,
- * rather than creating a new one.
- */
-static GtkWidget *file_open_w;
+ ------------------------------------------------
+ |top_level win |
+ | ------------------------------------------- |
+ | |file_chooser_dialog [vbox] | |
+ | | -------------------------------------- | |
+ | | |[file_browser] T/T | | |
+ | | | | | |
+ | | | | | |
+ | | | | | |
+ | | -------------------------------------- | |
+ | | | |
+ | | -------------------------------------- | |
+ | | |[alignment] F/F | | |
+ | | | -------------------------------- | | |
+ | | | |main_hb [extra_widget] | | | |
+ | | | | ------------- ---------- | | | |
+ | | | | |main_vb F/F| |grid F/F| | | | |
+ | | | | | item | | row | | | | |
+ | | | | | item | | row | | | | |
+ | | | | | item | | row | | | | |
+ | | | | | item | | row | | | | |
+ | | | | | item | | row | | | | |
+ | | | | ------------- ---------- | | | |
+ | | | -------------------------------- | | |
+ | | -------------------------------------- | |
+ | | | |
+ | | -------------------------------------- | |
+ | | |btn_row F/F | | |
+ | | -------------------------------------- | |
+ | ------------------------------------------- |
+ ------------------------------------------------
+
+ Notes:
+ 1. T/T & F/F above refer to the
+ gtk_box_pack_start() 'expand'/'fill' args
+ used to pack the widget into the enclosing GtkBox.
+ 2. The 'Alignment' widget is actually internal to
+ the GtkFileChooser widget.
+
+ Gtk3: Expand/Fill effect
+
+ Vertical
+ (file_chooser): expand/fills.
+ main_hb does not expand/fill [explicitly set via vexpand = FALSE].
+ btn_row does not expand/fill.
+ So: vertical resize (drog lower edge down).
+ expands (file_chooser) but leaves others as is.
+ Also: grid rows are "vexpand' so grid
+ vertically epands/fills in main_hb.
+ That is: it will be the same height as
+ the main_vb.
+ Since vexpand is "inherited upwards", main_hb vexpand set to FALSE
+ to prevent vertical expansion of same.
+
+ Horizontal
+ (file_chooser) & btn_row: expand/fill.
+ main_vb & grid do not expand.
+ So: horizontal resize (drag right edge to the right)
+ expands all but the "extra widget".
+*/
/* Open a file */
-static void
-file_open_cmd(GtkWidget *w)
+static gboolean
+gtk_open_file(GtkWidget *w, GString *file_name, gint *type, GString *display_filter)
{
-#if _WIN32
- win32_open_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)));
-#else /* _WIN32 */
- GtkWidget *main_hb, *main_vb, *filter_hbox, *filter_bt, *filter_te,
- *m_resolv_cb, *n_resolv_cb, *t_resolv_cb, *prev;
+ GtkWidget *file_open_w;
+ GtkWidget *main_hb, *main_vb, *filter_hbox, *filter_bt, *filter_te;
+ GtkWidget *m_resolv_cb, *n_resolv_cb, *t_resolv_cb, *e_resolv_cb, *prev;
+ GtkWidget *format_type_co;
+ GtkCellRenderer *cell;
+ gint i;
+
/* No Apply button, and "OK" just sets our text widget, it doesn't
activate it (i.e., it doesn't cause us to try to open the file). */
static construct_args_t args = {
- "Wireshark: Read Filter",
- FALSE,
- FALSE,
+ "Wireshark: Display Filter",
+ FALSE,
+ FALSE,
TRUE
};
+ gchar *cf_name;
- if (file_open_w != NULL) {
- /* There's already an "Open Capture File" dialog box; reactivate it. */
- reactivate_window(file_open_w);
- return;
- }
+ if (!file_name || !display_filter)
+ return FALSE;
file_open_w = file_selection_new("Wireshark: Open Capture File",
+ GTK_WINDOW(top_level),
FILE_SELECTION_OPEN);
/* it's annoying, that the file chooser dialog is already shown here,
so we cannot use the correct gtk_window_set_default_size() to resize it */
gtk_widget_set_size_request(file_open_w, DEF_WIDTH, DEF_HEIGHT);
- switch (prefs.gui_fileopen_style) {
-
- case FO_STYLE_LAST_OPENED:
- /* The user has specified that we should start out in the last directory
- we looked in. If we've already opened a file, use its containing
- directory, if we could determine it, as the directory, otherwise
- use the "last opened" directory saved in the preferences file if
- there was one. */
- /* This is now the default behaviour in file_selection_new() */
- break;
-
- case FO_STYLE_SPECIFIED:
- /* The user has specified that we should always start out in a
- specified directory; if they've specified that directory,
- start out by showing the files in that dir. */
- if (prefs.gui_fileopen_dir[0] != '\0')
- file_selection_set_current_folder(file_open_w, prefs.gui_fileopen_dir);
- break;
- }
+ if (file_name->len > 0) {
+ gchar *dirname = g_path_get_dirname(file_name->str);
+
+ file_selection_set_current_folder(file_open_w, dirname);
+ g_free(dirname);
+ } else {
+ switch (prefs.gui_fileopen_style) {
+
+ case FO_STYLE_LAST_OPENED:
+ /* The user has specified that we should start out in the last directory
+ we looked in. If we've already opened a file, use its containing
+ directory, if we could determine it, as the directory, otherwise
+ use the "last opened" directory saved in the preferences file if
+ there was one. */
+ /* This is now the default behaviour in file_selection_new() */
+ break;
+ case FO_STYLE_SPECIFIED:
+ /* The user has specified that we should always start out in a
+ specified directory; if they've specified that directory,
+ start out by showing the files in that dir. */
+ if (prefs.gui_fileopen_dir[0] != '\0')
+ file_selection_set_current_folder(file_open_w, prefs.gui_fileopen_dir);
+ break;
+ }
+ }
- main_hb = gtk_hbox_new(FALSE, 3);
+ main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_set_vexpand(main_hb, FALSE); /* prevents "inheritance" from child VEXPAND */
+ /* so hbox doesn't expand vertically even */
+ /* tho grid rows have VEXPAND. */
+#endif
file_selection_set_extra_widget(file_open_w, main_hb);
gtk_widget_show(main_hb);
/* Container for each row of widgets */
- main_vb = gtk_vbox_new(FALSE, 3);
+ main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
gtk_box_pack_start(GTK_BOX(main_hb), main_vb, FALSE, FALSE, 0);
gtk_widget_show(main_vb);
- /* filter row */
- filter_hbox = gtk_hbox_new(FALSE, 1);
+ format_type_co = gtk_combo_box_text_new();
+ cell = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(format_type_co), cell, TRUE);
+
+ gtk_widget_set_tooltip_text(format_type_co, "Format type of capture file");
+ gtk_box_pack_start(GTK_BOX(main_vb), format_type_co, FALSE, FALSE, 0);
+
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(format_type_co), (const gchar *) "Automatic");
+ for (i = 0; open_routines[i].name != NULL; i += 1) {
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(format_type_co), open_routines[i].name);
+ }
+
+ gtk_combo_box_set_active(GTK_COMBO_BOX(format_type_co), 0);
+ gtk_widget_show(format_type_co);
+
+ /* Filter row */
+ filter_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(filter_hbox), 0);
gtk_box_pack_start(GTK_BOX(main_vb), filter_hbox, FALSE, FALSE, 0);
gtk_widget_show(filter_hbox);
- filter_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
+ filter_bt = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
g_signal_connect(filter_bt, "clicked",
G_CALLBACK(display_filter_construct_cb), &args);
g_signal_connect(filter_bt, "destroy",
G_CALLBACK(filter_button_destroy_cb), NULL);
- gtk_box_pack_start(GTK_BOX(filter_hbox), filter_bt, FALSE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(filter_hbox), filter_bt, FALSE, FALSE, 0);
gtk_widget_show(filter_bt);
- gtk_widget_set_tooltip_text(filter_bt, "Open the \"Display Filter\" dialog, to edit/apply filters");
+ gtk_widget_set_tooltip_text(filter_bt, "Open the \"Display Filter\" dialog to edit/apply filters");
filter_te = gtk_entry_new();
g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
g_signal_connect(filter_te, "changed",
G_CALLBACK(filter_te_syntax_check_cb), NULL);
g_object_set_data(G_OBJECT(filter_hbox), E_FILT_AUTOCOMP_PTR_KEY, NULL);
- g_signal_connect(filter_te, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
- g_signal_connect(file_open_w, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
+ g_signal_connect(filter_te, "key-press-event", G_CALLBACK(filter_string_te_key_pressed_cb), NULL);
+ g_signal_connect(file_open_w, "key-press-event", G_CALLBACK(filter_parent_dlg_key_pressed_cb), NULL);
colorize_filter_te_as_empty(filter_te);
+ gtk_entry_set_text(GTK_ENTRY(filter_te), display_filter->str);
gtk_widget_show(filter_te);
gtk_widget_set_tooltip_text(filter_te, "Enter a display filter.");
g_object_set_data(G_OBJECT(file_open_w), E_RFILTER_TE_KEY, filter_te);
- /* resolve buttons */
+ /* Resolve buttons */
m_resolv_cb = gtk_check_button_new_with_mnemonic("Enable _MAC name resolution");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_resolv_cb),
- gbl_resolv_flags & RESOLV_MAC);
+ gbl_resolv_flags.mac_name);
gtk_box_pack_start(GTK_BOX(main_vb), m_resolv_cb, FALSE, FALSE, 0);
- g_object_set_data(G_OBJECT(file_open_w),
- E_FILE_M_RESOLVE_KEY, m_resolv_cb);
gtk_widget_show(m_resolv_cb);
- n_resolv_cb = gtk_check_button_new_with_mnemonic("Enable _network name resolution");
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(n_resolv_cb),
- gbl_resolv_flags & RESOLV_NETWORK);
- gtk_box_pack_start(GTK_BOX(main_vb), n_resolv_cb, FALSE, FALSE, 0);
- gtk_widget_show(n_resolv_cb);
- g_object_set_data(G_OBJECT(file_open_w), E_FILE_N_RESOLVE_KEY, n_resolv_cb);
t_resolv_cb = gtk_check_button_new_with_mnemonic("Enable _transport name resolution");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(t_resolv_cb),
- gbl_resolv_flags & RESOLV_TRANSPORT);
+ gbl_resolv_flags.transport_name);
gtk_box_pack_start(GTK_BOX(main_vb), t_resolv_cb, FALSE, FALSE, 0);
gtk_widget_show(t_resolv_cb);
- g_object_set_data(G_OBJECT(file_open_w), E_FILE_T_RESOLVE_KEY, t_resolv_cb);
- g_signal_connect(file_open_w, "destroy",
- G_CALLBACK(file_open_destroy_cb), NULL);
+ n_resolv_cb = gtk_check_button_new_with_mnemonic("Enable _network name resolution");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(n_resolv_cb),
+ gbl_resolv_flags.network_name);
+ gtk_box_pack_start(GTK_BOX(main_vb), n_resolv_cb, FALSE, FALSE, 0);
+ gtk_widget_show(n_resolv_cb);
+
+ e_resolv_cb = gtk_check_button_new_with_mnemonic("Use _external network name resolver");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(e_resolv_cb),
+ gbl_resolv_flags.use_external_net_name_resolver);
+ gtk_box_pack_start(GTK_BOX(main_vb), e_resolv_cb, FALSE, FALSE, 0);
+ gtk_widget_show(e_resolv_cb);
- /* preview widget */
+ /* Preview widget */
prev = preview_new();
g_object_set_data(G_OBJECT(file_open_w), PREVIEW_TABLE_KEY, prev);
gtk_widget_show_all(prev);
- gtk_box_pack_start(GTK_BOX(main_hb), prev, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(main_hb), prev, FALSE, FALSE, 0);
g_signal_connect(GTK_FILE_CHOOSER(file_open_w), "selection-changed",
G_CALLBACK(file_open_entry_changed), file_open_w);
g_object_set_data(G_OBJECT(file_open_w), E_DFILTER_TE_KEY,
g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY));
- if (gtk_dialog_run(GTK_DIALOG(file_open_w)) == GTK_RESPONSE_ACCEPT)
- {
- file_open_ok_cb(file_open_w, file_open_w);
- }
- else window_destroy(file_open_w);
-#endif /* _WIN32 */
-}
-
-static void file_open_answered_cb(gpointer dialog _U_, gint btn, gpointer data)
-{
- switch(btn) {
- case(ESD_BTN_SAVE):
- /* save file first */
- file_save_as_cmd(after_save_open_dialog, data);
- break;
- case(ESD_BTN_DONT_SAVE):
- cf_close(&cfile);
- file_open_cmd(data);
- break;
- case(ESD_BTN_CANCEL):
- break;
- default:
- g_assert_not_reached();
- }
-}
-
-void
-file_open_cmd_cb(GtkWidget *widget, gpointer data _U_) {
- gpointer dialog;
-
- if((cfile.state != FILE_CLOSED) && (cfile.is_tempfile || cfile.unsaved_changes) &&
- prefs.gui_ask_unsaved) {
- /* This is a temporary capture file or has unsaved changes; ask the
- user whether to save the capture. */
- dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE_CANCEL,
- "%sSave capture file before opening a new one?%s\n\n"
- "If you open a new capture file without saving, your capture data will be discarded.",
- simple_dialog_primary_start(), simple_dialog_primary_end());
- simple_dialog_set_cb(dialog, file_open_answered_cb, widget);
- } else {
- /* unchanged file, just open a new one */
- file_open_cmd(widget);
- }
-}
-
-/* user pressed "open" button */
-static void
-file_open_ok_cb(GtkWidget *w, gpointer fs) {
- gchar *cf_name, *s;
- const gchar *rfilter;
- GtkWidget *filter_te, *m_resolv_cb, *n_resolv_cb, *t_resolv_cb;
- dfilter_t *rfcode = NULL;
- int err;
-
- cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
- filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_RFILTER_TE_KEY);
- rfilter = gtk_entry_get_text(GTK_ENTRY(filter_te));
- if (!dfilter_compile(rfilter, &rfcode)) {
- bad_dfilter_alert_box(rfilter);
- g_free(cf_name);
- return;
- }
-
- /* Perhaps the user specified a directory instead of a file.
- Check whether they did. */
- if (test_for_directory(cf_name) == EISDIR) {
- /* It's a directory - set the file selection box to display that
- directory, don't try to open the directory as a capture file. */
- set_last_open_dir(cf_name);
- g_free(cf_name);
- file_selection_set_current_folder(fs, get_last_open_dir());
- return;
- }
-
- /* Try to open the capture file. */
- if (cf_open(&cfile, cf_name, FALSE, &err) != CF_OK) {
- /* We couldn't open it; don't dismiss the open dialog box,
- just leave it around so that the user can, after they
- dismiss the alert box popped up for the open error,
- try again. */
- if (rfcode != NULL)
- dfilter_free(rfcode);
- g_free(cf_name);
- /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
- * as this will prevent the user from closing the now existing error
- * message, simply close the dialog (this is the best we can do here). */
- if (file_open_w)
- window_destroy(file_open_w);
+ cf_name = file_selection_run(file_open_w);
- return;
+ if (cf_name == NULL) {
+ /* User cancelled or closed the dialog. */
+ return FALSE;
}
- /* Attach the new read filter to "cf" ("cf_open()" succeeded, so
- it closed the previous capture file, and thus destroyed any
- previous read filter attached to "cf"). */
- cfile.rfcode = rfcode;
+ g_string_printf(file_name, "%s", cf_name);
+ g_free(cf_name);
+ g_string_printf(display_filter, "%s", gtk_entry_get_text(GTK_ENTRY(filter_te)));
/* Set the global resolving variable */
- gbl_resolv_flags = prefs.name_resolve;
- m_resolv_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_FILE_M_RESOLVE_KEY);
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (m_resolv_cb)))
- gbl_resolv_flags |= RESOLV_MAC;
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_resolv_cb)))
+ gbl_resolv_flags.mac_name = TRUE;
+ else
+ gbl_resolv_flags.mac_name = FALSE;
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(n_resolv_cb)))
+ gbl_resolv_flags.network_name = TRUE;
else
- gbl_resolv_flags &= ~RESOLV_MAC;
- n_resolv_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_FILE_N_RESOLVE_KEY);
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (n_resolv_cb)))
- gbl_resolv_flags |= RESOLV_NETWORK;
+ gbl_resolv_flags.network_name = FALSE;
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(t_resolv_cb)))
+ gbl_resolv_flags.transport_name = TRUE;
else
- gbl_resolv_flags &= ~RESOLV_NETWORK;
- t_resolv_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_FILE_T_RESOLVE_KEY);
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (t_resolv_cb)))
- gbl_resolv_flags |= RESOLV_TRANSPORT;
+ gbl_resolv_flags.transport_name = FALSE;
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(e_resolv_cb)))
+ gbl_resolv_flags.use_external_net_name_resolver = TRUE;
else
- gbl_resolv_flags &= ~RESOLV_TRANSPORT;
+ gbl_resolv_flags.use_external_net_name_resolver = FALSE;
- /* We've crossed the Rubicon; get rid of the file selection box. */
- window_destroy(GTK_WIDGET (fs));
-
- switch (cf_read(&cfile, FALSE)) {
-
- case CF_READ_OK:
- case CF_READ_ERROR:
- /* Just because we got an error, that doesn't mean we were unable
- to read any of the file; we handle what we could get from the
- file. */
- break;
-
- case CF_READ_ABORTED:
- /* The user bailed out of re-reading the capture file; the
- capture file has been closed - just free the capture file name
- string and return (without changing the last containing
- directory). */
- g_free(cf_name);
- return;
- }
+ *type = gtk_combo_box_get_active((GtkComboBox *) format_type_co);
- /* Save the name of the containing directory specified in the path name,
- if any; we can write over cf_name, which is a good thing, given that
- "get_dirname()" does write over its argument. */
- s = get_dirname(cf_name);
- set_last_open_dir(s);
+ /* We've crossed the Rubicon; get rid of the file selection box. */
+ window_destroy(GTK_WIDGET(file_open_w));
- g_free(cf_name);
+ return TRUE;
}
+#endif /* USE_WIN32_FILE_DIALOGS */
-static void
-file_open_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
-{
- /* Note that we no longer have a "Open Capture File" dialog box. */
- file_open_w = NULL;
-}
+/* Open a file */
/*
- * Keep a static pointer to the current "Merge Capture File" window, if
- * any, so that if somebody tries to do "File:Merge" while there's already
- * an "Merge Capture File" window up, we just pop up the existing one,
- * rather than creating a new one.
+ * <platform/>_open_file routines should upon entry...
+ * Set the path and fill in the filename if the path+filename is provided.
+ * Set the display filter if provided. Filter syntax should be checked.
+ * Set the name resolution check boxes to match the global settings.
+ * ...and upon exit...
+ * Return TRUE on "OK" and "FALSE" on "Cancel".
+ * Set the global name resolution preferences on "OK".
+ * Close the window.
*/
-static GtkWidget *file_merge_w;
-/* Merge existing with another file */
static void
-file_merge_cmd(GtkWidget *w)
+file_open_cmd(capture_file *cf, GtkWidget *w _U_)
+{
+ GString *file_name = g_string_new("");
+ GString *display_filter = g_string_new("");
+ dfilter_t *rfcode = NULL;
+ int err;
+ int type = WTAP_TYPE_AUTO;
+
+ /*
+ * Loop until the user either selects a file or gives up.
+ */
+ for (;;) {
+#ifdef USE_WIN32_FILE_DIALOGS
+ if (win32_open_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), file_name, &type, display_filter)) {
+#else /* USE_WIN32_FILE_DIALOGS */
+ if (gtk_open_file(top_level, file_name, &type, display_filter)) {
+#endif /* USE_WIN32_FILE_DIALOGS */
+
+ /* Only close the old file now that we know we want to open another one. */
+ cf_close(cf);
+ /* apply our filter */
+ if (dfilter_compile(display_filter->str, &rfcode)) {
+ cf_set_rfcode(&cfile, rfcode);
+ } else {
+ /* Not valid. Tell the user, and go back and run the file
+ selection box again once they dismiss the alert. */
+ bad_dfilter_alert_box(top_level, display_filter->str);
+ continue;
+ }
+
+ /* Try to open the capture file. This closes the current file if it succeeds. */
+ if (cf_open(&cfile, file_name->str, type, FALSE, &err) != CF_OK) {
+ /* We couldn't open it; don't dismiss the open dialog box,
+ just leave it around so that the user can, after they
+ dismiss the alert box popped up for the open error,
+ try again. */
+ if (rfcode != NULL)
+ dfilter_free(rfcode);
+ rfcode = NULL;
+ continue;
+ }
+
+ switch (cf_read(&cfile, FALSE)) {
+
+ case CF_READ_OK:
+ case CF_READ_ERROR:
+ /* Just because we got an error, that doesn't mean we were unable
+ to read any of the file; we handle what we could get from the
+ file. */
+ break;
+
+ case CF_READ_ABORTED:
+ /* The user bailed out of re-reading the capture file; the
+ capture file has been closed - just free the capture file name
+ string and return (without changing the last containing
+ directory). */
+ g_string_free(file_name, TRUE);
+ g_string_free(display_filter, TRUE);
+ return;
+ }
+ /* Save the name of the containing directory specified in the path name,
+ if any; we can write over cf_name, which is a good thing, given that
+ "get_dirname()" does write over its argument. */
+ set_last_open_dir(get_dirname(file_name->str));
+ }
+ g_string_free(file_name, TRUE);
+ g_string_free(display_filter, TRUE);
+ return;
+ }
+}
+
+void
+file_open_cmd_cb(GtkWidget *widget, gpointer data _U_) {
+ /* If there's unsaved data, let the user save it first.
+ If they cancel out of it, don't quit. */
+ if (test_file_close(&cfile, FALSE, " before opening a new capture file"))
+ file_open_cmd(&cfile, widget);
+}
+
+#ifndef USE_WIN32_FILE_DIALOGS
+static gboolean
+gtk_merge_file(GtkWidget *w, GString *file_name, GString *display_filter, int *merge_type)
{
-#if _WIN32
- win32_merge_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)));
- new_packet_list_freeze();
- new_packet_list_thaw();
-#else /* _WIN32 */
- GtkWidget *main_hb, *main_vb, *ft_hb, *ft_lb, *ft_combo_box, *filter_hbox,
- *filter_bt, *filter_te, *prepend_rb, *chrono_rb,
- *append_rb, *prev;
+ GtkWidget *file_merge_w;
+ GtkWidget *main_hb, *main_vb, *filter_hbox, *filter_bt, *filter_te;
+ GtkWidget *prepend_rb, *chrono_rb, *append_rb, *prev;
/* No Apply button, and "OK" just sets our text widget, it doesn't
activate it (i.e., it doesn't cause us to try to open the file). */
static construct_args_t args = {
- "Wireshark: Read Filter",
+ "Wireshark: Display Filter",
FALSE,
FALSE,
TRUE
};
+ gchar *cf_name;
- if (file_merge_w != NULL) {
- /* There's already an "Merge Capture File" dialog box; reactivate it. */
- reactivate_window(file_merge_w);
- return;
- }
+ if (!file_name || !display_filter || !merge_type)
+ return FALSE;
/* Default to saving all packets, in the file's current format. */
file_merge_w = file_selection_new("Wireshark: Merge with Capture File",
- FILE_SELECTION_OPEN);
+ GTK_WINDOW(top_level),
+ FILE_SELECTION_OPEN);
/* it's annoying, that the file chooser dialog is already shown here,
so we cannot use the correct gtk_window_set_default_size() to resize it */
gtk_widget_set_size_request(file_merge_w, DEF_WIDTH, DEF_HEIGHT);
- switch (prefs.gui_fileopen_style) {
-
- case FO_STYLE_LAST_OPENED:
- /* The user has specified that we should start out in the last directory
- we looked in. If we've already opened a file, use its containing
- directory, if we could determine it, as the directory, otherwise
- use the "last opened" directory saved in the preferences file if
- there was one. */
- /* This is now the default behaviour in file_selection_new() */
- break;
-
- case FO_STYLE_SPECIFIED:
- /* The user has specified that we should always start out in a
- specified directory; if they've specified that directory,
- start out by showing the files in that dir. */
- if (prefs.gui_fileopen_dir[0] != '\0')
- file_selection_set_current_folder(file_merge_w, prefs.gui_fileopen_dir);
- break;
+ if (file_name->len > 0) {
+ gchar *dirname = g_path_get_dirname(file_name->str);
+
+ file_selection_set_current_folder(file_merge_w, dirname);
+ g_free(dirname);
+ } else {
+ switch (prefs.gui_fileopen_style) {
+
+ case FO_STYLE_LAST_OPENED:
+ /* The user has specified that we should start out in the last directory
+ we looked in. If we've already opened a file, use its containing
+ directory, if we could determine it, as the directory, otherwise
+ use the "last opened" directory saved in the preferences file if
+ there was one. */
+ /* This is now the default behaviour in file_selection_new() */
+ break;
+
+ case FO_STYLE_SPECIFIED:
+ /* The user has specified that we should always start out in a
+ specified directory; if they've specified that directory,
+ start out by showing the files in that dir. */
+ if (prefs.gui_fileopen_dir[0] != '\0')
+ file_selection_set_current_folder(file_merge_w, prefs.gui_fileopen_dir);
+ break;
+ }
}
- main_hb = gtk_hbox_new(FALSE, 3);
+ main_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_set_vexpand(main_hb, FALSE); /* prevents "inheritance" from child VEXPAND */
+ /* so hbox doesn't expand vertically even */
+ /* tho grid rows have VEXPAND. */
+#endif
file_selection_set_extra_widget(file_merge_w, main_hb);
gtk_widget_show(main_hb);
/* Container for each row of widgets */
- main_vb = gtk_vbox_new(FALSE, 3);
+ main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
gtk_box_pack_start(GTK_BOX(main_hb), main_vb, FALSE, FALSE, 0);
gtk_widget_show(main_vb);
- /* File type row */
- range_tb = NULL;
- ft_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(main_vb), ft_hb);
- gtk_widget_show(ft_hb);
-
- ft_lb = gtk_label_new("Merged output file type:");
- gtk_box_pack_start(GTK_BOX(ft_hb), ft_lb, FALSE, FALSE, 0);
- gtk_widget_show(ft_lb);
-
- ft_combo_box = ws_combo_box_new_text_and_pointer();
-
- /* Generate the list of file types we can save. */
- set_file_type_list(ft_combo_box, cfile.cd_t);
- gtk_box_pack_start(GTK_BOX(ft_hb), ft_combo_box, FALSE, FALSE, 0);
- gtk_widget_show(ft_combo_box);
- g_object_set_data(G_OBJECT(file_merge_w), E_FILE_TYPE_COMBO_BOX_KEY, ft_combo_box);
- ws_combo_box_set_active(GTK_COMBO_BOX(ft_combo_box), 0); /* No callback */
-
- filter_hbox = gtk_hbox_new(FALSE, 1);
+ /* Filter row */
+ filter_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(filter_hbox), 0);
gtk_box_pack_start(GTK_BOX(main_vb), filter_hbox, FALSE, FALSE, 0);
gtk_widget_show(filter_hbox);
- filter_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
+ filter_bt = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
g_signal_connect(filter_bt, "clicked",
G_CALLBACK(display_filter_construct_cb), &args);
g_signal_connect(filter_bt, "destroy",
G_CALLBACK(filter_button_destroy_cb), NULL);
gtk_box_pack_start(GTK_BOX(filter_hbox), filter_bt, FALSE, TRUE, 0);
gtk_widget_show(filter_bt);
- gtk_widget_set_tooltip_text(filter_bt, "Open the \"Display Filter\" dialog, to edit/apply filters");
+ gtk_widget_set_tooltip_text(filter_bt, "Open the \"Display Filter\" dialog to edit/apply filters");
filter_te = gtk_entry_new();
g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
g_signal_connect(filter_te, "changed",
G_CALLBACK(filter_te_syntax_check_cb), NULL);
g_object_set_data(G_OBJECT(filter_hbox), E_FILT_AUTOCOMP_PTR_KEY, NULL);
- g_signal_connect(filter_te, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
- g_signal_connect(file_merge_w, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
+ g_signal_connect(filter_te, "key-press-event", G_CALLBACK(filter_string_te_key_pressed_cb), NULL);
+ g_signal_connect(file_merge_w, "key-press-event", G_CALLBACK(filter_parent_dlg_key_pressed_cb), NULL);
colorize_filter_te_as_empty(filter_te);
+ gtk_entry_set_text(GTK_ENTRY(filter_te), display_filter->str);
gtk_widget_show(filter_te);
gtk_widget_set_tooltip_text(filter_te, "Enter a display filter.");
g_object_set_data(G_OBJECT(file_merge_w), E_RFILTER_TE_KEY, filter_te);
+ /* Merge type */
prepend_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL,
- "Prepend packets to existing file");
- gtk_widget_set_tooltip_text(prepend_rb, "The resulting file contains the packets from the selected, followed by the packets from the currently loaded file, the packet timestamps will be ignored.");
+ "Prepend packets");
+ gtk_widget_set_tooltip_text(prepend_rb, "Insert packets from the selected file before the current file. Packet timestamps will be ignored.");
gtk_box_pack_start(GTK_BOX(main_vb), prepend_rb, FALSE, FALSE, 0);
- g_object_set_data(G_OBJECT(file_merge_w),
- E_MERGE_PREPEND_KEY, prepend_rb);
gtk_widget_show(prepend_rb);
- chrono_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(prepend_rb), "Merge packets chronologically");
- gtk_widget_set_tooltip_text(chrono_rb, "The resulting file contains all the packets from the currently loaded and the selected file, sorted by the packet timestamps.");
+ chrono_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(prepend_rb), "Merge chronologically");
+ gtk_widget_set_tooltip_text(chrono_rb, "Insert packets in chronological order.");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chrono_rb), TRUE);
gtk_box_pack_start(GTK_BOX(main_vb), chrono_rb, FALSE, FALSE, 0);
gtk_widget_show(chrono_rb);
- g_object_set_data(G_OBJECT(file_merge_w), E_MERGE_CHRONO_KEY, chrono_rb);
- append_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(prepend_rb), "Append packets to existing file");
- gtk_widget_set_tooltip_text(append_rb, "The resulting file contains the packets from the currently loaded, followed by the packets from the selected file, the packet timestamps will be ignored.");
+ append_rb = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(prepend_rb), "Append packets");
+ gtk_widget_set_tooltip_text(append_rb, "Insert packets from the selected file after the current file. Packet timestamps will be ignored.");
gtk_box_pack_start(GTK_BOX(main_vb), append_rb, FALSE, FALSE, 0);
gtk_widget_show(append_rb);
- g_object_set_data(G_OBJECT(file_merge_w), E_MERGE_APPEND_KEY, append_rb);
- g_signal_connect(file_merge_w, "destroy",
- G_CALLBACK(file_merge_destroy_cb), NULL);
-
- /* preview widget */
+ /* Preview widget */
prev = preview_new();
g_object_set_data(G_OBJECT(file_merge_w), PREVIEW_TABLE_KEY, prev);
gtk_widget_show_all(prev);
- gtk_box_pack_start(GTK_BOX(main_hb), prev, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(main_hb), prev, FALSE, FALSE, 0);
g_signal_connect(GTK_FILE_CHOOSER(file_merge_w), "selection-changed",
G_CALLBACK(file_open_entry_changed), file_merge_w);
g_object_set_data(G_OBJECT(file_merge_w), E_DFILTER_TE_KEY,
g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY));
- if (gtk_dialog_run(GTK_DIALOG(file_merge_w)) == GTK_RESPONSE_ACCEPT)
- {
- file_merge_ok_cb(file_merge_w, file_merge_w);
+
+ cf_name = file_selection_run(file_merge_w);
+ if (cf_name == NULL) {
+ /* User cancelled or closed the dialog. */
+ return FALSE;
}
- else window_destroy(file_merge_w);
-#endif /* _WIN32 */
-}
-static void file_merge_answered_cb(gpointer dialog _U_, gint btn, gpointer data _U_)
-{
- switch(btn) {
- case(ESD_BTN_OK):
- /* save file first */
- file_save_as_cmd(after_save_merge_dialog, data);
- break;
- case(ESD_BTN_CANCEL):
- break;
- default:
- g_assert_not_reached();
- }
-}
+ g_string_printf(file_name, "%s", cf_name);
+ g_free(cf_name);
+ g_string_printf(display_filter, "%s", gtk_entry_get_text(GTK_ENTRY(filter_te)));
-void
-file_merge_cmd_cb(GtkWidget *widget, gpointer data _U_) {
- gpointer dialog;
-
- if((cfile.state != FILE_CLOSED) && (cfile.is_tempfile || cfile.unsaved_changes) &&
- prefs.gui_ask_unsaved) {
- /* This is a temporary capture file or has unsaved changes; ask the
- user whether to save the capture. */
- dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_OK_CANCEL,
- "%sSave the capture file before merging to another one?%s\n\n"
- "A temporary capture file can't be merged.",
- simple_dialog_primary_start(), simple_dialog_primary_end());
- simple_dialog_set_cb(dialog, file_merge_answered_cb, widget);
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(chrono_rb))) {
+ *merge_type = 0;
+ } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prepend_rb))) {
+ *merge_type = -1;
} else {
- /* unchanged file, just start to merge */
- file_merge_cmd(widget);
+ *merge_type = 1;
}
+
+ /* We've crossed the Rubicon; get rid of the file selection box. */
+ window_destroy(GTK_WIDGET(file_merge_w));
+
+ return TRUE;
}
+#endif /* USE_WIN32_FILE_DIALOGS */
+
+/* Merge existing with another file */
+/*
+ * <platform/>_merge_file routines should upon entry...
+ * Set the path and fill in the filename if the path+filename is provided.
+ * Set the display filter if provided. Filter syntax should be checked.
+ * ...and upon exit...
+ * Return TRUE on "OK" and "FALSE" on "Cancel".
+ * Close the window.
+ */
static void
-file_merge_ok_cb(GtkWidget *w, gpointer fs) {
- gchar *cf_name, *s;
- const gchar *rfilter;
- GtkWidget *ft_combo_box, *filter_te, *rb;
- dfilter_t *rfcode = NULL;
+file_merge_cmd(GtkWidget *w _U_)
+{
+ GString *file_name = g_string_new("");
+ GString *display_filter = g_string_new("");
+ int merge_type;
+ dfilter_t *rfcode = NULL;
int err;
+ int file_type;
cf_status_t merge_status;
char *in_filenames[2];
- char *tmpname;
- gpointer ptr;
- int file_type;
+ char *tmpname = NULL;
+ /*
+ * Loop until the user either selects a file or gives up.
+ */
+ for (;;) {
+ g_string_truncate(file_name, 0);
+ g_string_truncate(display_filter, 0);
+#ifdef USE_WIN32_FILE_DIALOGS
+ if (win32_merge_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), file_name, display_filter, &merge_type)) {
+#else /* USE_WIN32_FILE_DIALOGS */
+ if (gtk_merge_file(top_level, file_name, display_filter, &merge_type)) {
+#endif /* USE_WIN32_FILE_DIALOGS */
+
+ /* Get the specified read filter and try to compile it. */
+ if (!dfilter_compile(display_filter->str, &rfcode)) {
+ /* Not valid. Tell the user, and go back and run the file
+ selection box again once they dismiss the alert. */
+ bad_dfilter_alert_box(top_level, display_filter->str);
+ continue;
+ }
- cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
- filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_RFILTER_TE_KEY);
- rfilter = gtk_entry_get_text(GTK_ENTRY(filter_te));
- if (!dfilter_compile(rfilter, &rfcode)) {
- bad_dfilter_alert_box(rfilter);
- g_free(cf_name);
- return;
- }
+ file_type = cfile.cd_t;
+
+ /* Try to merge or append the two files */
+ tmpname = NULL;
+ if (merge_type == 0) {
+ /* chronological order */
+ in_filenames[0] = cfile.filename;
+ in_filenames[1] = file_name->str;
+ merge_status = cf_merge_files(&tmpname, 2, in_filenames, file_type, FALSE);
+ } else if (merge_type < 0) {
+ /* prepend file */
+ in_filenames[0] = file_name->str;
+ in_filenames[1] = cfile.filename;
+ merge_status = cf_merge_files(&tmpname, 2, in_filenames, file_type, TRUE);
+ } else {
+ /* append file */
+ in_filenames[0] = cfile.filename;
+ in_filenames[1] = file_name->str;
+ merge_status = cf_merge_files(&tmpname, 2, in_filenames, file_type, TRUE);
+ }
- ft_combo_box = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_FILE_TYPE_COMBO_BOX_KEY);
- if (! ws_combo_box_get_active_pointer(GTK_COMBO_BOX(ft_combo_box), &ptr)) {
- g_assert_not_reached(); /* Programming error: somehow nothing is active */
- }
- file_type = GPOINTER_TO_INT(ptr);
+ if (merge_status != CF_OK) {
+ if (rfcode != NULL)
+ dfilter_free(rfcode);
+ g_free(tmpname);
+ continue;
+ }
- /* Perhaps the user specified a directory instead of a file.
- Check whether they did. */
- if (test_for_directory(cf_name) == EISDIR) {
- /* It's a directory - set the file selection box to display that
- directory, don't try to open the directory as a capture file. */
- set_last_open_dir(cf_name);
- g_free(cf_name);
- file_selection_set_current_folder(fs, get_last_open_dir());
- return;
- }
+ cf_close(&cfile);
- /* merge or append the two files */
- rb = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_MERGE_CHRONO_KEY);
- tmpname = NULL;
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (rb))) {
- /* chronological order */
- in_filenames[0] = cfile.filename;
- in_filenames[1] = cf_name;
- merge_status = cf_merge_files(&tmpname, 2, in_filenames, file_type, FALSE);
- } else {
- rb = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_MERGE_PREPEND_KEY);
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (rb))) {
- /* prepend file */
- in_filenames[0] = cf_name;
- in_filenames[1] = cfile.filename;
- merge_status = cf_merge_files(&tmpname, 2, in_filenames, file_type,
- TRUE);
- } else {
- /* append file */
- in_filenames[0] = cfile.filename;
- in_filenames[1] = cf_name;
- merge_status = cf_merge_files(&tmpname, 2, in_filenames, file_type,
- TRUE);
+ /* Try to open the merged capture file. This closes the current file if it succeeds. */
+ if (cf_open(&cfile, tmpname, WTAP_TYPE_AUTO, TRUE /* temporary file */, &err) != CF_OK) {
+ /* We couldn't open it; fail. */
+ if (rfcode != NULL)
+ dfilter_free(rfcode);
+ g_free(tmpname);
+ g_string_free(file_name, TRUE);
+ g_string_free(display_filter, TRUE);
+ return;
}
- }
- g_free(cf_name);
+ /* Attach the new read filter to "cf" ("cf_open()" succeeded, so
+ it closed the previous capture file, and thus destroyed any
+ previous read filter attached to "cf"). */
+ cfile.rfcode = rfcode;
- if (merge_status != CF_OK) {
- if (rfcode != NULL)
- dfilter_free(rfcode);
- g_free(tmpname);
- return;
- }
+ switch (cf_read(&cfile, FALSE)) {
- cf_close(&cfile);
+ case CF_READ_OK:
+ case CF_READ_ERROR:
+ /* Just because we got an error, that doesn't mean we were unable
+ to read any of the file; we handle what we could get from the
+ file. */
+ break;
- /* We've crossed the Rubicon; get rid of the file selection box. */
- window_destroy(GTK_WIDGET (fs));
-
- /* Try to open the merged capture file. */
- if (cf_open(&cfile, tmpname, TRUE /* temporary file */, &err) != CF_OK) {
- /* We couldn't open it; don't dismiss the open dialog box,
- just leave it around so that the user can, after they
- dismiss the alert box popped up for the open error,
- try again. */
- if (rfcode != NULL)
- dfilter_free(rfcode);
- g_free(tmpname);
- /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
- * as this will prevent the user from closing the now existing error
- * message, simply close the dialog (this is the best we can do here). */
- if (file_open_w)
- window_destroy(file_open_w);
- return;
- }
- g_free(tmpname);
-
- /* Attach the new read filter to "cf" ("cf_open()" succeeded, so
- it closed the previous capture file, and thus destroyed any
- previous read filter attached to "cf"). */
- cfile.rfcode = rfcode;
-
- switch (cf_read(&cfile, FALSE)) {
-
- case CF_READ_OK:
- case CF_READ_ERROR:
- /* Just because we got an error, that doesn't mean we were unable
- to read any of the file; we handle what we could get from the
- file. */
- break;
-
- case CF_READ_ABORTED:
- /* The user bailed out of re-reading the capture file; the
- capture file has been closed - just free the capture file name
- string and return (without changing the last containing
- directory). */
+ case CF_READ_ABORTED:
+ /* The user bailed out of re-reading the capture file; the
+ capture file has been closed - just free the capture file name
+ string and return (without changing the last containing
+ directory). */
+ g_free(tmpname);
+ g_string_free(file_name, TRUE);
+ g_string_free(display_filter, TRUE);
+ return;
+ }
+ }
+
+ /* Save the name of the containing directory specified in the path name,
+ if any; we can write over cf_merged_name, which is a good thing, given that
+ "get_dirname()" does write over its argument. */
+ if (tmpname) {
+ set_last_open_dir(get_dirname(tmpname));
+ g_free(tmpname);
+ }
+ g_string_free(file_name, TRUE);
+ g_string_free(display_filter, TRUE);
return;
}
-
- /* Save the name of the containing directory specified in the path name,
- if any; we can write over cf_merged_name, which is a good thing, given that
- "get_dirname()" does write over its argument. */
- s = get_dirname(tmpname);
- set_last_open_dir(s);
-}
-
-static void
-file_merge_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
-{
- /* Note that we no longer have a "Merge Capture File" dialog box. */
- file_merge_w = NULL;
}
+void
+file_merge_cmd_cb(GtkWidget *widget, gpointer data _U_) {
+ /* If there's unsaved data, let the user save it first.
+ If they cancel out of it, don't merge. */
+ GtkWidget *msg_dialog;
+ gchar *display_basename;
+ gint response;
+
+ if (prefs.gui_ask_unsaved) {
+ if (cf_has_unsaved_data(&cfile)) {
+ /* This file has unsaved data; ask the user whether to save the
+ capture. */
+ if (cfile.is_tempfile) {
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level),
+ (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT),
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "Do you want to save the captured packets before merging another capture file into it?");
+
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msg_dialog),
+ "A temporary capture file can't be merged.");
+ } else {
+ /*
+ * Format the message.
+ */
+ display_basename = g_filename_display_basename(cfile.filename);
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level),
+ (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT),
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "Do you want to save the changes you've made "
+ "to the capture file \"%s\" before merging another capture file into it?",
+ display_basename);
+ g_free(display_basename);
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msg_dialog),
+ "The changes must be saved before the files are merged.");
+ }
-static void file_close_answered_cb(gpointer dialog _U_, gint btn, gpointer data _U_)
-{
- switch(btn) {
- case(ESD_BTN_SAVE):
- /* save file first */
- file_save_as_cmd(after_save_close_file, NULL);
+ gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
+ WIRESHARK_STOCK_SAVE, GTK_RESPONSE_ACCEPT);
+ gtk_dialog_set_alternative_button_order(GTK_DIALOG(msg_dialog),
+ GTK_RESPONSE_ACCEPT,
+ GTK_RESPONSE_CANCEL,
+ -1);
+ gtk_dialog_set_default_response(GTK_DIALOG(msg_dialog),
+ GTK_RESPONSE_ACCEPT);
+
+ response = gtk_dialog_run(GTK_DIALOG(msg_dialog));
+ gtk_widget_destroy(msg_dialog);
+
+ switch (response) {
+
+ case GTK_RESPONSE_ACCEPT:
+ /* Save the file but don't close it */
+ do_file_save(&cfile, FALSE);
break;
- case(ESD_BTN_DONT_SAVE):
- cf_close(&cfile);
+
+ case GTK_RESPONSE_CANCEL:
+ case GTK_RESPONSE_NONE:
+ case GTK_RESPONSE_DELETE_EVENT:
+ default:
+ /* Don't do the merge. */
+ return;
+ }
+ }
+ }
+
+ /* Do the merge. */
+ file_merge_cmd(widget);
+}
+
+#ifdef HAVE_LIBPCAP
+static void
+do_capture_stop(capture_file *cf)
+{
+ /* Stop the capture (complete with UI updates). */
+ capture_stop_cb(NULL, NULL);
+
+ /* Now run the main loop until the capture stops and we finish
+ reading it; we need to run the main loop so we respond to
+ messages on the sync pipe and the sync pipe being closed. */
+ while (cf->state == FILE_READ_IN_PROGRESS)
+ gtk_main_iteration();
+}
+#endif
+
+/* Returns true if the current file has been saved or if the user has chosen
+ * to discard it, ie if it is safe to continue with the call to close, and
+ * false otherwise. */
+gboolean
+test_file_close(capture_file *cf, gboolean from_quit, const char *before_what)
+{
+ GtkWidget *msg_dialog;
+ gchar *display_basename;
+ gint response;
+ gboolean capture_in_progress;
+
+ if (cf->state == FILE_CLOSED)
+ return TRUE; /* already closed, nothing to do */
+
+#ifdef HAVE_LIBPCAP
+ if (cf->state == FILE_READ_IN_PROGRESS) {
+ /* This is true if we're reading a capture file *or* if we're doing
+ a live capture. If we're reading a capture file, the main loop
+ is busy reading packets, and only accepting input from the
+ progress dialog, so we can't get here, so this means we're
+ doing a capture. */
+ capture_in_progress = TRUE;
+ } else
+#endif
+ capture_in_progress = FALSE;
+
+ if (prefs.gui_ask_unsaved) {
+ if (cf_has_unsaved_data(cf) || capture_in_progress) {
+ /* This file has unsaved data or there's a capture in progress;
+ ask the user whether to save the data. */
+ if (cf->is_tempfile) {
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level),
+ (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT),
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ capture_in_progress ?
+ "Do you want to stop the capture and save the captured packets%s?" :
+ "Do you want to save the captured packets%s?",
+ before_what);
+
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msg_dialog),
+ "Your captured packets will be lost if you don't save them.");
+ } else {
+ /*
+ * Format the message.
+ */
+ display_basename = g_filename_display_basename(cf->filename);
+ if (capture_in_progress) {
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level),
+ (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT),
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "Do you want to stop the capture and save the captured packets%s?",
+ before_what);
+ } else {
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level),
+ (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT),
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "Do you want to save the changes you've made "
+ "to the capture file \"%s\"%s?",
+ display_basename, before_what);
+ }
+ g_free(display_basename);
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msg_dialog),
+ capture_in_progress ?
+ "Your captured packets will be lost if you don't save them." :
+ "Your changes will be lost if you don't save them.");
+ }
+
+ /* If this is from a Quit operation, use "quit and don't save"
+ rather than just "don't save". */
+ gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
+ (from_quit ?
+ (cf->state == FILE_READ_IN_PROGRESS ?
+ WIRESHARK_STOCK_STOP_QUIT_DONT_SAVE :
+ WIRESHARK_STOCK_QUIT_DONT_SAVE) :
+ (capture_in_progress ?
+ WIRESHARK_STOCK_STOP_DONT_SAVE :
+ WIRESHARK_STOCK_DONT_SAVE)),
+ GTK_RESPONSE_REJECT);
+ gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
+ (capture_in_progress ?
+ WIRESHARK_STOCK_STOP_SAVE :
+ WIRESHARK_STOCK_SAVE),
+ GTK_RESPONSE_ACCEPT);
+ gtk_dialog_set_alternative_button_order(GTK_DIALOG(msg_dialog),
+ GTK_RESPONSE_ACCEPT,
+ GTK_RESPONSE_CANCEL,
+ GTK_RESPONSE_REJECT,
+ -1);
+ gtk_dialog_set_default_response(GTK_DIALOG(msg_dialog),
+ GTK_RESPONSE_ACCEPT);
+
+ response = gtk_dialog_run(GTK_DIALOG(msg_dialog));
+ gtk_widget_destroy(msg_dialog);
+
+ switch (response) {
+
+ case GTK_RESPONSE_ACCEPT:
+#ifdef HAVE_LIBPCAP
+ /* If there's a capture in progress, we have to stop the capture
+ and then do the save. */
+ if (capture_in_progress)
+ do_capture_stop(cf);
+#endif
+ /* Save the file and close it */
+ do_file_save(cf, TRUE);
break;
- case(ESD_BTN_CANCEL):
+
+ case GTK_RESPONSE_REJECT:
+#ifdef HAVE_LIBPCAP
+ /* If there's a capture in progress; we have to stop the capture
+ and then do the close. */
+ if (capture_in_progress)
+ do_capture_stop(cf);
+#endif
break;
- default:
- g_assert_not_reached();
+
+ case GTK_RESPONSE_CANCEL:
+ case GTK_RESPONSE_NONE:
+ case GTK_RESPONSE_DELETE_EVENT:
+ default:
+ /* Don't close the file (and don't stop any capture in progress). */
+ return FALSE; /* file not closed */
+ }
+ } else {
+ /* unchanged file, safe to close */
+ return TRUE;
}
+ } else {
+ /* User asked not to be bothered by those prompts, just close it.
+ XXX - should that apply only to saving temporary files? */
+#ifdef HAVE_LIBPCAP
+ /* If there's a capture in progress, we have to stop the capture
+ and then do the close. */
+ if (capture_in_progress)
+ do_capture_stop(cf);
+#endif
+ return TRUE;
+ }
+ return TRUE; /* shouldn't get here? */
+}
+
+gboolean
+do_file_close(capture_file *cf, gboolean from_quit, const char *before_what)
+{
+ if (test_file_close(cf, from_quit, before_what)) {
+ cf_close(cf);
+ return TRUE;
+ }
+ return FALSE;
}
/* Close a file */
void
file_close_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) {
- gpointer dialog;
-
- if((cfile.state != FILE_CLOSED) && (cfile.is_tempfile || cfile.unsaved_changes) &&
- prefs.gui_ask_unsaved) {
- /* This is a temporary capture file or has unsaved changes; ask the
- user whether to save the capture. */
- dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE_CANCEL,
- "%sSave capture file before closing it?%s\n\n"
- "If you close without saving, your capture data will be discarded.",
- simple_dialog_primary_start(), simple_dialog_primary_end());
-
- simple_dialog_set_cb(dialog, file_close_answered_cb, NULL);
+ do_file_close(&cfile, FALSE, "");
+}
+
+#define RESPONSE_DISCARD_COMMENTS_AND_SAVE 1
+#define RESPONSE_SAVE_IN_ANOTHER_FORMAT 2
+
+static check_savability_t
+check_save_with_comments(capture_file *cf)
+{
+ guint32 comment_types;
+ GtkWidget *msg_dialog;
+ gint response;
+
+ /* What types of comments do we have? */
+ comment_types = cf_comment_types(cf);
+
+ /* Does the file's format support all the comments we have? */
+ if (wtap_dump_supports_comment_types(cf->cd_t, comment_types)) {
+ /* Yes. Let the save happen; we can save all the comments, so
+ there's no need to delete them. */
+ return SAVE;
+ }
+
+ /* No. Are there formats in which we can write this file that
+ supports all the comments in this file? */
+ if (wtap_dump_can_write(cf->linktypes, comment_types)) {
+ /* Yes. Offer the user a choice of "Save in a format that
+ supports comments", "Discard comments and save in the
+ file's own format", or "Cancel", meaning "don't bother
+ saving the file at all". */
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "The capture has comments, but the file's format "
+ "doesn't support comments. Do you want to save the capture "
+ "in a format that supports comments, or discard the comments "
+ "and save in the file's format?");
+ gtk_dialog_add_buttons(GTK_DIALOG(msg_dialog),
+ "Discard comments and save",
+ RESPONSE_DISCARD_COMMENTS_AND_SAVE,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ "Save in another format",
+ RESPONSE_SAVE_IN_ANOTHER_FORMAT,
+ NULL);
+ gtk_dialog_set_alternative_button_order(GTK_DIALOG(msg_dialog),
+ RESPONSE_SAVE_IN_ANOTHER_FORMAT,
+ GTK_RESPONSE_CANCEL,
+ RESPONSE_DISCARD_COMMENTS_AND_SAVE,
+ -1);
+ gtk_dialog_set_default_response(GTK_DIALOG(msg_dialog),
+ RESPONSE_SAVE_IN_ANOTHER_FORMAT);
} else {
- /* unchanged file, just close it */
- cf_close(&cfile);
+ /* No. Offer the user a choice of "Discard comments and
+ save in the file's format" or "Cancel". */
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "The capture has comments, but no file format in which it "
+ "can be saved supports comments. Do you want to discard "
+ "the comments and save in the file's format?");
+ gtk_dialog_add_buttons(GTK_DIALOG(msg_dialog),
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ "Discard comments and save",
+ RESPONSE_DISCARD_COMMENTS_AND_SAVE,
+ NULL);
+ gtk_dialog_set_alternative_button_order(GTK_DIALOG(msg_dialog),
+ RESPONSE_DISCARD_COMMENTS_AND_SAVE,
+ GTK_RESPONSE_CANCEL,
+ -1);
+ gtk_dialog_set_default_response(GTK_DIALOG(msg_dialog),
+ GTK_RESPONSE_CANCEL);
+ }
+
+ response = gtk_dialog_run(GTK_DIALOG(msg_dialog));
+ gtk_widget_destroy(msg_dialog);
+
+ switch (response) {
+
+ case RESPONSE_SAVE_IN_ANOTHER_FORMAT:
+ /* Let the user select another format. */
+ return SAVE_IN_ANOTHER_FORMAT;
+
+ case RESPONSE_DISCARD_COMMENTS_AND_SAVE:
+ /* Save without the comments and, if that succeeds, delete the
+ comments. */
+ return SAVE_WITHOUT_COMMENTS;
+
+ case GTK_RESPONSE_CANCEL:
+ case GTK_RESPONSE_NONE:
+ case GTK_RESPONSE_DELETE_EVENT:
+ default:
+ /* Just give up. */
+ return CANCELLED;
}
}
-void
-file_save_cmd_cb(GtkWidget *w _U_, gpointer data _U_) {
- if (cfile.is_tempfile) {
+/*
+ * Save the capture file in question, prompting the user for a file
+ * name to save to if necessary.
+ */
+static void
+do_file_save(capture_file *cf, gboolean dont_reopen)
+{
+ char *fname;
+ gboolean discard_comments;
+ cf_write_status_t status;
+
+ if (cf->is_tempfile) {
/* This is a temporary capture file, so saving it means saving
- it to a permanent file. */
- file_save_as_cmd(after_save_no_action, NULL);
+ it to a permanent file. Prompt the user for a location
+ to which to save it. Don't require that the file format
+ support comments - if it's a temporary capture file, it's
+ probably pcap-ng, which supports comments and, if it's
+ not pcap-ng, let the user decide what they want to do
+ if they've added comments. */
+ file_save_as_cmd(cf, FALSE, dont_reopen);
} else {
- if (cfile.unsaved_changes) {
+ if (cf->unsaved_changes) {
/* This is not a temporary capture file, but it has unsaved
changes, so saving it means doing a "safe save" on top
- of the existing file, in the same format - no UI needed. */
- file_save_cmd(after_save_no_action, NULL);
+ of the existing file, in the same format - no UI needed
+ unless the file has comments and the file's format doesn't
+ support them.
+
+ If the file has comments, does the file's format support them?
+ If not, ask the user whether they want to discard the comments
+ or choose a different format. */
+ switch (check_save_with_comments(cf)) {
+
+ case SAVE:
+ /* The file can be saved in the specified format as is;
+ just drive on and save in the format they selected. */
+ discard_comments = FALSE;
+ break;
+
+ case SAVE_WITHOUT_COMMENTS:
+ /* The file can't be saved in the specified format as is,
+ but it can be saved without the comments, and the user
+ said "OK, discard the comments", so save it in the
+ format they specified without the comments. */
+ discard_comments = TRUE;
+ break;
+
+ case SAVE_IN_ANOTHER_FORMAT:
+ /* There are file formats in which we can save this that
+ support comments, and the user said not to delete the
+ comments. Do a "Save As" so the user can select
+ one of those formats and choose a file name. */
+ file_save_as_cmd(cf, TRUE, dont_reopen);
+ return;
+
+ case CANCELLED:
+ /* The user said "forget it". Just return. */
+ return;
+
+ default:
+ /* Squelch warnings that discard_comments is being used
+ uninitialized. */
+ g_assert_not_reached();
+ return;
+ }
+
+ /* XXX - cf->filename might get freed out from under us, because
+ the code path through which cf_save_packets() goes currently
+ closes the current file and then opens and reloads the saved file,
+ so make a copy and free it later. */
+ fname = g_strdup(cf->filename);
+ status = cf_save_packets(cf, fname, cf->cd_t, cf->iscompressed,
+ discard_comments, dont_reopen);
+ switch (status) {
+
+ case CF_WRITE_OK:
+ /* The save succeeded; we're done.
+ If we discarded comments, redraw the packet list to reflect
+ any packets that no longer have comments. */
+ if (discard_comments)
+ packet_list_queue_draw();
+ break;
+
+ case CF_WRITE_ERROR:
+ /* The write failed.
+ XXX - OK, what do we do now? Let them try a
+ "Save As", in case they want to try to save to a
+ different directory r file system? */
+ break;
+
+ case CF_WRITE_ABORTED:
+ /* The write was aborted; just drive on. */
+ break;
+ }
+ g_free(fname);
}
- /* Otherwise just do nothing (this shouldn't even be enabled if
- it's not a temporary file and there are no unsaved changes). */
+ /* Otherwise just do nothing. */
}
}
+void
+file_save_cmd_cb(GtkWidget *w _U_, gpointer data _U_) {
+ do_file_save(&cfile, FALSE);
+}
+
/* Attach a list of the valid 'save as' file types to a combo_box by
checking what Wiretap supports. Make the default type the first
- in the list.
- */
-static void
-set_file_type_list(GtkWidget *combo_box, int default_file_type)
+ in the list. If must_supprt_comments is true, restrict the list
+ to those formats that support comments (currently, just pcap-ng).
+
+ Returns the default file type. */
+static int
+set_file_type_list(GtkWidget *combo_box, capture_file *cf,
+ gboolean must_support_all_comments)
{
- GArray *savable_file_types;
- guint i;
- int ft;
+ guint32 required_comment_types;
+ GArray *savable_file_types_subtypes;
+ guint i;
+ int ft;
+ int default_ft = -1;
+
+ /* What types of comments do we have to support? */
+ if (must_support_all_comments)
+ required_comment_types = cf_comment_types(cf); /* all the ones the file has */
+ else
+ required_comment_types = 0; /* none of them */
- savable_file_types = wtap_get_savable_file_types(default_file_type, cfile.lnk_t);
+ /* What types of file can we save this file as? */
+ savable_file_types_subtypes = wtap_get_savable_file_types_subtypes(cf->cd_t,
+ cf->linktypes,
+ required_comment_types);
- if (savable_file_types != NULL) {
+ if (savable_file_types_subtypes != NULL) {
/* OK, we have at least one file type we can save this file as.
(If we didn't, we shouldn't have gotten here in the first
place.) Add them all to the combo box. */
- for (i = 0; i < savable_file_types->len; i++) {
- ft = g_array_index(savable_file_types, int, i);
+ for (i = 0; i < savable_file_types_subtypes->len; i++) {
+ ft = g_array_index(savable_file_types_subtypes, int, i);
+ if (default_ft == -1)
+ default_ft = ft; /* first file type is the default */
ws_combo_box_append_text_and_pointer(GTK_COMBO_BOX(combo_box),
- wtap_file_type_string(ft),
+ wtap_file_type_subtype_string(ft),
GINT_TO_POINTER(ft));
}
- g_array_free(savable_file_types, TRUE);
+ g_array_free(savable_file_types_subtypes, TRUE);
}
+
+ return default_ft;
}
static void
-file_save_as_select_file_type_cb(GtkWidget *w, gpointer data _U_)
+file_select_file_type_cb(GtkWidget *w, gpointer parent_arg)
{
- int new_file_type;
- gpointer ptr;
+ GtkWidget *parent = (GtkWidget *)parent_arg;
+ int new_file_type;
+ gpointer ptr;
GtkWidget *compressed_cb;
+ compressed_cb = (GtkWidget *)g_object_get_data(G_OBJECT(parent), E_COMPRESSED_CB_KEY);
if (! ws_combo_box_get_active_pointer(GTK_COMBO_BOX(w), &ptr)) {
- g_assert_not_reached(); /* Programming error: somehow nothing is active */
+ /* XXX - this can happen when we clear the list of file types
+ and then reconstruct it. */
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compressed_cb), FALSE);
+ gtk_widget_set_sensitive(compressed_cb, FALSE);
+ return;
}
new_file_type = GPOINTER_TO_INT(ptr);
- compressed_cb = (GtkWidget *)g_object_get_data(G_OBJECT(file_save_as_w), E_COMPRESSED_CB_KEY);
if (!wtap_dump_can_compress(new_file_type)) {
/* Can't compress this file type; turn off compression and make
the compression checkbox insensitive. */
gtk_widget_set_sensitive(compressed_cb, TRUE);
}
+static check_savability_t
+gtk_check_save_as_with_comments(GtkWidget *w, capture_file *cf, int file_type)
+{
+ guint32 comment_types;
+ GtkWidget *msg_dialog;
+ gint response;
+
+ /* What types of comments do we have? */
+ comment_types = cf_comment_types(cf);
+
+ /* Does the file's format support all the comments we have? */
+ if (wtap_dump_supports_comment_types(file_type, comment_types)) {
+ /* Yes. Let the save happen; we can save all the comments, so
+ there's no need to delete them. */
+ return SAVE;
+ }
-action_after_save_e action_after_save_g;
-gpointer action_after_save_data_g;
+ /* No. Are there formats in which we can write this file that
+ supports all the comments in this file? */
+ if (wtap_dump_can_write(cf->linktypes, comment_types)) {
+ /* Yes. Offer the user a choice of "Save in a format that
+ supports comments", "Discard comments and save in the
+ format you selected", or "Cancel", meaning "don't bother
+ saving the file at all". */
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(w),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "The capture has comments, but the file format you chose "
+ "doesn't support comments. Do you want to save the capture "
+ "in a format that supports comments, or discard the comments "
+ "and save in the format you chose?");
+ gtk_dialog_add_buttons(GTK_DIALOG(msg_dialog),
+ "Discard comments and save",
+ RESPONSE_DISCARD_COMMENTS_AND_SAVE,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ "Save in another format",
+ RESPONSE_SAVE_IN_ANOTHER_FORMAT,
+ NULL);
+ gtk_dialog_set_alternative_button_order(GTK_DIALOG(msg_dialog),
+ RESPONSE_SAVE_IN_ANOTHER_FORMAT,
+ GTK_RESPONSE_CANCEL,
+ RESPONSE_DISCARD_COMMENTS_AND_SAVE,
+ -1);
+ gtk_dialog_set_default_response(GTK_DIALOG(msg_dialog),
+ RESPONSE_SAVE_IN_ANOTHER_FORMAT);
+ } else {
+ /* No. Offer the user a choice of "Discard comments and
+ save in the format you selected" or "Cancel". */
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(w),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "The capture has comments, but no file format in which it "
+ "can be saved supports comments. Do you want to discard "
+ "the comments and save in the format you chose?");
+ gtk_dialog_add_buttons(GTK_DIALOG(msg_dialog),
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ "Discard comments and save",
+ RESPONSE_DISCARD_COMMENTS_AND_SAVE,
+ NULL);
+ gtk_dialog_set_alternative_button_order(GTK_DIALOG(msg_dialog),
+ RESPONSE_DISCARD_COMMENTS_AND_SAVE,
+ GTK_RESPONSE_CANCEL,
+ -1);
+ gtk_dialog_set_default_response(GTK_DIALOG(msg_dialog),
+ GTK_RESPONSE_CANCEL);
+ }
+ response = gtk_dialog_run(GTK_DIALOG(msg_dialog));
+ gtk_widget_destroy(msg_dialog);
-void
-file_save_cmd(action_after_save_e action_after_save, gpointer action_after_save_data)
-{
- char *fname;
+ switch (response) {
- action_after_save_g = action_after_save;
- action_after_save_data_g = action_after_save_data;
+ case RESPONSE_SAVE_IN_ANOTHER_FORMAT:
+ /* OK, the only other format we support is pcap-ng. Make that
+ the one and only format in the combo box, and return to
+ let the user continue with the dialog.
- /* XXX - cfile.filename might get freed out from under us, because
- the code path through which cf_save_packets() goes currently closes the
- current file and then opens and reloads the saved file, so make
- a copy and free it later. */
- fname = g_strdup(cfile.filename);
+ XXX - removing all the formats from the combo box will clear
+ the compressed checkbox; get the current value and restore
+ it.
- cf_save_packets(&cfile, fname, cfile.cd_t, cfile.iscompressed);
- g_free(fname);
+ XXX - we know pcap-ng can be compressed; if we ever end up
+ supporting saving comments in a format that *can't* be
+ compressed, such as NetMon format, we must check this. */
+ /* XXX - need a compressed checkbox here! */
+ return SAVE_IN_ANOTHER_FORMAT;
+
+ case RESPONSE_DISCARD_COMMENTS_AND_SAVE:
+ /* Save without the comments and, if that succeeds, delete the
+ comments. */
+ return SAVE_WITHOUT_COMMENTS;
+
+ case GTK_RESPONSE_CANCEL:
+ case GTK_RESPONSE_NONE:
+ case GTK_RESPONSE_DELETE_EVENT:
+ default:
+ /* Just give up. */
+ return CANCELLED;
+ }
}
-void
-file_save_as_cmd(action_after_save_e action_after_save, gpointer action_after_save_data)
+#ifndef USE_WIN32_FILE_DIALOGS
+/* "Save as" */
+static gboolean
+gtk_save_as_file(GtkWidget *w _U_, capture_file *cf, GString *file_name, int *file_type,
+ gboolean *compressed, gboolean must_support_all_comments)
{
-#if _WIN32
- win32_save_as_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), action_after_save, action_after_save_data);
-#else /* _WIN32 */
- GtkWidget *main_vb, *ft_hb, *ft_lb, *ft_combo_box, *compressed_cb;
-
- if (file_save_as_w != NULL) {
- /* There's already an "Save Capture File As" dialog box; reactivate it. */
- reactivate_window(file_save_as_w);
- return;
- }
+ GtkWidget *file_save_as_w;
+ GtkWidget *main_vb, *ft_hb, *ft_lb, *ft_combo_box, *compressed_cb;
+ int default_ft;
+ char *cf_name;
+ gpointer ptr;
+
+ if (!file_name || !file_type || !compressed)
+ return FALSE;
/* Default to saving in the file's current format. */
/* build the file selection */
- file_save_as_w = file_selection_new ("Wireshark: Save Capture File As",
- FILE_SELECTION_SAVE);
-
- /* as the dialog might already be gone, when using this values, we cannot
- * set data to the dialog object, but keep global values */
- action_after_save_g = action_after_save;
- action_after_save_data_g = action_after_save_data;
+ file_save_as_w = file_selection_new("Wireshark: Save Capture File As",
+ GTK_WINDOW(top_level),
+ FILE_SELECTION_SAVE);
/* Container for each row of widgets */
- main_vb = gtk_vbox_new(FALSE, 5);
+ main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
file_selection_set_extra_widget(file_save_as_w, main_vb);
gtk_widget_show(main_vb);
/* File type row */
- range_tb = NULL;
- ft_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(main_vb), ft_hb);
+ ft_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
+ gtk_box_pack_start(GTK_BOX(main_vb), ft_hb, FALSE, FALSE, 0);
gtk_widget_show(ft_hb);
ft_lb = gtk_label_new("File type:");
ft_combo_box = ws_combo_box_new_text_and_pointer();
/* Generate the list of file types we can save. */
- set_file_type_list(ft_combo_box, cfile.cd_t);
+ default_ft = set_file_type_list(ft_combo_box, cf, must_support_all_comments);
gtk_box_pack_start(GTK_BOX(ft_hb), ft_combo_box, FALSE, FALSE, 0);
gtk_widget_show(ft_combo_box);
g_object_set_data(G_OBJECT(file_save_as_w), E_FILE_TYPE_COMBO_BOX_KEY, ft_combo_box);
- /* compressed */
+ /* compressed - if the file is currently compressed, and the default
+ file type supports compression, turn the checkbox on */
compressed_cb = gtk_check_button_new_with_label("Compress with gzip");
- gtk_container_add(GTK_CONTAINER(ft_hb), compressed_cb);
+ gtk_box_pack_start(GTK_BOX(ft_hb), compressed_cb, FALSE, FALSE, 0);
+ if (cf->iscompressed && wtap_dump_can_compress(default_ft))
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compressed_cb), TRUE);
gtk_widget_show(compressed_cb);
g_object_set_data(G_OBJECT(file_save_as_w), E_COMPRESSED_CB_KEY, compressed_cb);
- /* Ok: now "select" the default filetype which invokes file_save_as_select_file_type_cb */
- g_signal_connect(ft_combo_box, "changed", G_CALLBACK(file_save_as_select_file_type_cb), NULL);
+
+ /* Ok: now "select" the default filetype which invokes file_select_file_type_cb */
+ g_signal_connect(ft_combo_box, "changed", G_CALLBACK(file_select_file_type_cb), file_save_as_w);
ws_combo_box_set_active(GTK_COMBO_BOX(ft_combo_box), 0);
- g_signal_connect(file_save_as_w, "destroy",
- G_CALLBACK(file_save_as_destroy_cb), NULL);
+ cf_name = file_selection_run(file_save_as_w);
- if (gtk_dialog_run(GTK_DIALOG(file_save_as_w)) == GTK_RESPONSE_ACCEPT) {
- file_save_as_ok_cb(file_save_as_w, file_save_as_w);
- } else {
- window_destroy(file_save_as_w);
+ if (cf_name == NULL) {
+ /* User cancelled or closed the dialog. */
+ return FALSE;
}
-#endif /* _WIN32 */
-}
-
-void
-file_save_as_cmd_cb(GtkWidget *w _U_, gpointer data _U_)
-{
- file_save_as_cmd(after_save_no_action, NULL);
-}
-
-/* all tests ok, we only have to save the file */
-/* (and probably continue with a pending operation) */
-static void
-file_save_as_cb(GtkWidget *w _U_, gpointer fs) {
- GtkWidget *ft_combo_box;
- GtkWidget *compressed_cb;
- gchar *cf_name;
- gchar *dirname;
- gpointer ptr;
- int file_type;
- gboolean compressed;
-
- cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
-
- compressed_cb = (GtkWidget *)g_object_get_data(G_OBJECT(fs), E_COMPRESSED_CB_KEY);
- ft_combo_box = (GtkWidget *)g_object_get_data(G_OBJECT(fs), E_FILE_TYPE_COMBO_BOX_KEY);
if (! ws_combo_box_get_active_pointer(GTK_COMBO_BOX(ft_combo_box), &ptr)) {
g_assert_not_reached(); /* Programming error: somehow nothing is active */
}
- file_type = GPOINTER_TO_INT(ptr);
- compressed = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compressed_cb));
-
- /* Write out all the packets to the file with the specified name. */
- if (cf_save_packets(&cfile, cf_name, file_type, compressed) != CF_OK) {
- /* The write failed; don't dismiss the open dialog box,
- just leave it around so that the user can, after they
- dismiss the alert box popped up for the error, try again. */
- g_free(cf_name);
- /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
- * as this will prevent the user from closing the now existing error
- * message, simply close the dialog (this is the best we can do here). */
- if (file_save_as_w)
- window_destroy(GTK_WIDGET (fs));
- return;
- }
+ *file_type = GPOINTER_TO_INT(ptr);
+ *compressed = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compressed_cb));
- /* The write succeeded; get rid of the file selection box. */
- /* cf_save_packets() might already closed our dialog! */
- if (file_save_as_w)
- window_destroy(GTK_WIDGET (fs));
+ /* We've crossed the Rubicon; get rid of the file selection box. */
+ window_destroy(GTK_WIDGET(file_save_as_w));
- /* Save the directory name for future file dialogs. */
- dirname = get_dirname(cf_name); /* Overwrites cf_name */
- set_last_open_dir(dirname);
+ g_string_printf(file_name, "%s", cf_name);
g_free(cf_name);
-
- /* we have finished saving, do we have pending things to do? */
- switch(action_after_save_g) {
- case(after_save_no_action):
- break;
- case(after_save_open_dialog):
- file_open_cmd(action_after_save_data_g);
- break;
- case(after_save_open_recent_file):
- menu_open_recent_file_cmd(action_after_save_data_g);
- break;
- case(after_save_open_dnd_file):
- dnd_open_file_cmd(action_after_save_data_g);
- break;
- case(after_save_merge_dialog):
- file_merge_cmd(action_after_save_data_g);
- break;
-#ifdef HAVE_LIBPCAP
- case(after_save_capture_dialog):
- capture_start_confirmed();
- break;
-#endif
- case(after_save_close_file):
- cf_close(&cfile);
- break;
- case(after_save_exit):
- main_do_quit();
- break;
- default:
- g_assert_not_reached();
- }
-
- action_after_save_g = after_save_no_action;
+ return TRUE;
}
+#endif /* USE_WIN32_FILE_DIALOGS */
+static void
+file_add_extension(GString *file_name, int file_type, gboolean compressed) {
+ gchar *file_name_lower;
+ GString *file_suffix;
+ GSList *extensions_list, *extension;
+ gboolean add_extension;
-static void file_save_as_exists_answered_cb(gpointer dialog _U_, gint btn, gpointer data)
-{
- gchar *cf_name;
-
- cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(data));
-
- switch(btn) {
- case(ESD_BTN_OK):
- /* save file */
- file_save_as_cb(NULL, data);
+ /*
+ * Append the default file extension if there's none given by
+ * the user or if they gave one that's not one of the valid
+ * extensions for the file type.
+ */
+ file_name_lower = g_utf8_strdown(file_name->str, -1);
+ file_suffix = g_string_new("");
+ extensions_list = wtap_get_file_extensions_list(file_type, FALSE);
+ if (extensions_list != NULL) {
+ /* We have one or more extensions for this file type.
+ Start out assuming we need to add the default one. */
+ add_extension = TRUE;
+
+ /* OK, see if the file has one of those extensions. */
+ for (extension = extensions_list; extension != NULL;
+ extension = g_slist_next(extension)) {
+ g_string_printf(file_suffix, ".%s", (char *)extension->data);
+ if (g_str_has_suffix(file_name_lower, file_suffix->str)) {
+ /*
+ * The file name has one of the extensions for
+ * this file type.
+ */
+ add_extension = FALSE;
break;
- case(ESD_BTN_CANCEL):
- /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
- * as this will prevent the user from closing the now existing error
- * message, simply close the dialog (this is the best we can do here). */
- if (file_save_as_w)
- window_destroy(file_save_as_w);
+ }
+ g_string_append(file_suffix, ".gz");
+ if (g_str_has_suffix(file_name_lower, file_suffix->str)) {
+ /*
+ * The file name has one of the extensions for
+ * this file type.
+ */
+ add_extension = FALSE;
break;
- default:
- g_assert_not_reached();
+ }
}
- g_free(cf_name);
+ } else {
+ /* We have no extensions for this file type. Don't add one. */
+ add_extension = FALSE;
+ }
+ g_free(file_name_lower);
+ g_string_free(file_suffix, TRUE);
+ if (add_extension) {
+ if (wtap_default_file_extension(file_type) != NULL) {
+ g_string_append_printf(file_name, ".%s",
+ wtap_default_file_extension(file_type));
+ if (compressed) {
+ g_string_append(file_name, ".gz");
+ }
+ }
+ }
}
+/* Save a file with a user-specified name */
-/* user pressed "Save As" dialog "Ok" button */
-static void
-file_save_as_ok_cb(GtkWidget *w _U_, gpointer fs) {
- gchar *cf_name;
- gpointer dialog;
-
- cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
+/*
+ * <platform/>_save_as_file routines should upon entry...
+ * Set the path and fill in the filename if the path+filename is provided.
+ * ...and upon exit...
+ * Return TRUE on "OK" and "FALSE" on "Cancel".
+ * Close the window.
+ */
- /* Perhaps the user specified a directory instead of a file.
- Check whether they did. */
- if (test_for_directory(cf_name) == EISDIR) {
- /* It's a directory - set the file selection box to display that
- directory, and leave the selection box displayed. */
- set_last_open_dir(cf_name);
- g_free(cf_name);
- file_selection_set_current_folder(fs, get_last_open_dir());
- return;
- }
+static void
+file_save_as_cmd(capture_file *cf, gboolean must_support_all_comments,
+ gboolean dont_reopen)
+{
+ GString *file_name = g_string_new("");
+ int file_type;
+ gboolean compressed;
+ gchar *dirname;
+ gboolean discard_comments = FALSE;
+ cf_write_status_t status;
/*
- * Check that the from file is not the same as to file
- * We do it here so we catch all cases ...
- * Unfortunately, the file requester gives us an absolute file
- * name and the read file name may be relative (if supplied on
- * the command line). From Joerg Mayer.
+ * Loop until the user either selects a file or gives up.
*/
- if (files_identical(cfile.filename, cf_name)) {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- "%sCapture file: \"%s\" identical to loaded file!%s\n\n"
- "Please choose a different filename.",
- simple_dialog_primary_start(), cf_name, simple_dialog_primary_end());
- g_free(cf_name);
- /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
- * as this will prevent the user from closing the now existing error
- * message, simply close the dialog (this is the best we can do here). */
- if (file_save_as_w)
- window_destroy(GTK_WIDGET (fs));
+ for (;;) {
+#ifdef USE_WIN32_FILE_DIALOGS
+ if (win32_save_as_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), cf,
+ file_name, &file_type, &compressed, must_support_all_comments)) {
+ /* They discarded comments, so redraw the packet details window
+ to reflect any packets that no longer have comments. */
+ packet_list_queue_draw();
+#else /* USE_WIN32_FILE_DIALOGS */
+ if (gtk_save_as_file(top_level, cf, file_name, &file_type, &compressed, must_support_all_comments)) {
+#endif /* USE_WIN32_FILE_DIALOGS */
+
+ /* If the file has comments, does the format the user selected
+ support them? If not, ask the user whether they want to
+ discard the comments or choose a different format. */
+#ifdef USE_WIN32_FILE_DIALOGS
+ switch (win32_check_save_as_with_comments(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), cf, file_type)) {
+#else /* USE_WIN32_FILE_DIALOGS */
+ switch (gtk_check_save_as_with_comments(top_level, cf, file_type)) {
+#endif /* USE_WIN32_FILE_DIALOGS */
+
+ case SAVE:
+ /* The file can be saved in the specified format as is;
+ just drive on and save in the format they selected. */
+ discard_comments = FALSE;
+ break;
- return;
- }
+ case SAVE_WITHOUT_COMMENTS:
+ /* The file can't be saved in the specified format as is,
+ but it can be saved without the comments, and the user
+ said "OK, discard the comments", so save it in the
+ format they specified without the comments. */
+ discard_comments = TRUE;
+ break;
- /* don't show the dialog while saving (or asking) */
- gtk_widget_hide(GTK_WIDGET (fs));
+ case SAVE_IN_ANOTHER_FORMAT:
+ /* There are file formats in which we can save this that
+ support comments, and the user said not to delete the
+ comments. The combo box of file formats has had the
+ formats that don't support comments trimmed from it,
+ so run the dialog again, to let the user decide
+ whether to save in one of those formats or give up. */
+ must_support_all_comments = TRUE;
+ continue;
+
+ case CANCELLED:
+ /* The user said "forget it". Just get rid of the dialog box
+ and return. */
+ g_string_free(file_name, TRUE);
+ return;
+ }
- /* it the file doesn't exist, simply try to save it */
- if (!file_exists(cf_name)) {
- file_save_as_cb(NULL, fs);
- g_free(cf_name);
- return;
- }
+ file_add_extension(file_name, file_type, compressed);
- /* The file exists. Ask the user if they want to overwrite it. */
- dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_OK_CANCEL,
- "%s"
- "A file named \"%s\" already exists. Do you want to replace it?"
- "%s\n\n"
- "A file or folder with the same name already exists in that folder. "
- "Replacing it will overwrite its current contents.",
- simple_dialog_primary_start(), cf_name, simple_dialog_primary_end());
- simple_dialog_set_cb(dialog, file_save_as_exists_answered_cb, fs);
+#ifndef _WIN32
+ /* If the file exists and it's user-immutable or not writable,
+ ask the user whether they want to override that. */
+ if (!file_target_unwritable_ui(top_level, file_name->str)) {
+ /* They don't. Let them try another file name or cancel. */
+ continue;
+ }
+#endif
- g_free(cf_name);
-}
+ /* Attempt to save the file */
+ status = cf_save_packets(&cfile, file_name->str, file_type, compressed,
+ discard_comments, dont_reopen);
+ switch (status) {
+
+ case CF_WRITE_OK:
+ /* The save succeeded; we're done. */
+ /* Save the directory name for future file dialogs. */
+ dirname = get_dirname(file_name->str); /* Overwrites file_name->str */
+ set_last_open_dir(dirname);
+ /* If we discarded comments, redraw the packet list to reflect
+ any packets that no longer have comments. */
+ if (discard_comments)
+ packet_list_queue_draw();
+ break;
-void
-file_save_as_destroy(void)
-{
- if (file_save_as_w)
- window_destroy(file_save_as_w);
-}
+ case CF_WRITE_ERROR:
+ /* The save failed; let the user try again. */
+ continue;
-static void
-file_save_as_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
-{
- /* Note that we no longer have a "Save Capture File As" dialog box. */
- file_save_as_w = NULL;
+ case CF_WRITE_ABORTED:
+ /* The user aborted the save; just return. */
+ g_string_free(file_name, TRUE);
+ return;
+ }
+ }
+ g_string_free(file_name, TRUE);
+ return;
+ }
}
-/*
- * Update various dynamic parts of the range controls; called from outside
- * the file dialog code whenever the packet counts change.
- */
void
-file_export_specified_packets_update_dynamics(void)
+file_save_as_cmd_cb(GtkWidget *w _U_, gpointer data _U_)
{
- if (file_export_specified_packets_w == NULL) {
- /* We don't currently have a "Export Specified Packets..." dialog box up. */
- return;
- }
-
- range_update_dynamics(range_tb);
+ file_save_as_cmd(&cfile, FALSE, FALSE);
}
-void
-file_export_specified_packets_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
+#ifndef USE_WIN32_FILE_DIALOGS
+static gboolean
+gtk_export_specified_packets_file(GtkWidget *w _U_, GString *file_name, int *file_type,
+ gboolean *compressed, packet_range_t *range)
{
-#if _WIN32
- win32_export_specified_packets_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)));
-#else /* _WIN32 */
- GtkWidget *main_vb, *ft_hb, *ft_lb, *ft_combo_box, *range_fr, *compressed_cb;
-
- if (file_export_specified_packets_w != NULL) {
- /* There's already an "Export Specified Packets" dialog box; reactivate it. */
- reactivate_window(file_export_specified_packets_w);
- return;
- }
+ GtkWidget *file_export_specified_packets_w;
+ GtkWidget *main_vb, *ft_hb, *ft_lb, *ft_combo_box, *range_fr, *range_grid,
+ *compressed_cb;
+ char *cf_name;
+ gpointer ptr;
- /* Default to writing out all displayed packets, in the file's current format. */
+ if (!file_name || !file_type || !compressed || !range)
+ return FALSE;
- /* init the packet range */
- packet_range_init(&range);
- range.process_filtered = TRUE;
- range.include_dependents = TRUE;
+ /* Default to writing out all displayed packets, in the file's current format. */
/* build the file selection */
- file_export_specified_packets_w = file_selection_new ("Wireshark: Export Specified Packets",
- FILE_SELECTION_SAVE);
+ file_export_specified_packets_w = file_selection_new("Wireshark: Export Specified Packets",
+ GTK_WINDOW(top_level),
+ FILE_SELECTION_SAVE);
/* Container for each row of widgets */
- main_vb = gtk_vbox_new(FALSE, 5);
+ main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
file_selection_set_extra_widget(file_export_specified_packets_w, main_vb);
gtk_widget_show(main_vb);
gtk_box_pack_start(GTK_BOX(main_vb), range_fr, FALSE, FALSE, 0);
gtk_widget_show(range_fr);
- /* range table */
- range_tb = range_new(&range, TRUE);
- gtk_container_add(GTK_CONTAINER(range_fr), range_tb);
- gtk_widget_show(range_tb);
+ /* grid table */
+ range_grid = range_new(range, TRUE);
+ gtk_container_add(GTK_CONTAINER(range_fr), range_grid);
+ gtk_widget_show(range_grid);
/* File type row */
- ft_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(main_vb), ft_hb);
+ ft_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
+ gtk_box_pack_start(GTK_BOX(main_vb), ft_hb, FALSE, FALSE, 0);
+
gtk_widget_show(ft_hb);
ft_lb = gtk_label_new("File type:");
ft_combo_box = ws_combo_box_new_text_and_pointer();
/* Generate the list of file types we can save. */
- set_file_type_list(ft_combo_box, cfile.cd_t);
+ set_file_type_list(ft_combo_box, &cfile, FALSE);
gtk_box_pack_start(GTK_BOX(ft_hb), ft_combo_box, FALSE, FALSE, 0);
gtk_widget_show(ft_combo_box);
g_object_set_data(G_OBJECT(file_export_specified_packets_w), E_FILE_TYPE_COMBO_BOX_KEY, ft_combo_box);
/* dynamic values in the range frame */
- range_update_dynamics(range_tb);
+ range_update_dynamics(range_grid);
/* compressed */
compressed_cb = gtk_check_button_new_with_label("Compress with gzip");
- gtk_container_add(GTK_CONTAINER(ft_hb), compressed_cb);
+ gtk_box_pack_start(GTK_BOX(ft_hb), compressed_cb, FALSE, FALSE, 0);
gtk_widget_show(compressed_cb);
g_object_set_data(G_OBJECT(file_export_specified_packets_w), E_COMPRESSED_CB_KEY, compressed_cb);
- /* Ok: now "select" the default filetype which invokes file_export_specified_packets_select_file_type_cb */
- g_signal_connect(ft_combo_box, "changed", G_CALLBACK(file_export_specified_packets_select_file_type_cb), NULL);
+ /* Ok: now "select" the default filetype which invokes file_select_file_type_cb */
+ g_signal_connect(ft_combo_box, "changed", G_CALLBACK(file_select_file_type_cb), file_export_specified_packets_w);
ws_combo_box_set_active(GTK_COMBO_BOX(ft_combo_box), 0);
- g_signal_connect(file_export_specified_packets_w, "destroy",
- G_CALLBACK(file_export_specified_packets_destroy_cb), NULL);
-
- if (gtk_dialog_run(GTK_DIALOG(file_export_specified_packets_w)) == GTK_RESPONSE_ACCEPT) {
- file_export_specified_packets_ok_cb(file_export_specified_packets_w, file_export_specified_packets_w);
- } else {
- window_destroy(file_export_specified_packets_w);
+ cf_name = file_selection_run(file_export_specified_packets_w);
+ if (cf_name == NULL) {
+ /* User cancelled or closed the dialog. */
+ return FALSE;
}
-#endif /* _WIN32 */
-}
-
-static void
-file_export_specified_packets_select_file_type_cb(GtkWidget *w, gpointer data _U_)
-{
- int new_file_type;
- gpointer ptr;
- GtkWidget *compressed_cb;
- if (! ws_combo_box_get_active_pointer(GTK_COMBO_BOX(w), &ptr)) {
+ if (! ws_combo_box_get_active_pointer(GTK_COMBO_BOX(ft_combo_box), &ptr)) {
g_assert_not_reached(); /* Programming error: somehow nothing is active */
}
- new_file_type = GPOINTER_TO_INT(ptr);
-
- compressed_cb = (GtkWidget *)g_object_get_data(G_OBJECT(file_export_specified_packets_w), E_COMPRESSED_CB_KEY);
- if (!wtap_dump_can_compress(new_file_type)) {
- /* Can't compress this file type; turn off compression and make
- the compression checkbox insensitive. */
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compressed_cb), FALSE);
- gtk_widget_set_sensitive(compressed_cb, FALSE);
- } else
- gtk_widget_set_sensitive(compressed_cb, TRUE);
-}
-
-static void
-file_export_specified_packets_exists_answered_cb(gpointer dialog _U_, gint btn, gpointer data)
-{
- gchar *cf_name;
+ *file_type = GPOINTER_TO_INT(ptr);
+ *compressed = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compressed_cb));
- cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(data));
+ /* We've crossed the Rubicon; get rid of the file export box. */
+ window_destroy(GTK_WIDGET(file_export_specified_packets_w));
- switch(btn) {
- case(ESD_BTN_OK):
- /* save file */
- file_export_specified_packets_cb(NULL, data);
- break;
- case(ESD_BTN_CANCEL):
- /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
- * as this will prevent the user from closing the now existing error
- * message, simply close the dialog (this is the best we can do here). */
- if (file_export_specified_packets_w)
- window_destroy(file_export_specified_packets_w);
- break;
- default:
- g_assert_not_reached();
- }
- g_free(cf_name);
+ g_string_printf(file_name, "%s", cf_name);
+ g_free(cf_name);
+ return TRUE;
}
+#endif /* USE_WIN32_FILE_DIALOGS */
-/* user pressed "Export Specified Packets" dialog "Ok" button */
-static void
-file_export_specified_packets_ok_cb(GtkWidget *w _U_, gpointer fs) {
- gchar *cf_name;
- gpointer dialog;
-
- cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
-
- /* Perhaps the user specified a directory instead of a file.
- Check whether they did. */
- if (test_for_directory(cf_name) == EISDIR) {
- /* It's a directory - set the file selection box to display that
- directory, and leave the selection box displayed. */
- set_last_open_dir(cf_name);
- g_free(cf_name);
- file_selection_set_current_folder(fs, get_last_open_dir());
- return;
- }
+/*
+ * <platform/>_export_specified_packets_file routines should upon entry...
+ * Set the path and fill in the filename if the path+filename is provided.
+ * ...and upon exit...
+ * Not initialize range.
+ * Return TRUE on "OK" and "FALSE" on "Cancel".
+ * Close the window.
+ */
- /* Check whether the range is valid. */
- if (!range_check_validity(&range)) {
- /* The range isn't valid; don't dismiss the open dialog box,
- just leave it around so that the user can, after they
- dismiss the alert box popped up for the error, try again. */
- g_free(cf_name);
- /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
- * as this will prevent the user from closing the now existing error
- * message, simply close the dialog (this is the best we can do here). */
- if (file_save_as_w)
- window_destroy(GTK_WIDGET (fs));
+void
+file_export_specified_packets_cmd_cb(GtkWidget *w _U_, gpointer data _U_) {
+ GString *file_name = g_string_new("");
+ int file_type;
+ gboolean compressed;
+ packet_range_t range;
+ cf_write_status_t status;
+ gchar *dirname;
+ gchar *display_basename;
+ GtkWidget *msg_dialog;
- return;
- }
+ /* init the packet range */
+ packet_range_init(&range, &cfile);
+ range.process_filtered = TRUE;
+ range.include_dependents = TRUE;
/*
- * Check that the from file is not the same as to file
- * We do it here so we catch all cases ...
- * Unfortunately, the file requester gives us an absolute file
- * name and the read file name may be relative (if supplied on
- * the command line). From Joerg Mayer.
+ * Loop until the user either selects a file or gives up.
*/
- if (files_identical(cfile.filename, cf_name)) {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- "%sCapture file: \"%s\" identical to loaded file!%s\n\n"
- "Please choose a different filename.",
- simple_dialog_primary_start(), cf_name, simple_dialog_primary_end());
- g_free(cf_name);
- /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
- * as this will prevent the user from closing the now existing error
- * message, simply close the dialog (this is the best we can do here). */
- if (file_export_specified_packets_w)
- window_destroy(GTK_WIDGET (fs));
+ for (;;) {
+#ifdef USE_WIN32_FILE_DIALOGS
+ if (win32_export_specified_packets_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)),
+ &cfile, file_name, &file_type, &compressed, &range)) {
+#else /* USE_WIN32_FILE_DIALOGS */
+ if (gtk_export_specified_packets_file(w, file_name, &file_type, &compressed, &range)) {
+#endif /* USE_WIN32_FILE_DIALOGS */
+
+ /* Check whether the range is valid. */
+ if (!range_check_validity_modal(top_level, &range)) {
+ /* The range isn't valid; the user was told that, and dismissed
+ the dialog telling them that, so let them fix the range
+ and try again, or cancel. */
+ continue;
+ }
- return;
- }
+ /* XXX - Check for comments? */
+
+ /*
+ * Check that we're not going to save on top of the current
+ * capture file.
+ * We do it here so we catch all cases ...
+ * Unfortunately, the file requester gives us an absolute file
+ * name and the read file name may be relative (if supplied on
+ * the command line). From Joerg Mayer.
+ */
+ if (files_identical(cfile.filename, file_name->str)) {
+ display_basename = g_filename_display_basename(file_name->str);
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ "The file \"%s\" is the capture file from which you're exporting the packets.",
+ display_basename);
+ g_free(display_basename);
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msg_dialog),
+ "You cannot export packets on top of the current capture file.");
+ gtk_dialog_run(GTK_DIALOG(msg_dialog));
+ gtk_widget_destroy(msg_dialog);
+ continue;
+ }
- /* don't show the dialog while saving (or asking) */
- gtk_widget_hide(GTK_WIDGET (fs));
+ file_add_extension(file_name, file_type, compressed);
- /* it the file doesn't exist, simply try to write the packets to it */
- if (!file_exists(cf_name)) {
- file_export_specified_packets_cb(NULL, fs);
- g_free(cf_name);
- return;
- }
+#ifndef _WIN32
+ /* If the file exists and it's user-immutable or not writable,
+ ask the user whether they want to override that. */
+ if (!file_target_unwritable_ui(top_level, file_name->str)) {
+ /* They don't. Let them try another file name or cancel. */
+ continue;
+ }
+#endif
- /* The file exists. Ask the user if they want to overwrite it. */
- dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_OK_CANCEL,
- "%s"
- "A file named \"%s\" already exists. Do you want to replace it?"
- "%s\n\n"
- "A file or folder with the same name already exists in that folder. "
- "Replacing it will overwrite its current contents.",
- simple_dialog_primary_start(), cf_name, simple_dialog_primary_end());
- simple_dialog_set_cb(dialog, file_export_specified_packets_exists_answered_cb, fs);
+ /* Attempt to export the file */
+ status = cf_export_specified_packets(&cfile, file_name->str, &range, file_type,
+ compressed);
+ switch (status) {
- g_free(cf_name);
-}
+ case CF_WRITE_OK:
+ /* The write succeeded; get rid of the file selection box. */
+ /* cf_export_specified_packets() might already closed our dialog! */
-/* all tests ok, we only have to write out the packets */
-/* (and probably continue with a pending operation) */
-static void
-file_export_specified_packets_cb(GtkWidget *w _U_, gpointer fs) {
- GtkWidget *ft_combo_box;
- GtkWidget *compressed_cb;
- gchar *cf_name;
- gchar *dirname;
- gpointer ptr;
- int file_type;
- gboolean compressed;
-
- cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
+ /* Save the directory name for future file dialogs.
+ XXX - should there be separate ones for "Save As" and
+ "Export Specified Packets"? */
+ dirname = get_dirname(file_name->str); /* Overwrites file_name->str */
+ set_last_open_dir(dirname);
+ break;
- compressed_cb = (GtkWidget *)g_object_get_data(G_OBJECT(fs), E_COMPRESSED_CB_KEY);
- ft_combo_box = (GtkWidget *)g_object_get_data(G_OBJECT(fs), E_FILE_TYPE_COMBO_BOX_KEY);
+ case CF_WRITE_ERROR:
+ /* The save failed; let the user try again. */
+ continue;
- if (! ws_combo_box_get_active_pointer(GTK_COMBO_BOX(ft_combo_box), &ptr)) {
- g_assert_not_reached(); /* Programming error: somehow nothing is active */
- }
- file_type = GPOINTER_TO_INT(ptr);
- compressed = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compressed_cb));
-
- /* Write out the specified packets to the file with the specified name. */
- if (cf_export_specified_packets(&cfile, cf_name, &range, file_type,
- compressed) != CF_OK) {
- /* The write failed; don't dismiss the open dialog box,
- just leave it around so that the user can, after they
- dismiss the alert box popped up for the error, try again. */
- g_free(cf_name);
- /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
- * as this will prevent the user from closing the now existing error
- * message, simply close the dialog (this is the best we can do here). */
- if (file_export_specified_packets_w)
- window_destroy(GTK_WIDGET (fs));
+ case CF_WRITE_ABORTED:
+ /* The user aborted the save; just return. */
+ g_string_free(file_name, TRUE);
+ return;
+ }
+ }
+ g_string_free(file_name, TRUE);
return;
}
-
- /* The write succeeded; get rid of the file selection box. */
- /* cf_export_specified_packets() might already closed our dialog! */
- if (file_export_specified_packets_w)
- window_destroy(GTK_WIDGET (fs));
-
- /* Save the directory name for future file dialogs.
- XXX - should there be separate ones for "Save As" and
- "Export Specified Packets"? */
- dirname = get_dirname(cf_name); /* Overwrites cf_name */
- set_last_open_dir(dirname);
- g_free(cf_name);
}
+
void
-file_export_specified_packets_destroy(void)
+file_export_pdu_ok_cb(GtkWidget *widget _U_, gpointer data)
{
- if (file_export_specified_packets_w)
- window_destroy(file_export_specified_packets_w);
-}
+ GtkWidget *msg_dialog;
+ gchar *display_basename;
+ gint response;
+
+ if (prefs.gui_ask_unsaved && cf_has_unsaved_data(&cfile)) {
+ if (cfile.is_tempfile) {
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level),
+ (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT),
+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+ "Do you want to save the captured packets before exporting PDUs?");
+
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msg_dialog),
+ "After the export, the captured packets will no longer be accessible.");
+ }
+ else {
+ display_basename = g_filename_display_basename(cfile.filename);
+ msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level),
+ (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT),
+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+ "Do you want to save the changes you've made "
+ "to the capture file \"%s\" before exporting PDUs from it?",
+ display_basename);
+ g_free(display_basename);
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msg_dialog),
+ "Unsaved changes will be discarded when PDUs are exported.");
+ }
-static void
-file_export_specified_packets_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
-{
- /* Note that we no longer have a "Export Specified Packets" dialog box. */
- file_export_specified_packets_w = NULL;
+ gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
+ WIRESHARK_STOCK_DONT_SAVE, GTK_RESPONSE_CLOSE);
+ gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
+ WIRESHARK_STOCK_SAVE, GTK_RESPONSE_ACCEPT);
+ gtk_dialog_set_alternative_button_order(GTK_DIALOG(msg_dialog),
+ GTK_RESPONSE_ACCEPT,
+ GTK_RESPONSE_CANCEL,
+ GTK_RESPONSE_CLOSE,
+ -1);
+ gtk_dialog_set_default_response(GTK_DIALOG(msg_dialog), GTK_RESPONSE_ACCEPT);
+
+ response = gtk_dialog_run(GTK_DIALOG(msg_dialog));
+ gtk_widget_destroy(msg_dialog);
+
+ switch (response) {
+ case GTK_RESPONSE_CLOSE:
+ /* nothing to do, user chose to discard the unsaved data */
+ break;
+
+ case GTK_RESPONSE_ACCEPT:
+ /* save the file but don't close it */
+ do_file_save(&cfile, FALSE);
+ break;
+
+ case GTK_RESPONSE_CANCEL:
+ case GTK_RESPONSE_NONE:
+ case GTK_RESPONSE_DELETE_EVENT:
+ default:
+ /* don't do the export. */
+ return;
+ }
+ }
+
+ export_pdu_action(data);
}
+
/* Reload a file using the current read and display filters */
void
file_reload_cmd_cb(GtkWidget *w _U_, gpointer data _U_) {
color_global_cb(GtkWidget *widget _U_, gpointer data)
{
GtkWidget *fs_widget = (GtkWidget *)data;
- gchar *path;
+ gchar *path;
/* decide what file to open (from dfilter code) */
path = get_datafile_path("colorfilters");
void
file_color_import_cmd_cb(GtkWidget *color_filters, gpointer filter_list _U_)
{
-#if _WIN32
+#ifdef USE_WIN32_FILE_DIALOGS
win32_import_color_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), color_filters);
-#else /* _WIN32 */
- GtkWidget *main_vb, *cfglobal_but;
+#else /* USE_WIN32_FILE_DIALOGS */
+ GtkWidget *main_vb, *cfglobal_but;
+ gchar *cf_name, *s;
/* No Apply button, and "OK" just sets our text widget, it doesn't
activate it (i.e., it doesn't cause us to try to open the file). */
- if (file_color_import_w != NULL) {
- /* There's already an "Import Color Filters" dialog box; reactivate it. */
- reactivate_window(file_color_import_w);
- return;
- }
-
file_color_import_w = file_selection_new("Wireshark: Import Color Filters",
+ GTK_WINDOW(top_level),
FILE_SELECTION_OPEN);
/* Container for each row of widgets */
- main_vb = gtk_vbox_new(FALSE, 3);
+ main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
file_selection_set_extra_widget(file_color_import_w, main_vb);
gtk_widget_show(main_vb);
-
cfglobal_but = gtk_button_new_with_label("Global Color Filter File");
- gtk_container_add(GTK_CONTAINER(main_vb), cfglobal_but);
+ gtk_box_pack_start(GTK_BOX(main_vb), cfglobal_but, FALSE, FALSE, 0);
g_signal_connect(cfglobal_but, "clicked",
G_CALLBACK(color_global_cb), file_color_import_w);
gtk_widget_show(cfglobal_but);
- g_signal_connect(file_color_import_w, "destroy",
- G_CALLBACK(file_color_import_destroy_cb), NULL);
-
+ /*
+ * Loop until the user either selects a file or gives up.
+ */
+ for (;;) {
+ cf_name = file_selection_run(file_color_import_w);
+ if (cf_name == NULL) {
+ /* User cancelled or closed the dialog. */
+ return;
+ }
- if (gtk_dialog_run(GTK_DIALOG(file_color_import_w)) == GTK_RESPONSE_ACCEPT)
- {
- file_color_import_ok_cb(file_color_import_w, color_filters);
- }
- else window_destroy(file_color_import_w);
-#endif /* _WIN32 */
-}
+ /* Try to open the color filter file. */
+ if (!color_filters_import(cf_name, color_filters)) {
+ /* We couldn't open it; don't dismiss the open dialog box,
+ just leave it around so that the user can, after they
+ dismiss the alert box popped up for the open error,
+ try again. */
+ g_free(cf_name);
+ continue;
+ }
-static void
-file_color_import_ok_cb(GtkWidget *w, gpointer color_filters) {
- gchar *cf_name, *s;
- GtkWidget *fs = gtk_widget_get_toplevel(w);
+ /* We've crossed the Rubicon; get rid of the file selection box. */
+ window_destroy(GTK_WIDGET(file_color_import_w));
- cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
+ /* Save the name of the containing directory specified in the path name,
+ if any; we can write over cf_name, which is a good thing, given that
+ "get_dirname()" does write over its argument. */
+ s = get_dirname(cf_name);
+ set_last_open_dir(s);
- /* Perhaps the user specified a directory instead of a file.
- Check whether they did. */
- if (test_for_directory(cf_name) == EISDIR) {
- /* It's a directory - set the file selection box to display that
- directory, don't try to open the directory as a color filter file. */
- set_last_open_dir(cf_name);
- g_free(cf_name);
- file_selection_set_current_folder(fs, get_last_open_dir());
- return;
- }
-
- /* Try to open the color filter file. */
-
- if (!color_filters_import(cf_name, color_filters)) {
- /* We couldn't open it; don't dismiss the open dialog box,
- just leave it around so that the user can, after they
- dismiss the alert box popped up for the open error,
- try again. */
g_free(cf_name);
- /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
- * as this will prevent the user from closing the now existing error
- * message, simply close the dialog (this is the best we can do here). */
- window_destroy(GTK_WIDGET (fs));
-
return;
}
-
- /* We've crossed the Rubicon; get rid of the file selection box. */
- window_destroy(GTK_WIDGET (fs));
-
- /* Save the name of the containing directory specified in the path name,
- if any; we can write over cf_name, which is a good thing, given that
- "get_dirname()" does write over its argument. */
- s = get_dirname(cf_name);
- set_last_open_dir(s);
-
- g_free(cf_name);
-}
-
-static void
-file_color_import_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
-{
- /* Note that we no longer have a "Open Capture File" dialog box. */
- file_color_import_w = NULL;
+#endif /* USE_WIN32_FILE_DIALOGS */
}
-static GtkWidget *file_color_export_w;
/*
* Set the "Export only selected filters" toggle button as appropriate for
* the current output file type and count of selected filters.
static void
color_set_export_selected_sensitive(GtkWidget * cfselect_cb)
{
- if (file_color_export_w == NULL) {
- /* We don't currently have an "Export" dialog box up. */
- return;
- }
-
/* We can request that only the selected filters be saved only if
there *are* selected filters. */
if (color_selected_count() != 0)
static void
color_toggle_selected_cb(GtkWidget *widget, gpointer data _U_)
{
- color_selected = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget));
+ color_selected = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
}
void
file_color_export_cmd_cb(GtkWidget *w _U_, gpointer filter_list)
{
-#if _WIN32
- win32_export_color_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), filter_list);
-#else /* _WIN32 */
+#ifdef USE_WIN32_FILE_DIALOGS
+ win32_export_color_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), &cfile, filter_list);
+#else /* USE_WIN32_FILE_DIALOGS */
+ GtkWidget *file_color_export_w;
GtkWidget *main_vb, *cfglobal_but;
GtkWidget *cfselect_cb;
-
- if (file_color_export_w != NULL) {
- /* There's already an "Color Filter Export" dialog box; reactivate it. */
- reactivate_window(file_color_export_w);
- return;
- }
+ gchar *cf_name;
+ gchar *dirname;
color_selected = FALSE;
file_color_export_w = file_selection_new("Wireshark: Export Color Filters",
+ GTK_WINDOW(top_level),
FILE_SELECTION_SAVE);
/* Container for each row of widgets */
- main_vb = gtk_vbox_new(FALSE, 3);
+ main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
file_selection_set_extra_widget(file_color_export_w, main_vb);
gtk_widget_show(main_vb);
cfselect_cb = gtk_check_button_new_with_label("Export only selected filters");
- gtk_container_add(GTK_CONTAINER(main_vb), cfselect_cb);
+ gtk_box_pack_start(GTK_BOX(main_vb), cfselect_cb, FALSE, FALSE, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cfselect_cb), FALSE);
g_signal_connect(cfselect_cb, "toggled",
G_CALLBACK(color_toggle_selected_cb), NULL);
color_set_export_selected_sensitive(cfselect_cb);
cfglobal_but = gtk_button_new_with_label("Global Color Filter File");
- gtk_container_add(GTK_CONTAINER(main_vb), cfglobal_but);
+ gtk_box_pack_start(GTK_BOX(main_vb), cfglobal_but, FALSE, FALSE, 0);
g_signal_connect(cfglobal_but, "clicked",
G_CALLBACK(color_global_cb), file_color_export_w);
gtk_widget_show(cfglobal_but);
- g_signal_connect(file_color_export_w, "destroy",
- G_CALLBACK(file_color_export_destroy_cb), NULL);
+ /*
+ * Loop until the user either selects a file or gives up.
+ */
+ for (;;) {
+ cf_name = file_selection_run(file_color_export_w);
+ if (cf_name == NULL) {
+ /* User cancelled or closed the dialog. */
+ return;
+ }
- if (gtk_dialog_run(GTK_DIALOG(file_color_export_w)) == GTK_RESPONSE_ACCEPT)
- {
- file_color_export_ok_cb(file_color_export_w, filter_list);
- }
- else window_destroy(file_color_export_w);
-#endif /* _WIN32 */
-}
+#ifndef _WIN32
+ /* If the file exists and it's user-immutable or not writable,
+ ask the user whether they want to override that. */
+ if (!file_target_unwritable_ui(file_color_export_w, cf_name)) {
+ /* They don't. Let them try another file name or cancel. */
+ g_free(cf_name);
+ continue;
+ }
+#endif
-static void
-file_color_export_ok_cb(GtkWidget *w, gpointer filter_list) {
- gchar *cf_name;
- gchar *dirname;
- GtkWidget *fs = gtk_widget_get_toplevel(w);
+ /* Write out the filters (all, or only the ones that are currently
+ displayed or selected) to the file with the specified name. */
+ if (!color_filters_export(cf_name, (GSList *)filter_list, color_selected)) {
+ /* The write failed; don't dismiss the open dialog box,
+ just leave it around so that the user can, after they
+ dismiss the alert box popped up for the error, try again. */
+ g_free(cf_name);
+ continue;
+ }
- cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
+ /* The write succeeded; get rid of the file selection box. */
+ window_destroy(GTK_WIDGET(file_color_export_w));
- /* Perhaps the user specified a directory instead of a file.
- Check whether they did. */
- if (test_for_directory(cf_name) == EISDIR) {
- /* It's a directory - set the file selection box to display that
- directory, and leave the selection box displayed. */
- set_last_open_dir(cf_name);
- g_free(cf_name);
- file_selection_set_current_folder(fs, get_last_open_dir());
- return;
+ /* Save the directory name for future file dialogs. */
+ dirname = get_dirname(cf_name); /* Overwrites cf_name */
+ set_last_open_dir(dirname);
+ g_free(cf_name);
}
-
- /* Write out the filters (all, or only the ones that are currently
- displayed or selected) to the file with the specified name. */
-
- if (!color_filters_export(cf_name, filter_list, color_selected))
- {
- /* The write failed; don't dismiss the open dialog box,
- just leave it around so that the user can, after they
- dismiss the alert box popped up for the error, try again. */
- g_free(cf_name);
-
- /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
- * as this will prevent the user from closing the now existing error
- * message, simply close the dialog (this is the best we can do here). */
- window_destroy(GTK_WIDGET (fs));
-
- return;
- }
-
- /* The write succeeded; get rid of the file selection box. */
- window_destroy(GTK_WIDGET (fs));
-
- /* Save the directory name for future file dialogs. */
- dirname = get_dirname(cf_name); /* Overwrites cf_name */
- set_last_open_dir(dirname);
- g_free(cf_name);
+#endif /* USE_WIN32_FILE_DIALOGS */
}
-static void
-file_color_export_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
-{
- file_color_export_w = NULL;
-}
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */
git.samba.org / metze / wireshark / wip.git / blobdiff