Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
d61ad6cd
Commit
d61ad6cd
authored
Feb 24, 2006
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x11drv: Make the synchronous option a debug channel instead of a
registry entry to make it easier to use.
parent
b079add3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
x11drv_main.c
dlls/x11drv/x11drv_main.c
+4
-7
No files found.
dlls/x11drv/x11drv_main.c
View file @
d61ad6cd
...
@@ -51,6 +51,7 @@
...
@@ -51,6 +51,7 @@
#include "wine/debug.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
x11drv
);
WINE_DEFAULT_DEBUG_CHANNEL
(
x11drv
);
WINE_DECLARE_DEBUG_CHANNEL
(
synchronous
);
static
CRITICAL_SECTION
X11DRV_CritSection
;
static
CRITICAL_SECTION
X11DRV_CritSection
;
static
CRITICAL_SECTION_DEBUG
critsect_debug
=
static
CRITICAL_SECTION_DEBUG
critsect_debug
=
...
@@ -86,7 +87,6 @@ int copy_default_colors = 128;
...
@@ -86,7 +87,6 @@ int copy_default_colors = 128;
int
alloc_system_colors
=
256
;
int
alloc_system_colors
=
256
;
DWORD
thread_data_tls_index
=
TLS_OUT_OF_INDEXES
;
DWORD
thread_data_tls_index
=
TLS_OUT_OF_INDEXES
;
static
BOOL
synchronous
;
/* run in synchronous mode? */
static
BOOL
desktop_dbl_buf
=
TRUE
;
static
BOOL
desktop_dbl_buf
=
TRUE
;
static
char
*
desktop_geometry
;
static
char
*
desktop_geometry
;
...
@@ -224,7 +224,7 @@ static int error_handler( Display *display, XErrorEvent *error_evt )
...
@@ -224,7 +224,7 @@ static int error_handler( Display *display, XErrorEvent *error_evt )
error_evt
->
error_code
,
error_evt
->
request_code
);
error_evt
->
error_code
,
error_evt
->
request_code
);
return
0
;
return
0
;
}
}
if
(
synchronous
)
if
(
TRACE_ON
(
synchronous
)
)
{
{
ERR
(
"X protocol error: serial=%ld, request_code=%d - breaking into debugger
\n
"
,
ERR
(
"X protocol error: serial=%ld, request_code=%d - breaking into debugger
\n
"
,
error_evt
->
serial
,
error_evt
->
request_code
);
error_evt
->
serial
,
error_evt
->
request_code
);
...
@@ -330,9 +330,6 @@ static void setup_options(void)
...
@@ -330,9 +330,6 @@ static void setup_options(void)
if
(
!
get_config_key
(
hkey
,
appkey
,
"ScreenDepth"
,
buffer
,
sizeof
(
buffer
)
))
if
(
!
get_config_key
(
hkey
,
appkey
,
"ScreenDepth"
,
buffer
,
sizeof
(
buffer
)
))
screen_depth
=
atoi
(
buffer
);
screen_depth
=
atoi
(
buffer
);
if
(
!
get_config_key
(
hkey
,
appkey
,
"Synchronous"
,
buffer
,
sizeof
(
buffer
)
))
synchronous
=
IS_OPTION_TRUE
(
buffer
[
0
]
);
if
(
!
get_config_key
(
hkey
,
appkey
,
"ClientSideWithCore"
,
buffer
,
sizeof
(
buffer
)
))
if
(
!
get_config_key
(
hkey
,
appkey
,
"ClientSideWithCore"
,
buffer
,
sizeof
(
buffer
)
))
client_side_with_core
=
IS_OPTION_TRUE
(
buffer
[
0
]
);
client_side_with_core
=
IS_OPTION_TRUE
(
buffer
[
0
]
);
...
@@ -417,7 +414,7 @@ static BOOL process_attach(void)
...
@@ -417,7 +414,7 @@ static BOOL process_attach(void)
XInternAtoms
(
display
,
(
char
**
)
atom_names
,
NB_XATOMS
-
FIRST_XATOM
,
False
,
X11DRV_Atoms
);
XInternAtoms
(
display
,
(
char
**
)
atom_names
,
NB_XATOMS
-
FIRST_XATOM
,
False
,
X11DRV_Atoms
);
if
(
synchronous
)
XSynchronize
(
display
,
True
);
if
(
TRACE_ON
(
synchronous
)
)
XSynchronize
(
display
,
True
);
screen_width
=
WidthOfScreen
(
screen
);
screen_width
=
WidthOfScreen
(
screen
);
screen_height
=
HeightOfScreen
(
screen
);
screen_height
=
HeightOfScreen
(
screen
);
...
@@ -526,7 +523,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
...
@@ -526,7 +523,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
}
}
#endif
#endif
if
(
synchronous
)
XSynchronize
(
data
->
display
,
True
);
if
(
TRACE_ON
(
synchronous
)
)
XSynchronize
(
data
->
display
,
True
);
wine_tsx11_unlock
();
wine_tsx11_unlock
();
if
(
use_xim
&&
!
(
data
->
xim
=
X11DRV_SetupXIM
(
data
->
display
,
input_style
)))
if
(
use_xim
&&
!
(
data
->
xim
=
X11DRV_SetupXIM
(
data
->
display
,
input_style
)))
...
...
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