1998-03-06 Federico Mena Quintero <federico@nuclecu.unam.mx>

* gscreen.c (panel_create_filter): The filter control is now a
nice GnomeEntry.  It does not work due to gmc trapping key events;
I'll look into it tomorrow.
(internal_select_item): Fixed broken behavior.  Now uses GtkCList properly.
default_filters: new structure with pre-defined glob patterns.
This is actually broken, because it will only work when
easy_patterns is enabled.  I have to figure a way to make it work
with regexp mode as well.

gnome/ChangeLog

@@ -1,3 +1,14 @@
+1998-03-06  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gscreen.c (panel_create_filter): The filter control is now a
+	nice GnomeEntry.  It does not work due to gmc trapping key events;
+	I'll look into it tomorrow.
+	(internal_select_item): Fixed broken behavior.  Now uses GtkCList properly.
+	default_filters: new structure with pre-defined glob patterns.
+	This is actually broken, because it will only work when
+	easy_patterns is enabled.  I have to figure a way to make it work
+	with regexp mode as well.
+
 Thu Mar  5 23:54:58 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* gdesktop.c (drop_on_panel): New function;  Used by the directory
@@ -13,6 +24,13 @@ Thu Mar  5 23:54:58 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 	the drag and drop code.  The little square at the end did not make
 	much sense as a drop/drag spot.
 	
+1998-03-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gmain.h: Added prototype for x_filter_changed().
+	Added #include "panel.h".
+
+	* gconf.h (PORT_HAS_FILTER_CHANGED): New flag for conditional compilation.
+
 Wed Mar  4 22:43:00 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* gtools.c (query_dialog): Rewritten to use the MC dialog/widget code. 

gnome/gconf.h

@@ -12,6 +12,7 @@
 #define PORT_WANTS_GET_SORT_FN      1
 #define PORT_HAS_LLINES             1
 #define PORT_HAS_LOAD_HINT          1
+#define PORT_HAS_FILTER_CHANGED     1
 
 #define mi_getch() fprintf (stderr, "mi_getch is not implemented in this port\n")
 #define frontend_run_dlg(x)        gtkrundlg_event (x)

gnome/gmain.h

@@ -1,6 +1,7 @@
 #ifndef __GMC_MAIN_H
 #define __GMC_MAIN_H
 #include "dlg.h"
+#include "panel.h"
 #include "widget.h"
 
 int xtoolkit_init (int *argc, char *argv []);
@@ -20,6 +21,7 @@ int x_create_label (Dlg_head *h, widget_data parent, WLabel *l);
 int x_create_input (Dlg_head *h, widget_data parent, WInput *in);
 int x_create_listbox (Dlg_head *h, widget_data parent, WListbox *l);
 int x_create_buttonbar (Dlg_head *h, widget_data parent, WButtonBar *bb);
+void x_filter_changed (WPanel *panel);
 void x_list_insert (WListbox *l, WLEntry *p, WLEntry *e);
 void x_redefine_label (WButtonBar *bb, int idx);
 void x_add_widget (Dlg_head *h, Widget_Item *w);

gnome/gscreen.c

@@ -160,22 +160,11 @@ x_panel_select_item (WPanel *panel, int index, int value)
 	/* Not required */
 }
 
