[patch] Patch to make this rox ver. play nice with *box users

rox-1.3.3-blackbox.patch (text/plain), 2.63 KB, created by Ken Nowack on 2002-08-04 12:11:48 UTC

diff -crN rox-1.3.3/ROX-Filer/src/pinboard.c rox-1.3.3-patched/ROX-Filer/src/pinboard.c
*** rox-1.3.3/ROX-Filer/src/pinboard.c	Tue Jun 25 09:24:45 2002
--- rox-1.3.3-patched/ROX-Filer/src/pinboard.c	Tue Jul 30 09:37:56 2002
***************
*** 146,151 ****
--- 146,155 ----
  static gboolean button_press_event(GtkWidget *widget,
  			    GdkEventButton *event,
                              PinIcon *pi);
+ /* Added scroll_event signal handler to grab buttons 4 and 5
+    and forward them to the window manager */
+ static gboolean scroll_event(GtkWidget *widget, 
+                              GdkEventScroll *event);
  static gint icon_motion_notify(GtkWidget *widget,
  			       GdkEventMotion *event,
  			       PinIcon *pi);
***************
*** 931,937 ****
  	if (event->type == GDK_BUTTON_PRESS)
  	{
  		xev.type = ButtonPress;
! 		XUngrabPointer(gdk_display, event->time);
  	}
  	else
  		xev.type = ButtonRelease;
--- 935,942 ----
  	if (event->type == GDK_BUTTON_PRESS)
  	{
  		xev.type = ButtonPress;
! 		/* removed for blackbox button 3 menu support */
!         /* XUngrabPointer(gdk_display, event->time); */
  	}
  	else
  		xev.type = ButtonRelease;
***************
*** 986,991 ****
--- 991,1029 ----
  	return TRUE;
  }
  
+ /* this is to capture mouse scroll events and forward 
+    them as buttons 4 and 5 to the window manager */
+ static gboolean scroll_event(GtkWidget *widget, 
+                              GdkEventScroll *event)
+ {
+     XButtonEvent xev;
+ 	
+     xev.type = ButtonPress;
+ 	xev.window = gdk_x11_get_default_root_xwindow();
+ 	xev.root =  xev.window;
+ 	xev.subwindow = None;
+ 	xev.time = event->time;
+ 	xev.x = event->x_root;	/* Needed for icewm */
+ 	xev.y = event->y_root;
+ 	xev.x_root = event->x_root;
+ 	xev.y_root = event->y_root;
+ 	xev.state = event->state;
+ 	xev.same_screen = True;
+ 	
+     if (event->direction == GDK_SCROLL_UP)
+         xev.button = 4;
+     else if (event->direction == GDK_SCROLL_DOWN)
+         xev.button = 5;
+     else
+         return FALSE;
+     
+ 
+ 	XSendEvent(gdk_display, xev.window, False,
+ 		ButtonPressMask, (XEvent *) &xev);
+         
+     return TRUE;
+ }
+ 
  static void start_drag(PinIcon *pi, GdkEventMotion *event)
  {
  	GtkWidget *widget = pi->win;
***************
*** 1696,1701 ****
--- 1734,1742 ----
  			G_CALLBACK(button_release_event), NULL);
  	g_signal_connect(pinboard->fixed, "expose_event",
  			G_CALLBACK(bg_expose), NULL);
+     /* added the following to handle the scroll up and scroll down events */
+     g_signal_connect(win, "scroll-event",
+             G_CALLBACK(scroll_event), NULL);
  
  	/* Drag and drop handlers */
  	drag_set_pinboard_dest(win);