Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
fb8ca46e
Commit
fb8ca46e
authored
Apr 01, 2006
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x11drv: Ignore X errors caused by windows being created or deleted.
parent
eb7ef833
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
x11drv.h
dlls/x11drv/x11drv.h
+1
-0
x11drv_main.c
dlls/x11drv/x11drv_main.c
+16
-0
xrender.c
dlls/x11drv/xrender.c
+3
-3
No files found.
dlls/x11drv/x11drv.h
View file @
fb8ca46e
...
...
@@ -538,6 +538,7 @@ extern int managed_mode;
extern
int
private_color_map
;
extern
int
copy_default_colors
;
extern
int
alloc_system_colors
;
extern
int
xrender_error_base
;
extern
BYTE
key_state_table
[
256
];
extern
POINT
cursor_pos
;
...
...
dlls/x11drv/x11drv_main.c
View file @
fb8ca46e
...
...
@@ -37,6 +37,9 @@
#ifdef HAVE_XKB
#include <X11/XKBlib.h>
#endif
#ifdef HAVE_X11_EXTENSIONS_XRENDER_H
#include <X11/extensions/Xrender.h>
#endif
#include "windef.h"
#include "winbase.h"
...
...
@@ -85,6 +88,7 @@ int client_side_antialias_with_render = 1;
int
copy_default_colors
=
128
;
int
alloc_system_colors
=
256
;
DWORD
thread_data_tls_index
=
TLS_OUT_OF_INDEXES
;
int
xrender_error_base
=
0
;
static
BOOL
desktop_dbl_buf
=
TRUE
;
...
...
@@ -161,6 +165,18 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
static
inline
BOOL
ignore_error
(
Display
*
display
,
XErrorEvent
*
event
)
{
if
(
event
->
request_code
==
X_SetInputFocus
&&
event
->
error_code
==
BadMatch
)
return
TRUE
;
/* ignore a number of errors on gdi display caused by creating/destroying windows */
if
(
display
==
gdi_display
)
{
if
(
event
->
error_code
==
BadDrawable
||
event
->
error_code
==
BadGC
)
return
TRUE
;
#ifdef HAVE_X11_EXTENSIONS_XRENDER_H
if
(
xrender_error_base
)
/* check for XRender errors */
{
if
(
event
->
error_code
==
xrender_error_base
+
BadPicture
)
return
TRUE
;
}
#endif
}
return
FALSE
;
}
...
...
dlls/x11drv/xrender.c
View file @
fb8ca46e
...
...
@@ -167,7 +167,7 @@ static CRITICAL_SECTION xrender_cs = { &critsect_debug, -1, 0, 0, 0, 0 };
*/
void
X11DRV_XRender_Init
(
void
)
{
int
e
rror_base
,
e
vent_base
,
i
;
int
event_base
,
i
;
XRenderPictFormat
pf
;
if
(
client_side_with_render
&&
...
...
@@ -200,9 +200,9 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform)
wine_tsx11_lock
();
if
(
pXRenderQueryExtension
(
gdi_display
,
&
event_base
,
&
error_base
))
{
if
(
pXRenderQueryExtension
(
gdi_display
,
&
event_base
,
&
xrender_
error_base
))
{
X11DRV_XRender_Installed
=
TRUE
;
TRACE
(
"Xrender is up and running error_base = %d
\n
"
,
error_base
);
TRACE
(
"Xrender is up and running error_base = %d
\n
"
,
xrender_
error_base
);
screen_format
=
pXRenderFindVisualFormat
(
gdi_display
,
visual
);
if
(
!
screen_format
)
{
...
...
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