-/* FIXME: this variable is used by x_select_item() to indicate the
- * lack of idempotence in gtk_clist_select_row().  I think it can be
- * removed once Jay fixes CList :-)
- * - Federico
- */
-
-static int will_select;
-
 void
 x_select_item (WPanel *panel)
 {
 	GtkCList *clist = GTK_CLIST (panel->list);
 
-	if (will_select)
-		return;
-
 	gtk_clist_select_row (clist, panel->selected, 0);
 
 	if (!gtk_clist_row_is_visible (clist, panel->selected))
@@ -191,14 +180,8 @@ x_unselect_item (WPanel *panel)
 void
 x_filter_changed (WPanel *panel)
 {
-	if (panel->filter){
+	gtk_entry_set_text (GTK_ENTRY (panel->filter_w),
-		char *string;
+			    panel->filter ? panel->filter : "");
-		
-		string = g_copy_strings ("Filter: ", panel->filter, NULL);
-		gtk_label_set (GTK_LABEL (panel->filter), string);
-		g_free (string);
-	} else
-		gtk_label_set (GTK_LABEL (panel->filter), "No filter");
 }
 
 void
@@ -449,37 +432,18 @@ file_popup (GdkEvent *event, WPanel *panel, char *filename)
 static void
 internal_select_item (GtkWidget *file_list, WPanel *panel, int row)
 {
-#if 0
-	/* FIXME:
-	 *
-	 * This is #ifdef'ed out to work around a bug in GtkCList.  If
-	 * a row is selected and you call gtk_clist_select_row() on
-	 * it, the CList will *un*select that row.  Jay already told
-	 * me that he has to fix this.  When it is fixed, this #ifdef
-	 * should be removed.
-	 *
-	 * BTW, the thing will be unselected even if we return here,
-	 * because the class' signal handler is still pending.
-	 */
-
-	if (panel->selected == row)
-		return;
-#endif
-
-	will_select = 1;
-
 	unselect_item (panel);
 	panel->selected = row;
 	gtk_signal_handler_block_by_data (GTK_OBJECT (file_list), panel);
 	select_item (panel);
 	gtk_signal_handler_unblock_by_data (GTK_OBJECT (file_list), panel);
-
-	will_select = 0;
 }
 
 static void
 panel_file_list_select_row (GtkWidget *file_list, int row, int column, GdkEvent *event, WPanel *panel)
 {
+	printf ("panel_file_list_select_row\n");
+	
 	if (!event) {
 		internal_select_item (file_list, panel, row);
 		return;
@@ -522,6 +486,8 @@ panel_file_list_compute_lines (GtkCList *file_list, WPanel *panel, int height)
 static void
 panel_file_list_size_allocate_hook (GtkWidget *file_list, GtkAllocation *allocation, WPanel *panel)
 {
+	printf ("Aqui\n");
+
 	panel_file_list_configure_contents (file_list, panel, allocation->width, allocation->height);
 	
 	panel_file_list_compute_lines (GTK_CLIST (file_list), panel, allocation->height);
@@ -585,10 +551,8 @@ panel_configure_file_list (WPanel *panel, GtkWidget *file_list)
 			    GTK_SIGNAL_FUNC (panel_file_list_column_callback), panel);
 
 	/* Configure the CList */
-	/* We use GTK_SELECTION_MULTIPLE because we manage the selection explicitly.
+
-	 * So we want as little interference from Gtk as possible.
+	gtk_clist_set_selection_mode (cl, GTK_SELECTION_BROWSE);
-	 */
-	gtk_clist_set_selection_mode (cl, GTK_SELECTION_MULTIPLE);
 	gtk_clist_set_policy (cl, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	
 	for (i = 0, format = panel->format; format; format = format->next){
@@ -797,28 +761,84 @@ panel_create_cwd (WPanel *panel)
 }
 
 static void
-panel_change_filter (GtkWidget *button, WPanel *panel)
+panel_change_filter (GtkWidget *entry, WPanel *panel)
 {
-	fprintf (stderr, "Change filter: not yet hooked\n");
+	char *reg_exp;
+
+	/* This functionality is duplicated from set_panel_filter().
+	 * We cannot just call set_panel_filter() because in the Gnome
+	 * version we have a nice GnomeEntry in the panel to set the
+	 * filters, instead of having the user have to click on a menu
+	 * item to bring up a "set filter" dialog box.
+	 */
+
+	printf ("panel_change_filter\n");
+
+	reg_exp = gtk_entry_get_text (GTK_ENTRY (entry));
+
+	if (panel->filter) {
+		g_free (panel->filter);
+		panel->filter = NULL;
+	}
+
+	if (!((reg_exp[0] == '*') && (reg_exp[1] == 0)))
+		panel->filter = g_strdup (reg_exp);
+
+	reread_cmd ();
 }
 
-static GtkWidget *
+/* FIXME!!!  These patterns only work if we are using glob (easy_patterns).
-panel_create_filter (WPanel *panel, GtkWidget **label)
+ * Find out a way to either change the contents of the history list or convert
-{
+ * them to a regexp if the user selects them when easy_patterns is activated.
-	GtkWidget *filter;
+ */
 
-	*label = gtk_label_new ("");
+static char *default_filters[] = {
-	gtk_widget_show (*label);
+	"*",
-	filter = gtk_button_new ();
+	"*.(txt|tex|doc|ps|pdf|rtf)",
-	gtk_container_add (GTK_CONTAINER (filter), *label);
+	"*.(html|htm|sgml|sgm)",
-	gtk_signal_connect (GTK_OBJECT (filter), "clicked", GTK_SIGNAL_FUNC (panel_change_filter), panel);
+	"*.(gif|jpg|jpeg|png|tif|tiff|x[bp]m|p[bgpn]m|xcf|tga|rgb|iff|lbm|ilbm|bmp|pcx|pic|pict|psd|gbr|pat|ico|fig|cgm|rle|fits|)",
-	return filter;
+	"*.(mpg|mpeg|mov|avi|fl[ichx]|dl)",
+	"*.(c|h|C|cc|cpp|cxx|H|m|scm|s|S|asm|awk|sed|lex|l|y|sh|idl|pl|py|am|in|f|el|bas|pas|java|sl|p|m4|tcl|pov)",
+	"*.(tar|gz|tgz|taz|zip|lha|zoo|pak|sit|arc|arj|rar|huf|lzh)",
+	"*.(rpm|deb)",
+	"*.(au|wav|mp3|snd|mod|s3m|ra)",
+	"*.(pfa|pfb|afm|ttf|fon|pcf|spd)",
+	"*.(wk[s1]|xls)"
+};
+
+static GtkWidget *
+panel_create_filter (WPanel *panel, GtkWidget **filter_w)
+{
+	GtkWidget *hbox;
+	GtkWidget *label;
+	int i;
+
+	hbox = gtk_hbox_new (FALSE, 0);
+
+	label = gtk_label_new ("Filter:");
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
+	gtk_widget_show (label);
+
+	*filter_w = gnome_entry_new ("filter");
+	
+	for (i = 0; i < ELEMENTS (default_filters); i++)
+		gnome_entry_append_history (GNOME_ENTRY (*filter_w), FALSE, default_filters[i]);
+
+	gtk_signal_connect (GTK_OBJECT (gnome_entry_gtk_entry (GNOME_ENTRY (*filter_w))),
+			    "activate",
+			    (GtkSignalFunc) panel_change_filter,
+			    panel);
+
+	gtk_box_pack_start (GTK_BOX (hbox), *filter_w, TRUE, TRUE, 0);
+	gtk_widget_show (*filter_w);
+
+	return hbox;
 }
 
 void
 x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
 {
-	GtkWidget *status_line, *filter_w, *statusbar, *vbox;
+	GtkWidget *status_line, *filter, *statusbar, *vbox;
 
 	panel->table = gtk_table_new (2, 1, 0);
 	gtk_widget_show (panel->table);
@@ -829,14 +849,14 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
 	panel->current_dir = panel_create_cwd (panel);
 	gtk_widget_show (panel->current_dir);
 
-	filter_w = panel_create_filter (panel, &panel->filter_w);
+	filter = panel_create_filter (panel, (GtkWidget **) &panel->filter_w);
-	gtk_widget_show (filter_w);
+	gtk_widget_show (filter);
 
 	status_line = gtk_hbox_new (0, 0);
 	gtk_widget_show (status_line);
 	
 	gtk_box_pack_start (GTK_BOX (status_line), panel->current_dir, 0, 0, 0);
-	gtk_box_pack_end   (GTK_BOX (status_line), filter_w, 0, 0, 0);
+	gtk_box_pack_end   (GTK_BOX (status_line), filter, 0, 0, 0);
 
 	panel->status = statusbar = gtk_label_new ("");
 	gtk_widget_show (statusbar);

src/ChangeLog

@@ -3,6 +3,10 @@ Thu Mar  5 10:28:40 1998  Norbert Warmuth <k3190@fh-sw.de>
 	* popt.c (poptParseArgvString): make it compile with the native
 	compiler on AIX 4.1.3
 
+1998-03-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* cmd.c: Added #include "x.h"
+
 Wed Mar  4 14:49:55 1998  Norbert Warmuth <k3190@fh-sw.de>
 
 	* doc/mc.1.in, mc.hlp: updated (these files haven't been updated

src/cmd.c

@@ -75,6 +75,7 @@
 #include "color.h"
 #include "user.h"
 #include "setup.h"
+#include "x.h"
 
 #define MIDNIGHT
 #ifdef  USE_INTERNAL_EDIT
@@ -105,7 +106,7 @@ int is_right;
 #define MENU_PANEL_IDX  (is_right ? 1 : 0)
 
 
-#ifndef HAVE_TK
+#ifndef PORT_HAS_FILTER_CHANGED
 #    define x_filter_changed(p)
 #endif
 

tk/tkconf.h

@@ -6,6 +6,7 @@
 #define PORT_HAS_GETCH             1
 #define PORT_HAS_FRONTEND_RUN_DLG  1
 #define PORT_WANTS_GET_SORT_FN     1
+#define PORT_HAS_FILTER_CHANGED    1
 #define frontend_run_dlg(x)        tkrundlg_event (x)
 
 /* Other */