diff src/gtk/gftp-gtk.h @ 341:eedc2c5727fa

2003-12-28 Brian Masney <[e-mail]> **** NOTE: this commit breaks a lot of functionality in gftp. I **** **** still have more work to do on this. Please don't email me **** **** saying that the CVS code is broken. **** * lib/bookmark.c lib/gftp.h lib/local.c lib/options.h lib/rfc2068.c lib/rfc959.c lib/sshv2.c - moved the use_threads option from the request structure over to the protocol declaration in options.h. * lib/options.h src/gtk/gftp-gtk.c - added cmd_in_gui option. When this option is enabled, a new toolbar will be shown in the GTK+ port that will allow you to control the GUI by entering manual commands. * src/Makefile.am - added uicommon directory * src/gtk/Makefile.am src/text/Makefile.am - link in the uicommon library. * src/uicommon/* src/text/gftp-text.c - moved most of the functionality of the text port over to the uicommon directory. Made this code a little more generic so that the GTK+ port can have a text interface associated with it. * src/gtk/gtkui.c src/gtk/gftp-gtk.c src/gtk/mkdir_dialog.c src/gtk/rename_dialog.c src/gtk/menu-items.c src/gtk/misc-gtk.c - started to clean up the callback functions and make them more tightly integrated with the uicommon code. * src/gtk/bookmarks.c src/gtk/chmod_dialog.c src/gtk/delete_dialog.c src/gtk/gftp-gtk.c src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/transfer.c - s/refresh/gftpui_refresh/g s/jmp_environment/gftpui_common_jmp_environment/g s/request->use_threads/gftpui_common_use_threads (request)/g * src/gtk/options_dialog.c (apply_changes) - whenever the options are saved, check to see if the command entry needs to be shown or hidden.

--- a/src/gtk/gftp-gtk.h	Sat Dec 20 22:00:04 2003 +0000
+++ b/src/gtk/gftp-gtk.h	Sun Dec 28 16:02:07 2003 +0000
@@ -23,6 +23,7 @@
 #define __GFTP_GTK_H
 
 #include "../../lib/gftp.h"
+#include "../uicommon/gftpui.h"
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <pthread.h>
@@ -171,7 +172,8 @@
 
 extern gftp_window_data window1, window2, * other_wdata, * current_wdata;
 extern GtkWidget * stop_btn, * hostedit, * useredit, * passedit,
-                 * portedit, * logwdw, * dlwdw, * protocol_menu, * optionmenu;
+                 * portedit, * logwdw, * dlwdw, * protocol_menu, * optionmenu,
+                 * gftpui_command_widget;
 extern GtkAdjustment * logwdw_vadj;
 #if GTK_MAJOR_VERSION > 1
 extern GtkTextMark * logwdw_textmark;
@@ -182,8 +184,6 @@
 extern GtkItemFactory * factory;
 extern pthread_mutex_t transfer_mutex, log_mutex;
 extern gftp_graphic * gftp_icon;
-extern sigjmp_buf jmp_environment;
-extern volatile int use_jmp_environment;
 extern pthread_t main_thread_id;
 extern GList * viewedit_processes;
 extern volatile sig_atomic_t viewedit_process_done;
@@ -241,6 +241,29 @@
 void stop_button				( GtkWidget * widget,
 						  gpointer data );
 
+void gftpui_show_or_hide_command 		( void );
+
+/* gtkui.c */
+void gftpui_run_command 			( GtkWidget * widget,
+						  gpointer data );
+
+void gftpui_run_function_callback 		( gftp_window_data * wdata,
+						  gftp_dialog_data * ddata );
+
+void gftpui_run_function_cancel_callback 	( gftp_window_data * wdata,
+						  gftp_dialog_data * ddata );
+
+void gftpui_mkdir_dialog 			( gpointer data );
+
+void gftpui_rename_dialog			( gpointer data );
+
+void gftpui_site_dialog 			( gpointer data );
+
+int gftpui_run_chdir 				( gpointer uidata,
+						  char *directory );
+
+void gftpui_chdir_dialog 			( gpointer data );
+
 /* menu_items.c */
 void change_setting 				( gftp_window_data *wdata,
 						  int menuitem,
@@ -264,13 +287,9 @@
 
 void deselectall 				( gpointer data );
 
-void site_dialog 				( gpointer data );
-
 int chdir_edit					( GtkWidget * widget,
 						  gpointer data );
 
-int chdir_dialog 				( gpointer data );
-
 void clearlog 					( gpointer data );
 
 void viewlog 					( gpointer data );
@@ -293,8 +312,6 @@
 						  const char *string,
 						  ... ) GFTP_LOG_FUNCTION_ATTRIBUTES;
 
-void refresh 					( gftp_window_data * wdata );
-
 void update_window_info				( void );
 
 void update_window				( gftp_window_data * wdata );
@@ -359,22 +376,13 @@
 
 void update_directory_download_progress 	( gftp_transfer * transfer );
 
-void *generic_thread 				( void * (*func) 
-                                                         (void *), 
-						  gftp_window_data * wdata );
-
 int progress_timeout 				( gpointer data );
 
 void display_cached_logs			( void );
 
-RETSIGTYPE signal_handler			(int signo);
-
 char * get_xpm_path 				( char *filename, 
 						  int quit_on_err );
 
-/* mkdir_dialog.c */
-void mkdir_dialog 				( gpointer data );
-
 /* options_dialog.c */
 void options_dialog 				( gpointer data );
 
@@ -383,9 +391,6 @@
 
 void gftp_gtk_save_bookmark_options 		( gftp_bookmarks_var * bm );
 
-/* rename_dialog.c */
-void rename_dialog				( gpointer data );
-
 /* transfer.c */
 int ftp_list_files				( gftp_window_data * wdata,
 						  int usecache );