Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
2b5d2946
Commit
2b5d2946
authored
Jul 29, 2003
by
Sam Hocevar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/video_output/x11/xcommon.c: Hopefully a proper fix for the Mozilla
event handling bug.
parent
8bfdb6f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
70 additions
and
100 deletions
+70
-100
modules/video_output/x11/xcommon.c
modules/video_output/x11/xcommon.c
+69
-97
modules/video_output/x11/xcommon.h
modules/video_output/x11/xcommon.h
+1
-3
No files found.
modules/video_output/x11/xcommon.c
View file @
2b5d2946
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* xcommon.c: Functions common to the X11 and XVideo plugins
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.c,v 1.2
4 2003/07/28 22:46:00 gbazin
Exp $
* $Id: xcommon.c,v 1.2
5 2003/07/29 09:32:14 sam
Exp $
*
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Samuel Hocevar <sam@zoy.org>
...
@@ -911,9 +911,9 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
...
@@ -911,9 +911,9 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
XGCValues
xgcvalues
;
XGCValues
xgcvalues
;
XEvent
xevent
;
XEvent
xevent
;
vlc_bool_t
b_expose
;
vlc_bool_t
b_expose
=
VLC_FALSE
;
vlc_bool_t
b_configure_notify
;
vlc_bool_t
b_configure_notify
=
VLC_FALSE
;
vlc_bool_t
b_map_notify
;
vlc_bool_t
b_map_notify
=
VLC_FALSE
;
vlc_value_t
val
;
vlc_value_t
val
;
long
long
int
i_drawable
;
long
long
int
i_drawable
;
...
@@ -939,8 +939,6 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
...
@@ -939,8 +939,6 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
if
(
!
i_drawable
)
if
(
!
i_drawable
)
{
{
p_win
->
b_owned
=
VLC_TRUE
;
/* Create the window and set hints - the window must receive
/* Create the window and set hints - the window must receive
* ConfigureNotify events, and until it is displayed, Expose and
* ConfigureNotify events, and until it is displayed, Expose and
* MapNotify events. */
* MapNotify events. */
...
@@ -975,13 +973,29 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
...
@@ -975,13 +973,29 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
}
}
else
else
{
{
p_win
->
b_owned
=
VLC_FALSE
;
/* Get the parent window's geometry information */
p_win
->
base_window
=
i_drawable
;
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
);
XChangeWindowAttributes
(
p_vout
->
p_sys
->
p_display
,
/* We are already configured */
p_win
->
base_window
,
b_configure_notify
=
VLC_TRUE
;
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 */
if
(
(
p_win
->
wm_protocols
==
None
)
/* use WM_DELETE_WINDOW */
...
@@ -1000,67 +1014,41 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
...
@@ -1000,67 +1014,41 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
p_win
->
base_window
,
p_win
->
base_window
,
GCGraphicsExposures
,
&
xgcvalues
);
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
/* Send orders to server, and wait until window is displayed - three
* drawing in the window, and a ConfigureNotify to get the window
* events must be received: a MapNotify event, an Expose event allowing
* dimensions. Once those events have been received, only
* drawing in the window, and a ConfigureNotify to get the window
* ConfigureNotify events need to be received. */
* dimensions. Once those events have been received, only
XMapWindow
(
p_vout
->
p_sys
->
p_display
,
p_win
->
base_window
);
* ConfigureNotify events need to be received. */
do
b_expose
=
0
;
{
b_configure_notify
=
0
;
XNextEvent
(
p_vout
->
p_sys
->
p_display
,
&
xevent
);
b_map_notify
=
0
;
if
(
(
xevent
.
type
==
Expose
)
XMapWindow
(
p_vout
->
p_sys
->
p_display
,
p_win
->
base_window
);
&&
(
xevent
.
xexpose
.
window
==
p_win
->
base_window
)
)
do
{
{
XNextEvent
(
p_vout
->
p_sys
->
p_display
,
&
xevent
);
b_expose
=
VLC_TRUE
;
if
(
(
xevent
.
type
==
Expose
)
}
&&
(
xevent
.
xexpose
.
window
==
p_win
->
base_window
)
)
else
if
(
(
xevent
.
type
==
MapNotify
)
{
&&
(
xevent
.
xmap
.
window
==
p_win
->
base_window
)
)
b_expose
=
1
;
{
}
b_map_notify
=
VLC_TRUE
;
else
if
(
(
xevent
.
type
==
MapNotify
)
}
&&
(
xevent
.
xmap
.
window
==
p_win
->
base_window
)
)
else
if
(
(
xevent
.
type
==
ConfigureNotify
)
{
&&
(
xevent
.
xconfigure
.
window
==
p_win
->
base_window
)
)
b_map_notify
=
1
;
{
}
b_configure_notify
=
VLC_TRUE
;
else
if
(
(
xevent
.
type
==
ConfigureNotify
)
p_win
->
i_width
=
xevent
.
xconfigure
.
width
;
&&
(
xevent
.
xconfigure
.
window
==
p_win
->
base_window
)
)
p_win
->
i_height
=
xevent
.
xconfigure
.
height
;
{
}
b_configure_notify
=
1
;
}
while
(
!
(
b_expose
&&
b_configure_notify
&&
b_map_notify
)
);
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
);
}
/* When we don't own the window we cannot put ButtonPressMask in the list,
XSelectInput
(
p_vout
->
p_sys
->
p_display
,
p_win
->
base_window
,
* because according to the XSelectInput manpage, only one client at a
StructureNotifyMask
|
KeyPressMask
|
* time can select a ButtonPress event. Programs such as Mozilla may be
ButtonPressMask
|
ButtonReleaseMask
|
* already selecting this event. */
PointerMotionMask
);
if
(
p_win
->
b_owned
)
XSelectInput
(
p_vout
->
p_sys
->
p_display
,
p_win
->
base_window
,
StructureNotifyMask
|
KeyPressMask
|
ButtonPressMask
|
ButtonReleaseMask
|
PointerMotionMask
);
else
XSelectInput
(
p_vout
->
p_sys
->
p_display
,
p_win
->
base_window
,
StructureNotifyMask
);
#ifdef MODULE_NAME_IS_x11
#ifdef MODULE_NAME_IS_x11
if
(
p_win
->
b_owned
&&
if
(
XDefaultDepth
(
p_vout
->
p_sys
->
p_display
,
p_vout
->
p_sys
->
i_screen
)
==
8
)
XDefaultDepth
(
p_vout
->
p_sys
->
p_display
,
p_vout
->
p_sys
->
i_screen
)
==
8
)
{
{
/* Allocate a new palette */
/* Allocate a new palette */
p_vout
->
p_sys
->
colormap
=
p_vout
->
p_sys
->
colormap
=
...
@@ -1128,11 +1116,8 @@ static void DestroyWindow( vout_thread_t *p_vout, x11_window_t *p_win )
...
@@ -1128,11 +1116,8 @@ static void DestroyWindow( vout_thread_t *p_vout, x11_window_t *p_win )
XDestroyWindow
(
p_vout
->
p_sys
->
p_display
,
p_win
->
video_window
);
XDestroyWindow
(
p_vout
->
p_sys
->
p_display
,
p_win
->
video_window
);
XFreeGC
(
p_vout
->
p_sys
->
p_display
,
p_win
->
gc
);
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
);
}
}
}
/*****************************************************************************
/*****************************************************************************
...
@@ -1411,11 +1396,8 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
...
@@ -1411,11 +1396,8 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
p_vout
->
p_sys
->
b_altfullscreen
=
p_vout
->
p_sys
->
b_altfullscreen
=
config_GetInt
(
p_vout
,
MODULE_STRING
"-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
;
p_vout
->
p_sys
->
p_win
=
&
p_vout
->
p_sys
->
fullscreen_window
;
...
@@ -1525,32 +1507,22 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
...
@@ -1525,32 +1507,22 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
DestroyWindow
(
p_vout
,
&
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
;
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
/* Unfortunately, using XSync() here is not enough to ensure the
* window has already been mapped because the XMapWindow() request
* window has already been mapped because the XMapWindow() request
* has not necessarily been sent directly to our window (remember,
* has not necessarily been sent directly to our window (remember,
* the call is first redirected to the window manager) */
* 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) */
* already mapped by the server (see above) */
XSetInputFocus
(
p_vout
->
p_sys
->
p_display
,
XSetInputFocus
(
p_vout
->
p_sys
->
p_display
,
p_vout
->
p_sys
->
p_win
->
base_window
,
p_vout
->
p_sys
->
p_win
->
base_window
,
...
...
modules/video_output/x11/xcommon.h
View file @
2b5d2946
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* xcommon.h: Defines common to the X11 and XVideo plugins
* xcommon.h: Defines common to the X11 and XVideo plugins
*****************************************************************************
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.h,v 1.
6 2003/07/28 18:02:06 massiot
Exp $
* $Id: xcommon.h,v 1.
7 2003/07/29 09:32:14 sam
Exp $
*
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Samuel Hocevar <sam@zoy.org>
...
@@ -70,8 +70,6 @@ typedef struct x11_window_t
...
@@ -70,8 +70,6 @@ typedef struct x11_window_t
Atom
wm_protocols
;
Atom
wm_protocols
;
Atom
wm_delete_window
;
Atom
wm_delete_window
;
vlc_bool_t
b_owned
;
/* do we own this window? */
#ifdef HAVE_XINERAMA
#ifdef HAVE_XINERAMA
int
i_screen
;
int
i_screen
;
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment