[MPlayer-dev-eng] [PATCH] double click to switch to full screen in GUI
Diego Biurrun
diego at biurrun.de
Mon Oct 16 15:30:46 CEST 2006
On Sun, Oct 08, 2006 at 08:35:25PM +0200, laurent wozniak wrote:
>
> Diego Biurrun wrote:
> >Grab the latest incarnation of the patch as posted by me and try to
> >split it into self-contained independent pieces that can be discussed
> >and applied separately.
> >
> Here are the patches and a log that explain what they do.
> Apart from the first one, they are all dependent on some other.
> The apply order is of course from the first to the last.
Thanks for splitting the patches, reviewing is much easier now. Some of
them have already made it to our tree.
> There is still a pending question: The original code is assuming some
> drivers are not sending mouse wheels button release events.
> Do they really exists ?
Which drivers?
> --- Gui/wm/ws.h (revision remote 19814 local 20057)
> +++ Gui/wm/ws.h (local)
> @@ -29,11 +29,11 @@
> #define wsPRMouseButton 3
> #define wsP4MouseButton 4
> #define wsP5MouseButton 5
> -#define wsRLMouseButton 1 + 128
> -#define wsRMMouseButton 2 + 128
> -#define wsRRMouseButton 3 + 128
> -#define wsR4MouseButton 4 + 128
> -#define wsR5MouseButton 5 + 128
> +#define wsRLMouseButton (1 + 128)
> +#define wsRMMouseButton (2 + 128)
> +#define wsRRMouseButton (3 + 128)
> +#define wsR4MouseButton (4 + 128)
> +#define wsR5MouseButton (5 + 128)
> #define wsEnterWindow 253
> #define wsLeaveWindow 254
> #define wsMoveMouse 255
This one was applied.
> --- libvo/vo_sdl.c (revision remote 19814 local 20059)
> +++ libvo/vo_sdl.c (local)
> @@ -1190,15 +1190,15 @@
> if(vo_nomouse_input)
> break;
> if(event.button.button == 4 || event.button.button == 5)
> - mplayer_put_key(MOUSE_BASE+event.button.button-1);
> + mplayer_put_key(MOUSE_BTN0+event.button.button-1);
> else
> - mplayer_put_key((MOUSE_BASE+event.button.button-1) | MP_KEY_DOWN);
> + mplayer_put_key((MOUSE_BTN0+event.button.button-1) | MP_KEY_DOWN);
> break;
>
> case SDL_MOUSEBUTTONUP:
> if(vo_nomouse_input)
> break;
> - mplayer_put_key(MOUSE_BASE+event.button.button-1);
> + mplayer_put_key(MOUSE_BTN0+event.button.button-1);
> break;
This one was applied as well.
> --- Gui/mplayer/mw.c (revision remote 19814 local 20065)
> +++ Gui/mplayer/mw.c (local)
> @@ -79,7 +79,6 @@
>
> void mplEventHandling( int msg,float param )
> {
> - int j;
> int iparam = (int)param;
>
> switch( msg )
That's an unrelated change, I applied it separately.
Reimar, did you manage to have another look at the patches now?
Diego
More information about the MPlayer-dev-eng
mailing list