gscreen.c - guess - mig

gnome/gdesktop.c

@@ -42,6 +42,13 @@ typedef struct {
 	char              *pathname;
 } desktop_icon_t;
 
+/* operations on drops */
+enum {
+	OPER_COPY,
+	OPER_MOVE,
+	OPER_LINK
+};
+
 /* The list of icons on the desktop */
 static GList *desktop_icons;
 
@@ -126,6 +133,68 @@ desktop_icon_set_position (desktop_icon_t *di, GtkWidget *widget)
 	gtk_widget_set_uposition (widget, x, y);
 }
 
+static int operation_value;
+
+static void
+set_option (GtkWidget *widget, int value)
+{
+	operation_value = value;
+	gtk_main_quit ();
+}
+
+static void
+option_menu_gone ()
+{
+	operation_value = -1;
+	gtk_main_quit ();
+}
+
+static int
+get_operation (int x, int y)
+{
+	static GtkWidget *menu;
+	
+	if (!menu){
+		GtkWidget *item;
+		
+		menu = gtk_menu_new ();
+
+		item = gtk_menu_item_new_with_label (_("Copy"));
+		gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC(set_option), (void *) OPER_COPY);
+		gtk_menu_append (GTK_MENU (menu), item);
+		gtk_widget_show (item);
+		
+		item = gtk_menu_item_new_with_label (_("Move"));
+		gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC(set_option), (void *) OPER_MOVE);
+		gtk_menu_append (GTK_MENU (menu), item);
+		gtk_widget_show (item);
+
+		item = gtk_menu_item_new_with_label (_("Link"));
+		gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC(set_option), (void *) OPER_LINK);
+		gtk_menu_append (GTK_MENU (menu), item);
+		gtk_widget_show (item);
+
+		gtk_signal_connect (GTK_OBJECT (menu), "hide", GTK_SIGNAL_FUNC(option_menu_gone), 0);
+	} 
+
+	/* Here, we could set the mask parameter (the last NULL) to a valid variable
+	 * and find out if the shift/control keys were set and do something smart
+	 * about that
+	 */
+	
+	gtk_widget_set_uposition (menu, x, y);
+
+	/* FIXME: We should catch any events that escape this menu and cancel it */
+	operation_value = -1;
+	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, 0, NULL, 1, GDK_CURRENT_TIME);
+	gtk_grab_add (menu);
+	gtk_main ();
+	gtk_grab_remove (menu);
+	gtk_widget_hide (menu);
+	
+	return operation_value;
+}
+
 static void
 drop_cb (GtkWidget *widget, GdkEventDropDataAvailable *event, desktop_icon_t *di)
 {
@@ -133,9 +202,17 @@ drop_cb (GtkWidget *widget, GdkEventDropDataAvailable *event, desktop_icon_t *di
 	int count;
 	int len;
 	int is_directory = strcasecmp (di->dentry->type, "directory") == 0;
+	int operation;
 
+	if (is_directory){
+		int x, y;
+
+		gdk_window_get_pointer (NULL, &x, &y, NULL);
+		operation = get_operation (x, y);
+
+		printf ("Operación: %d\n", operation);
+	}
 		
-	if (strcmp (event->data_type, "url:ALL") == 0){
 	count = event->data_numbytes;
 	p = event->data;
 	do {
@@ -145,9 +222,6 @@ drop_cb (GtkWidget *widget, GdkEventDropDataAvailable *event, desktop_icon_t *di
 		p += len;
 	} while (count);
 	printf ("Receiving: %s %d\n", event->data, event->data_numbytes);
-		return;
-	}
-
 }
 
 static void

gnome/gscreen.c

@@ -275,151 +275,6 @@ panel_file_list_configure_contents (GtkWidget *file_list, WPanel *panel, int mai
 	gtk_clist_thaw (GTK_CLIST (file_list));
 }
 
-static void
-internal_select_item (GtkWidget *file_list, WPanel *panel, int row)
-{
-	if (panel->selected == row)
-		return;
-	
-	gtk_signal_handler_block_by_data (GTK_OBJECT (file_list), panel);
-	unselect_item (panel);
-	panel->selected = row;
-	select_item (panel);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (file_list), panel);
-}
-
-void
-panel_file_list_select_row (GtkWidget *file_list, int row, int column, GdkEvent *event, WPanel *panel)
-{
-	if (!event){
-		internal_select_item (file_list, panel, row);
-		return;
-	}
-	
-	if (event->type == GDK_BUTTON_PRESS)
-		internal_select_item (file_list, panel, row);
-
-	if (event->type == GDK_2BUTTON_PRESS){
-		do_enter (panel);
-	}
-}
-
-/* Figure out the number of visible lines in the panel */
-static void
-panel_file_list_compute_lines (GtkCList *file_list, WPanel *panel, int height)
-{
-	int lost_pixels = 0;
-	
-	if (GTK_WIDGET_VISIBLE (file_list->hscrollbar)){
-		int scrollbar_width = GTK_WIDGET (file_list->hscrollbar)->requisition.width;
-		int scrollbar_space = GTK_CLIST_CLASS (GTK_OBJECT (file_list)->klass)->scrollbar_spacing;
-
-		lost_pixels = scrollbar_space + scrollbar_width;
-	}
-	panel->widget.lines = (height-lost_pixels) /
-		(GTK_CLIST (file_list)->row_height + CELL_SPACING);
-}
-
-static void
-panel_file_list_size_allocate_hook (GtkWidget *file_list, GtkAllocation *allocation, WPanel *panel)
-{
-	panel_file_list_configure_contents (file_list, panel, allocation->width, allocation->height);
-	
-	/* Set the selection callback */
-	gtk_signal_connect (GTK_OBJECT (file_list), "select_row",
-			    GTK_SIGNAL_FUNC (panel_file_list_select_row), panel);
-
-	panel_file_list_compute_lines (GTK_CLIST (file_list), panel, allocation->height);
-}
-
-static void
-panel_file_list_column_callback (GtkWidget *widget, int col, WPanel *panel)
-{
-	format_e *format;
-	int i;
-	
-	for (i = 0, format = panel->format; format; format = format->next){
-		if (!format->use_in_gui)
-			continue;
-		if (i == col){
-			sortfn *sorting_routine;
-			
-			sorting_routine = get_sort_fn (format->id);
-			if (!sorting_routine)
-				return;
-
-			if (sorting_routine == panel->sort_type)
-				panel->reverse = !panel->reverse;
-			panel->sort_type = sorting_routine;
-
-			do_re_sort (panel);
-			return;
-		}
-		i++;
-	}
-}
-
-void
-panel_create_pixmaps (GtkWidget *parent)
-{
-	GdkColor color = gtk_widget_get_style (parent)->bg [GTK_STATE_NORMAL];
-
-	pixmaps_ready = 1;
-	directory_pixmap = gdk_pixmap_create_from_xpm_d (parent->window, &directory_mask, &color, directory_xpm);
-}
-
-static void
-panel_file_list_scrolled (GtkAdjustment *adj, WPanel *panel)
-{
-	if (!GTK_IS_ADJUSTMENT (adj)){
-		fprintf (stderr, "CRAP!\n");
-		exit (1);
-	}
-}
-
-void
-panel_configure_file_list (WPanel *panel, GtkWidget *file_list)
-{
-	format_e *format = panel->format;
-	GtkCList *cl = GTK_CLIST (file_list);
-	GtkObject *adjustment;
-	int i;
-
-	/* Set sorting callback */
-	gtk_signal_connect (GTK_OBJECT (file_list), "click_column",
-			    GTK_SIGNAL_FUNC (panel_file_list_column_callback), panel);
-
-	/* Configure the CList */
-	gtk_clist_set_selection_mode (cl, GTK_SELECTION_BROWSE);
-	gtk_clist_set_policy (cl, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	
-	for (i = 0, format = panel->format; format; format = format->next){
-		GtkJustification just;
-
-		if (!format->use_in_gui)
-			continue;
-
-		/* Set desired justification */
-		if (format->just_mode == J_LEFT)
-			just = GTK_JUSTIFY_LEFT;
-		else
-			just = GTK_JUSTIFY_RIGHT;
-		
-		gtk_clist_set_column_justification (cl, i, just);
-		i++;
-	}
-
-	/* Configure the scrolbars */
-	adjustment = GTK_OBJECT (gtk_range_get_adjustment (GTK_RANGE (cl->vscrollbar)));
-	gtk_signal_connect_after (GTK_OBJECT(adjustment), "value_changed", 
-				  GTK_SIGNAL_FUNC (panel_file_list_scrolled), panel);
-}
-
-void
-panel_list_mc_bindings (GtkWidget *file_list, int row, int col, GdkEvent *event, WPanel *panel)
-{
-}
-
 void
 panel_action_open (GtkWidget *widget, WPanel *panel)
 {
@@ -591,30 +446,150 @@ file_popup (GdkEvent *event, WPanel *panel, char *filename)
 	gtk_widget_show (menu);
 }
 
-void
+static void
-panel_list_new_bindings (GtkWidget *file_list, int row, int col, GdkEvent *event, WPanel *panel)
+internal_select_item (GtkWidget *file_list, WPanel *panel, int row)
 {
-	char *filename = panel->dir.list [row].fname;
+	if (panel->selected == row)
+		return;
 	
+	gtk_signal_handler_block_by_data (GTK_OBJECT (file_list), panel);
 	unselect_item (panel);
 	panel->selected = row;
 	select_item (panel);
+	gtk_signal_handler_unblock_by_data (GTK_OBJECT (file_list), panel);
+}
 
-	if (event->button.button == 3){
+void
+panel_file_list_select_row (GtkWidget *file_list, int row, int column, GdkEvent *event, WPanel *panel)
+{
+	const char *filename = panel->dir.list [row].fname;
+		
+	if (!event){
+		internal_select_item (file_list, panel, row);
+		return;
+	}
+	
+	if (event->type == GDK_BUTTON_PRESS)
+		internal_select_item (file_list, panel, row);
+
+	if (event->type == GDK_BUTTON_PRESS && event->button.button == 3){
 		file_popup (event, panel, filename);
 	}
+	
+	if (event->type == GDK_2BUTTON_PRESS){
+		do_enter (panel);
+	}
+}
+
+/* Figure out the number of visible lines in the panel */
+static void
+panel_file_list_compute_lines (GtkCList *file_list, WPanel *panel, int height)
+{
+	int lost_pixels = 0;
+	
+	if (GTK_WIDGET_VISIBLE (file_list->hscrollbar)){
+		int scrollbar_width = GTK_WIDGET (file_list->hscrollbar)->requisition.width;
+		int scrollbar_space = GTK_CLIST_CLASS (GTK_OBJECT (file_list)->klass)->scrollbar_spacing;
+
+		lost_pixels = scrollbar_space + scrollbar_width;
+	}
+	panel->widget.lines = (height-lost_pixels) /
+		(GTK_CLIST (file_list)->row_height + CELL_SPACING);
+}
+
+static void
+panel_file_list_size_allocate_hook (GtkWidget *file_list, GtkAllocation *allocation, WPanel *panel)
+{
+	panel_file_list_configure_contents (file_list, panel, allocation->width, allocation->height);
+	
+	/* Set the selection callback */
+	gtk_signal_connect (GTK_OBJECT (file_list), "select_row",
+			    GTK_SIGNAL_FUNC (panel_file_list_select_row), panel);
+
+	panel_file_list_compute_lines (GTK_CLIST (file_list), panel, allocation->height);
+}
+
+static void
+panel_file_list_column_callback (GtkWidget *widget, int col, WPanel *panel)
+{
+	format_e *format;
+	int i;
+	
+	for (i = 0, format = panel->format; format; format = format->next){
+		if (!format->use_in_gui)
+			continue;
+		if (i == col){
+			sortfn *sorting_routine;
+			
+			sorting_routine = get_sort_fn (format->id);
+			if (!sorting_routine)
+				return;
+
+			if (sorting_routine == panel->sort_type)
+				panel->reverse = !panel->reverse;
+			panel->sort_type = sorting_routine;
+
+			do_re_sort (panel);
+			return;
+		}
+		i++;
+	}
 }
 
 void
-panel_file_list_row_selected (GtkWidget *file_list, int row, int col, GdkEvent *event, WPanel *panel)
+panel_create_pixmaps (GtkWidget *parent)
 {
-	if (!event)
+	GdkColor color = gtk_widget_get_style (parent)->bg [GTK_STATE_NORMAL];
-		return;
 
-	if (mc_bindings)
+	pixmaps_ready = 1;
-		panel_list_mc_bindings (file_list, row, col, event, panel);
+	directory_pixmap = gdk_pixmap_create_from_xpm_d (parent->window, &directory_mask, &color, directory_xpm);
+}
+
+static void
+panel_file_list_scrolled (GtkAdjustment *adj, WPanel *panel)
+{
+	if (!GTK_IS_ADJUSTMENT (adj)){
+		fprintf (stderr, "CRAP!\n");
+		exit (1);
+	}
+}
+
+void
+panel_configure_file_list (WPanel *panel, GtkWidget *file_list)
+{
+	format_e *format = panel->format;
+	GtkCList *cl = GTK_CLIST (file_list);
+	GtkObject *adjustment;
+	int i;
+
+	/* Set sorting callback */
+	gtk_signal_connect (GTK_OBJECT (file_list), "click_column",
+			    GTK_SIGNAL_FUNC (panel_file_list_column_callback), panel);
+
+	/* Configure the CList */
+	gtk_clist_set_selection_mode (cl, GTK_SELECTION_BROWSE);
+	gtk_clist_set_policy (cl, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	
+	for (i = 0, format = panel->format; format; format = format->next){
+		GtkJustification just;
+
+		if (!format->use_in_gui)
+			continue;
+
+		/* Set desired justification */
+		if (format->just_mode == J_LEFT)
+			just = GTK_JUSTIFY_LEFT;
 		else
-		panel_list_new_bindings (file_list, row, col, event, panel);
+			just = GTK_JUSTIFY_RIGHT;
+		
+		gtk_clist_set_column_justification (cl, i, just);
+		i++;
+	}
+
+	/* Configure the scrolbars */
+	adjustment = GTK_OBJECT (gtk_range_get_adjustment (GTK_RANGE (cl->vscrollbar)));
+	gtk_signal_connect_after (GTK_OBJECT(adjustment), "value_changed", 
+				  GTK_SIGNAL_FUNC (panel_file_list_scrolled), panel);
 }
 
 void *
@@ -746,11 +721,6 @@ panel_create_file_list (WPanel *panel)
 			    GTK_SIGNAL_FUNC (panel_file_list_size_allocate_hook),
 			    panel);
 
-	gtk_signal_connect (GTK_OBJECT (file_list),
-			    "select_row",
-			    GTK_SIGNAL_FUNC (panel_file_list_row_selected),
-			    panel);
-
 	gtk_signal_connect (GTK_OBJECT (file_list),
 			    "realize",
 			    GTK_SIGNAL_FUNC (panel_realized), panel);