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
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
Yoann Laissus
wine
Commits
8037389c
Commit
8037389c
authored
24 years ago
by
Susan Farley
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Preserve WM hints that were set during window creation by calling
XGetWMHints prior to XSetWMHints.
parent
e5e2fc99
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
include/ts_xutil.h
+1
-0
1 addition, 0 deletions
include/ts_xutil.h
tsx11/X11_calls
+1
-0
1 addition, 0 deletions
tsx11/X11_calls
tsx11/ts_xutil.c
+11
-0
11 additions, 0 deletions
tsx11/ts_xutil.c
windows/x11drv/wnd.c
+12
-8
12 additions, 8 deletions
windows/x11drv/wnd.c
with
25 additions
and
8 deletions
include/ts_xutil.h
+
1
−
0
View file @
8037389c
...
...
@@ -27,6 +27,7 @@ extern int TSXEmptyRegion(Region);
extern
int
TSXEqualRegion
(
Region
,
Region
);
extern
int
TSXFindContext
(
Display
*
,
XID
,
XContext
,
XPointer
*
);
extern
XVisualInfo
*
TSXGetVisualInfo
(
Display
*
,
long
,
XVisualInfo
*
,
int
*
);
extern
XWMHints
*
TSXGetWMHints
(
Display
*
,
Window
);
extern
int
TSXGetWMSizeHints
(
Display
*
,
Window
,
XSizeHints
*
,
long
*
,
Atom
);
extern
int
TSXIntersectRegion
(
Region
,
Region
,
Region
);
extern
int
TSXLookupString
(
XKeyEvent
*
,
char
*
,
int
,
KeySym
*
,
XComposeStatus
*
);
...
...
This diff is collapsed.
Click to expand it.
tsx11/X11_calls
+
1
−
0
View file @
8037389c
...
...
@@ -75,6 +75,7 @@ XGetModifierMapping
XGetScreenSaver
XGetSelectionOwner
XGetVisualInfo
XGetWMHints
XGetWMSizeHints
XGetWindowAttributes
XGetWindowProperty
...
...
This diff is collapsed.
Click to expand it.
tsx11/ts_xutil.c
+
11
−
0
View file @
8037389c
...
...
@@ -138,6 +138,17 @@ XVisualInfo * TSXGetVisualInfo(Display* a0, long a1, XVisualInfo* a2, int* a3)
return
r
;
}
XWMHints
*
TSXGetWMHints
(
Display
*
a0
,
Window
a1
)
{
XWMHints
*
r
;
TRACE
(
"Call XGetWMHints
\n
"
);
EnterCriticalSection
(
&
X11DRV_CritSection
);
r
=
XGetWMHints
(
a0
,
a1
);
LeaveCriticalSection
(
&
X11DRV_CritSection
);
TRACE
(
"Ret XGetWMHints
\n
"
);
return
r
;
}
int
TSXGetWMSizeHints
(
Display
*
a0
,
Window
a1
,
XSizeHints
*
a2
,
long
*
a3
,
Atom
a4
)
{
int
r
;
...
...
This diff is collapsed.
Click to expand it.
windows/x11drv/wnd.c
+
12
−
8
View file @
8037389c
...
...
@@ -249,12 +249,14 @@ static void X11DRV_WND_UpdateIconHints(WND *wndPtr)
X11DRV_WND_IconChanged
(
wndPtr
);
wm_hints
=
TSXAllocWMHints
();
X11DRV_WND_SetIconHints
(
wndPtr
,
wm_hints
);
TSXSetWMHints
(
display
,
X11DRV_WND_GetXWindow
(
wndPtr
),
wm_hints
);
TSXFree
(
wm_hints
);
wm_hints
=
TSXGetWMHints
(
display
,
X11DRV_WND_GetXWindow
(
wndPtr
)
);
if
(
!
wm_hints
)
wm_hints
=
TSXAllocWMHints
();
if
(
wm_hints
)
{
X11DRV_WND_SetIconHints
(
wndPtr
,
wm_hints
);
TSXSetWMHints
(
display
,
X11DRV_WND_GetXWindow
(
wndPtr
),
wm_hints
);
TSXFree
(
wm_hints
);
}
}
...
...
@@ -362,7 +364,7 @@ BOOL X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCTA *cs, BO
WIN_ReleaseWndPtr
(
tmpWnd
);
}
wm_hints
=
TSXAllocWMHints
()
;
if
((
wm_hints
=
TSXAllocWMHints
()
))
{
wm_hints
->
flags
=
InputHint
|
StateHint
|
WindowGroupHint
;
wm_hints
->
input
=
True
;
...
...
@@ -831,7 +833,9 @@ void X11DRV_WND_SetDrawable(WND *wndPtr, DC *dc, WORD flags, BOOL bSetClipOrigin
*/
static
BOOL
X11DRV_SetWMHint
(
Display
*
display
,
WND
*
wndPtr
,
int
hint
,
int
val
)
{
XWMHints
*
wm_hints
=
TSXAllocWMHints
();
XWMHints
*
wm_hints
=
TSXGetWMHints
(
display
,
X11DRV_WND_GetXWindow
(
wndPtr
)
);
if
(
!
wm_hints
)
wm_hints
=
TSXAllocWMHints
();
if
(
wm_hints
)
{
wm_hints
->
flags
=
hint
;
switch
(
hint
)
...
...
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