Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jason Beetham
wine
Commits
6842064f
Commit
6842064f
authored
26 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
Fixed SetFocus that was broken when moved to x11drv.
parent
c6e45ed5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
windows/x11drv/wnd.c
+4
-4
4 additions, 4 deletions
windows/x11drv/wnd.c
with
4 additions
and
4 deletions
windows/x11drv/wnd.c
+
4
−
4
View file @
6842064f
...
...
@@ -434,6 +434,7 @@ void X11DRV_WND_SetFocus(WND *wndPtr)
{
HWND32
hwnd
=
wndPtr
->
hwndSelf
;
XWindowAttributes
win_attr
;
Window
win
;
/* Only mess with the X focus if there's */
/* no desktop window and no window manager. */
...
...
@@ -448,13 +449,12 @@ void X11DRV_WND_SetFocus(WND *wndPtr)
/* Set X focus and install colormap */
if
(
!
X11DRV_WND_GetXWindow
(
wndPtr
))
return
;
if
(
!
TSXGetWindowAttributes
(
display
,
X11DRV_WND_GetXWindow
(
wndPtr
),
&
win_attr
)
||
if
(
!
(
win
=
X11DRV_WND_FindXWindow
(
wndPtr
)))
return
;
if
(
!
TSXGetWindowAttributes
(
display
,
win
,
&
win_attr
)
||
(
win_attr
.
map_state
!=
IsViewable
))
return
;
/* If window is not viewable, don't change anything */
TSXSetInputFocus
(
display
,
X11DRV_WND_GetXWindow
(
wndPtr
)
,
RevertToParent
,
CurrentTime
);
TSXSetInputFocus
(
display
,
win
,
RevertToParent
,
CurrentTime
);
if
(
COLOR_GetSystemPaletteFlags
()
&
COLOR_PRIVATE
)
TSXInstallColormap
(
display
,
COLOR_GetColormap
()
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment