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
cc8a6b13
Commit
cc8a6b13
authored
Apr 02, 2023
by
Rémi Bernon
Committed by
Alexandre Julliard
Apr 03, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11: Remove unnecessary else control flow.
parent
b91774a1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
39 deletions
+37
-39
xim.c
dlls/winex11.drv/xim.c
+37
-39
No files found.
dlls/winex11.drv/xim.c
View file @
cc8a6b13
...
...
@@ -368,53 +368,51 @@ static BOOL open_xim( Display *display )
XGetIMValues
(
xim
,
XNQueryInputStyle
,
&
ximStyles
,
NULL
);
if
(
ximStyles
==
0
)
{
WARN
(
"Could not find supported input style.
\n
"
);
XCloseIM
(
xim
);
WARN
(
"Could not find supported input style.
\n
"
);
XCloseIM
(
xim
);
return
FALSE
;
}
else
{
TRACE
(
"ximStyles->count_styles = %d
\n
"
,
ximStyles
->
count_styles
);
ximStyleRoot
=
0
;
ximStyleNone
=
0
;
TRACE
(
"ximStyles->count_styles = %d
\n
"
,
ximStyles
->
count_styles
);
for
(
i
=
0
;
i
<
ximStyles
->
count_styles
;
++
i
)
ximStyleRoot
=
0
;
ximStyleNone
=
0
;
for
(
i
=
0
;
i
<
ximStyles
->
count_styles
;
++
i
)
{
int
style
=
ximStyles
->
supported_styles
[
i
];
TRACE
(
"ximStyles[%d] = %s%s%s%s%s
\n
"
,
i
,
(
style
&
XIMPreeditArea
)
?
"XIMPreeditArea "
:
""
,
(
style
&
XIMPreeditCallbacks
)
?
"XIMPreeditCallbacks "
:
""
,
(
style
&
XIMPreeditPosition
)
?
"XIMPreeditPosition "
:
""
,
(
style
&
XIMPreeditNothing
)
?
"XIMPreeditNothing "
:
""
,
(
style
&
XIMPreeditNone
)
?
"XIMPreeditNone "
:
""
);
if
(
!
ximStyle
&&
(
ximStyles
->
supported_styles
[
i
]
==
ximStyleRequest
))
{
int
style
=
ximStyles
->
supported_styles
[
i
];
TRACE
(
"ximStyles[%d] = %s%s%s%s%s
\n
"
,
i
,
(
style
&
XIMPreeditArea
)
?
"XIMPreeditArea "
:
""
,
(
style
&
XIMPreeditCallbacks
)
?
"XIMPreeditCallbacks "
:
""
,
(
style
&
XIMPreeditPosition
)
?
"XIMPreeditPosition "
:
""
,
(
style
&
XIMPreeditNothing
)
?
"XIMPreeditNothing "
:
""
,
(
style
&
XIMPreeditNone
)
?
"XIMPreeditNone "
:
""
);
if
(
!
ximStyle
&&
(
ximStyles
->
supported_styles
[
i
]
==
ximStyleRequest
))
{
ximStyle
=
ximStyleRequest
;
TRACE
(
"Setting Style: ximStyle = ximStyleRequest
\n
"
);
}
else
if
(
!
ximStyleRoot
&&
(
ximStyles
->
supported_styles
[
i
]
==
STYLE_ROOT
))
{
ximStyleRoot
=
STYLE_ROOT
;
TRACE
(
"Setting Style: ximStyleRoot = STYLE_ROOT
\n
"
);
}
else
if
(
!
ximStyleNone
&&
(
ximStyles
->
supported_styles
[
i
]
==
STYLE_NONE
))
{
TRACE
(
"Setting Style: ximStyleNone = STYLE_NONE
\n
"
);
ximStyleNone
=
STYLE_NONE
;
}
ximStyle
=
ximStyleRequest
;
TRACE
(
"Setting Style: ximStyle = ximStyleRequest
\n
"
);
}
else
if
(
!
ximStyleRoot
&&
(
ximStyles
->
supported_styles
[
i
]
==
STYLE_ROOT
))
{
ximStyleRoot
=
STYLE_ROOT
;
TRACE
(
"Setting Style: ximStyleRoot = STYLE_ROOT
\n
"
);
}
XFree
(
ximStyles
);
else
if
(
!
ximStyleNone
&&
(
ximStyles
->
supported_styles
[
i
]
==
STYLE_NONE
))
{
TRACE
(
"Setting Style: ximStyleNone = STYLE_NONE
\n
"
);
ximStyleNone
=
STYLE_NONE
;
}
}
XFree
(
ximStyles
);
if
(
ximStyle
==
0
)
ximStyle
=
ximStyleRoot
;
if
(
ximStyle
==
0
)
ximStyle
=
ximStyleRoot
;
if
(
ximStyle
==
0
)
ximStyle
=
ximStyleNone
;
}
if
(
ximStyle
==
0
)
ximStyle
=
ximStyleNone
;
thread_data
->
xim
=
xim
;
...
...
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