* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: xcommon.c,v 1.18 2003/05/25 20:16:26 gbazin Exp $
+ * $Id: xcommon.c,v 1.27 2003/08/02 14:06:22 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
{
if( strlen( psz_chroma ) >= 4 )
{
- i_chroma = (unsigned char)psz_chroma[0] << 0;
- i_chroma |= (unsigned char)psz_chroma[1] << 8;
- i_chroma |= (unsigned char)psz_chroma[2] << 16;
- i_chroma |= (unsigned char)psz_chroma[3] << 24;
-
+ /* Do not use direct assignment because we are not sure of the
+ * alignment. */
+ memcpy(&i_chroma, psz_chroma, 4);
b_chroma = 1;
}
}
/* Check that we have access to an XVideo port providing this chroma */
- p_vout->p_sys->i_xvport = XVideoGetPort( p_vout, i_chroma,
+ p_vout->p_sys->i_xvport = XVideoGetPort( p_vout, VLC2X11_FOURCC(i_chroma),
&p_vout->output.i_chroma );
if( p_vout->p_sys->i_xvport < 0 )
{
* XVideo port for an YUY2 picture. We'll need to do an YUV
* conversion, but at least it has got scaling. */
p_vout->p_sys->i_xvport =
- XVideoGetPort( p_vout, VLC_FOURCC('Y','U','Y','2'),
+ XVideoGetPort( p_vout, X11_FOURCC('Y','U','Y','2'),
&p_vout->output.i_chroma );
if( p_vout->p_sys->i_xvport < 0 )
{
* XVideo port for a simple 16bpp RGB picture. We'll need to do
* an YUV conversion, but at least it has got scaling. */
p_vout->p_sys->i_xvport =
- XVideoGetPort( p_vout, VLC_FOURCC('R','V','1','6'),
+ XVideoGetPort( p_vout, X11_FOURCC('R','V','1','6'),
&p_vout->output.i_chroma );
if( p_vout->p_sys->i_xvport < 0 )
{
}
}
}
+ p_vout->output.i_chroma = X112VLC_FOURCC(p_vout->output.i_chroma);
#endif
/* Create blank cursor (for mouse cursor autohiding) */
}
else
{
- p_vout->p_vlc->b_die = 1;
+ /* the user wants to close the window */
+ playlist_t * p_playlist =
+ (playlist_t *)vlc_object_find( p_vout,
+ VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist != NULL )
+ {
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
+ }
}
break;
case XK_Menu:
{
intf_thread_t *p_intf;
+ playlist_t * p_playlist;
+
p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF,
FIND_ANYWHERE );
if( p_intf )
p_intf->b_menu_change = 1;
vlc_object_release( p_intf );
}
+
+ p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist != NULL )
+ {
+ vlc_value_t val;
+ var_Set( p_playlist, "intf-popupmenu", val );
+ vlc_object_release( p_playlist );
+ }
}
break;
case XK_Left:
- input_Seek( p_vout, -5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
+/* input_Seek( p_vout, -5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */
+ val.psz_string = "LEFT";
+ var_Set( p_vout, "key-pressed", val );
break;
case XK_Right:
- input_Seek( p_vout, 5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
+/* input_Seek( p_vout, 5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */
+ val.psz_string = "RIGHT";
+ var_Set( p_vout, "key-pressed", val );
break;
case XK_Up:
- input_Seek( p_vout, 60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
+/* input_Seek( p_vout, 60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */
+ val.psz_string = "UP";
+ var_Set( p_vout, "key-pressed", val );
break;
case XK_Down:
- input_Seek( p_vout, -60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
+/* input_Seek( p_vout, -60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */
+ val.psz_string = "DOWN";
+ var_Set( p_vout, "key-pressed", val );
+ break;
+ case XK_Return:
+ case XK_KP_Enter:
+ val.psz_string = "ENTER";
+ var_Set( p_vout, "key-pressed", val );
break;
case XK_Home:
input_Seek( p_vout, 0, INPUT_SEEK_BYTES | INPUT_SEEK_SET );
input_Seek( p_vout, 0, INPUT_SEEK_BYTES | INPUT_SEEK_END );
break;
case XK_Page_Up:
- input_Seek( p_vout, 900, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
+ input_Seek( p_vout, 10, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
break;
case XK_Page_Down:
- input_Seek( p_vout, -900, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
+ input_Seek( p_vout, -10, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
break;
case XK_space:
input_SetStatus( p_vout, INPUT_STATUS_PAUSE );
break;
case Button2:
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int &= ~2;
- var_Set( p_vout, "mouse-button-down", val );
+ {
+ playlist_t *p_playlist;
+
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~2;
+ var_Set( p_vout, "mouse-button-down", val );
+
+ p_playlist = vlc_object_find( p_vout,
+ VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist != NULL )
+ {
+ vlc_value_t val;
+ var_Get( p_playlist, "intf-show", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "intf-show", val );
+ vlc_object_release( p_playlist );
+ }
+ }
break;
case Button3:
{
intf_thread_t *p_intf;
+ playlist_t *p_playlist;
+
var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~4;
var_Set( p_vout, "mouse-button-down", val );
p_intf->b_menu_change = 1;
vlc_object_release( p_intf );
}
+
+ p_playlist = vlc_object_find( p_vout,
+ VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist != NULL )
+ {
+ vlc_value_t val;
+ var_Set( p_playlist, "intf-popupmenu", val );
+ vlc_object_release( p_playlist );
+ }
}
break;
&& ((Atom)xevent.xclient.data.l[0]
== p_vout->p_sys->p_win->wm_delete_window ) )
{
- p_vout->p_vlc->b_die = 1;
+ /* the user wants to close the window */
+ playlist_t * p_playlist =
+ (playlist_t *)vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist != NULL )
+ {
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
+ }
}
}
XGCValues xgcvalues;
XEvent xevent;
- vlc_bool_t b_expose;
- vlc_bool_t b_configure_notify;
- vlc_bool_t b_map_notify;
+ vlc_bool_t b_expose = VLC_FALSE;
+ vlc_bool_t b_configure_notify = VLC_FALSE;
+ vlc_bool_t b_map_notify = VLC_FALSE;
vlc_value_t val;
long long int i_drawable;
if( !i_drawable )
{
- p_win->b_owned = VLC_TRUE;
-
/* Create the window and set hints - the window must receive
* ConfigureNotify events, and until it is displayed, Expose and
* MapNotify events. */
}
else
{
- p_win->b_owned = VLC_FALSE;
- p_win->base_window = i_drawable;
+ /* Get the parent window's geometry information */
+ Window dummy1;
+ unsigned int dummy2, dummy3;
+ XGetGeometry( p_vout->p_sys->p_display, i_drawable,
+ &dummy1, &dummy2, &dummy3,
+ &p_win->i_width,
+ &p_win->i_height,
+ &dummy2, &dummy3 );
+
+ /* We are already configured */
+ b_configure_notify = VLC_TRUE;
- XChangeWindowAttributes( p_vout->p_sys->p_display,
- p_win->base_window,
- CWBackingStore | CWBackPixel | CWEventMask,
- &xwindow_attributes );
+ /* From man XSelectInput: only one client at a time can select a
+ * ButtonPress event, so we need to open a new window anyway. */
+ p_win->base_window =
+ XCreateWindow( p_vout->p_sys->p_display,
+ i_drawable,
+ 0, 0,
+ p_win->i_width, p_win->i_height,
+ 0,
+ 0, CopyFromParent, 0,
+ CWBackingStore | CWBackPixel | CWEventMask,
+ &xwindow_attributes );
}
if( (p_win->wm_protocols == None) /* use WM_DELETE_WINDOW */
p_win->base_window,
GCGraphicsExposures, &xgcvalues );
- if( p_win->b_owned )
- {
- /* Send orders to server, and wait until window is displayed - three
- * events must be received: a MapNotify event, an Expose event allowing
- * drawing in the window, and a ConfigureNotify to get the window
- * dimensions. Once those events have been received, only
- * ConfigureNotify events need to be received. */
- b_expose = 0;
- b_configure_notify = 0;
- b_map_notify = 0;
- XMapWindow( p_vout->p_sys->p_display, p_win->base_window );
- do
+ /* Send orders to server, and wait until window is displayed - three
+ * events must be received: a MapNotify event, an Expose event allowing
+ * drawing in the window, and a ConfigureNotify to get the window
+ * dimensions. Once those events have been received, only
+ * ConfigureNotify events need to be received. */
+ XMapWindow( p_vout->p_sys->p_display, p_win->base_window );
+ do
+ {
+ XNextEvent( p_vout->p_sys->p_display, &xevent);
+ if( (xevent.type == Expose)
+ && (xevent.xexpose.window == p_win->base_window) )
{
- XNextEvent( p_vout->p_sys->p_display, &xevent);
- if( (xevent.type == Expose)
- && (xevent.xexpose.window == p_win->base_window) )
- {
- b_expose = 1;
- }
- else if( (xevent.type == MapNotify)
- && (xevent.xmap.window == p_win->base_window) )
- {
- b_map_notify = 1;
- }
- else if( (xevent.type == ConfigureNotify)
- && (xevent.xconfigure.window == p_win->base_window) )
- {
- b_configure_notify = 1;
- p_win->i_width = xevent.xconfigure.width;
- p_win->i_height = xevent.xconfigure.height;
- }
- } while( !( b_expose && b_configure_notify && b_map_notify ) );
- }
- else
- {
- /* Get the window's geometry information */
- Window dummy1;
- unsigned int dummy2, dummy3;
- XGetGeometry( p_vout->p_sys->p_display, p_win->base_window,
- &dummy1, &dummy2, &dummy3,
- &p_win->i_width,
- &p_win->i_height,
- &dummy2, &dummy3 );
- }
+ b_expose = VLC_TRUE;
+ }
+ else if( (xevent.type == MapNotify)
+ && (xevent.xmap.window == p_win->base_window) )
+ {
+ b_map_notify = VLC_TRUE;
+ }
+ else if( (xevent.type == ConfigureNotify)
+ && (xevent.xconfigure.window == p_win->base_window) )
+ {
+ b_configure_notify = VLC_TRUE;
+ p_win->i_width = xevent.xconfigure.width;
+ p_win->i_height = xevent.xconfigure.height;
+ }
+ } while( !( b_expose && b_configure_notify && b_map_notify ) );
XSelectInput( p_vout->p_sys->p_display, p_win->base_window,
StructureNotifyMask | KeyPressMask |
PointerMotionMask );
#ifdef MODULE_NAME_IS_x11
- if( p_win->b_owned &&
- XDefaultDepth(p_vout->p_sys->p_display, p_vout->p_sys->i_screen) == 8 )
+ if( XDefaultDepth(p_vout->p_sys->p_display, p_vout->p_sys->i_screen) == 8 )
{
/* Allocate a new palette */
p_vout->p_sys->colormap =
XDestroyWindow( p_vout->p_sys->p_display, p_win->video_window );
XFreeGC( p_vout->p_sys->p_display, p_win->gc );
- if( p_win->b_owned )
- {
- XUnmapWindow( p_vout->p_sys->p_display, p_win->base_window );
- XDestroyWindow( p_vout->p_sys->p_display, p_win->base_window );
- }
+ XUnmapWindow( p_vout->p_sys->p_display, p_win->base_window );
+ XDestroyWindow( p_vout->p_sys->p_display, p_win->base_window );
}
/*****************************************************************************
p_vout->p_sys->b_altfullscreen =
config_GetInt( p_vout, MODULE_STRING "-altfullscreen" );
- if( p_vout->p_sys->p_win->b_owned )
- {
- XUnmapWindow( p_vout->p_sys->p_display,
- p_vout->p_sys->p_win->base_window);
- }
+ XUnmapWindow( p_vout->p_sys->p_display,
+ p_vout->p_sys->p_win->base_window);
p_vout->p_sys->p_win = &p_vout->p_sys->fullscreen_window;
DestroyWindow( p_vout, &p_vout->p_sys->fullscreen_window );
p_vout->p_sys->p_win = &p_vout->p_sys->original_window;
- if( p_vout->p_sys->p_win->b_owned )
- {
- XMapWindow( p_vout->p_sys->p_display,
- p_vout->p_sys->p_win->base_window);
- }
+ XMapWindow( p_vout->p_sys->p_display,
+ p_vout->p_sys->p_win->base_window);
}
/* Unfortunately, using XSync() here is not enough to ensure the
* window has already been mapped because the XMapWindow() request
* has not necessarily been sent directly to our window (remember,
* the call is first redirected to the window manager) */
- if( p_vout->p_sys->p_win->b_owned )
+ do
{
- do
- {
- XWindowEvent( p_vout->p_sys->p_display,
- p_vout->p_sys->p_win->base_window,
- StructureNotifyMask, &xevent );
- } while( xevent.type != MapNotify );
- }
- else
- {
- XSync( p_vout->p_sys->p_display, False );
- }
+ XWindowEvent( p_vout->p_sys->p_display,
+ p_vout->p_sys->p_win->base_window,
+ StructureNotifyMask, &xevent );
+ } while( xevent.type != MapNotify );
- /* Becareful, this can generate a BadMatch error if the window is not
+ /* Be careful, this can generate a BadMatch error if the window is not
* already mapped by the server (see above) */
XSetInputFocus(p_vout->p_sys->p_display,
p_vout->p_sys->p_win->base_window,
if( i_selected_port == -1 )
{
+ int i_chroma_tmp = X112VLC_FOURCC( i_chroma );
if( i_requested_adaptor == -1 )
{
msg_Warn( p_vout, "no free XVideo port found for format "
- "0x%.8x (%4.4s)", i_chroma, (char*)&i_chroma );
+ "0x%.8x (%4.4s)", i_chroma_tmp, (char*)&i_chroma_tmp );
}
else
{
msg_Warn( p_vout, "XVideo adaptor %i does not have a free "
- "XVideo port for format 0x%.8x (%4.4s)",
- i_requested_adaptor, i_chroma, (char*)&i_chroma );
+ "XVideo port for format 0x%.8x (%4.4s)",
+ i_requested_adaptor, i_chroma_tmp, (char*)&i_chroma_tmp );
}
}
projects / vlc / blobdiff