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
8037389c
Commit
8037389c
authored
Jun 02, 2000
by
Susan Farley
Committed by
Alexandre Julliard
Jun 02, 2000
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Preserve WM hints that were set during window creation by calling
XGetWMHints prior to XSetWMHints.
parent
e5e2fc99
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
5 deletions
+22
-5
ts_xutil.h
include/ts_xutil.h
+1
-0
X11_calls
tsx11/X11_calls
+1
-0
ts_xutil.c
tsx11/ts_xutil.c
+11
-0
wnd.c
windows/x11drv/wnd.c
+9
-5
No files found.
include/ts_xutil.h
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
*
);
...
...
tsx11/X11_calls
View file @
8037389c
...
...
@@ -75,6 +75,7 @@ XGetModifierMapping
XGetScreenSaver
XGetSelectionOwner
XGetVisualInfo
XGetWMHints
XGetWMSizeHints
XGetWindowAttributes
XGetWindowProperty
...
...
tsx11/ts_xutil.c
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
;
...
...
windows/x11drv/wnd.c
View file @
8037389c
...
...
@@ -249,12 +249,14 @@ static void X11DRV_WND_UpdateIconHints(WND *wndPtr)
X11DRV_WND_IconChanged
(
wndPtr
);
wm_hints
=
TSXAllocWMHints
();
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
)
...
...
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