[xine-cvs] CVS: xine-ui/src/xitk videowin.c,1.208,1.209

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28930

Modified Files:
	videowin.c 
Log Message:
Forward all mouse buttons event to the engine (patch (modified) from Pekka Jääskeläinen <pja...@cs...>)

Index: videowin.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/videowin.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- videowin.c	23 Nov 2004 11:13:34 -0000	1.208
+++ videowin.c	5 Dec 2004 22:42:51 -0000	1.209
@@ -2005,8 +2005,10 @@
   break;
 
   case ButtonPress: {
-    XButtonEvent *bevent = (XButtonEvent *) event;
-    int x, y;
+    XButtonEvent       *bevent = (XButtonEvent *) event;
+    xine_input_data_t   input;
+    xine_event_t        event;
+    int                 x, y;
 
     if(!gGui->cursor_visible) {
       gGui->cursor_visible = !gGui->cursor_visible;
@@ -2023,22 +2025,9 @@
       
       timercpy(&gVw->click_time, &old_click_time);
       gettimeofday(&gVw->click_time, 0);
-      
-      if (video_window_translate_point(bevent->x, bevent->y, &x, &y)) {
-	xine_input_data_t input;
-	xine_event_t      event;
-	
-	event.type        = XINE_EVENT_INPUT_MOUSE_BUTTON;
-	event.stream      = gGui->stream;
-	event.data        = &input;
-	event.data_length = sizeof(input);
-	timercpy(&old_click_time, &event.tv);
-	input.button      = 1;
-	input.x           = x;
-	input.y           = y;
-	xine_event_send(gGui->stream, &event);
-      }
 
+      timercpy(&old_click_time, &event.tv);
+      
       timersub(&gVw->click_time, &old_click_time, &tm_diff);
       click_diff = (tm_diff.tv_sec * 1000) + (tm_diff.tv_usec / 1000.0);
       
@@ -2049,6 +2038,18 @@
       }
       
     }
+
+    if(video_window_translate_point(bevent->x, bevent->y, &x, &y)) {	
+      event.type        = XINE_EVENT_INPUT_MOUSE_BUTTON;
+      event.stream      = gGui->stream;
+      event.data        = &input;
+      event.data_length = sizeof(input);
+      input.button      = bevent->button;
+      input.x           = x;
+      input.y           = y;
+      xine_event_send(gGui->stream, &event);
+    }
+
   }
   break;