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
557066db
Commit
557066db
authored
Oct 13, 2000
by
Susan Farley
Committed by
Alexandre Julliard
Oct 13, 2000
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Status bars on managed windows should not have SIZEGRIP style.
parent
6e843d7d
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
50 additions
and
42 deletions
+50
-42
status.c
dlls/comctl32/status.c
+9
-1
win.h
include/win.h
+0
-1
winuser.h
include/winuser.h
+1
-0
nonclient.c
windows/nonclient.c
+16
-16
win.c
windows/win.c
+1
-1
winpos.c
windows/winpos.c
+6
-6
event.c
windows/x11drv/event.c
+7
-7
wnd.c
windows/x11drv/wnd.c
+10
-10
No files found.
dlls/comctl32/status.c
View file @
557066db
...
@@ -848,6 +848,7 @@ STATUSBAR_WMCreate (HWND hwnd, WPARAM wParam, LPARAM lParam)
...
@@ -848,6 +848,7 @@ STATUSBAR_WMCreate (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
{
LPCREATESTRUCTA
lpCreate
=
(
LPCREATESTRUCTA
)
lParam
;
LPCREATESTRUCTA
lpCreate
=
(
LPCREATESTRUCTA
)
lParam
;
NONCLIENTMETRICSA
nclm
;
NONCLIENTMETRICSA
nclm
;
DWORD
dwStyle
;
RECT
rect
;
RECT
rect
;
int
width
,
len
;
int
width
,
len
;
HDC
hdc
;
HDC
hdc
;
...
@@ -898,6 +899,13 @@ STATUSBAR_WMCreate (HWND hwnd, WPARAM wParam, LPARAM lParam)
...
@@ -898,6 +899,13 @@ STATUSBAR_WMCreate (HWND hwnd, WPARAM wParam, LPARAM lParam)
}
}
}
}
dwStyle
=
GetWindowLongA
(
hwnd
,
GWL_STYLE
);
/* statusbars on managed windows should not have SIZEGRIP style */
if
((
dwStyle
&
SBARS_SIZEGRIP
)
&&
lpCreate
->
hwndParent
)
if
(
GetWindowLongA
(
lpCreate
->
hwndParent
,
GWL_EXSTYLE
)
&
WS_EX_MANAGED
)
SetWindowLongA
(
hwnd
,
GWL_STYLE
,
dwStyle
&
~
SBARS_SIZEGRIP
);
if
((
hdc
=
GetDC
(
0
)))
{
if
((
hdc
=
GetDC
(
0
)))
{
TEXTMETRICA
tm
;
TEXTMETRICA
tm
;
HFONT
hOldFont
;
HFONT
hOldFont
;
...
@@ -909,7 +917,7 @@ STATUSBAR_WMCreate (HWND hwnd, WPARAM wParam, LPARAM lParam)
...
@@ -909,7 +917,7 @@ STATUSBAR_WMCreate (HWND hwnd, WPARAM wParam, LPARAM lParam)
ReleaseDC
(
0
,
hdc
);
ReleaseDC
(
0
,
hdc
);
}
}
if
(
GetWindowLongA
(
hwnd
,
GWL_STYLE
)
&
SBT_TOOLTIPS
)
{
if
(
dwStyle
&
SBT_TOOLTIPS
)
{
self
->
hwndToolTip
=
self
->
hwndToolTip
=
CreateWindowExA
(
0
,
TOOLTIPS_CLASSA
,
NULL
,
0
,
CreateWindowExA
(
0
,
TOOLTIPS_CLASSA
,
NULL
,
0
,
CW_USEDEFAULT
,
CW_USEDEFAULT
,
CW_USEDEFAULT
,
CW_USEDEFAULT
,
...
...
include/win.h
View file @
557066db
...
@@ -154,7 +154,6 @@ typedef struct
...
@@ -154,7 +154,6 @@ typedef struct
#define WIN_NATIVE 0x0020
/* Directly mapped to the window provided by the driver */
#define WIN_NATIVE 0x0020
/* Directly mapped to the window provided by the driver */
#define WIN_NEED_SIZE 0x0040
/* Internal WM_SIZE is needed */
#define WIN_NEED_SIZE 0x0040
/* Internal WM_SIZE is needed */
#define WIN_NCACTIVATED 0x0080
/* last WM_NCACTIVATE was positive */
#define WIN_NCACTIVATED 0x0080
/* last WM_NCACTIVATE was positive */
#define WIN_MANAGED 0x0100
/* Window managed by the window system */
#define WIN_ISDIALOG 0x0200
/* Window is a dialog */
#define WIN_ISDIALOG 0x0200
/* Window is a dialog */
#define WIN_ISWIN32 0x0400
/* Understands Win32 messages */
#define WIN_ISWIN32 0x0400
/* Understands Win32 messages */
#define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0800
/* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */
#define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0800
/* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */
...
...
include/winuser.h
View file @
557066db
...
@@ -2441,6 +2441,7 @@ DECL_WINELIB_TYPE_AW(LPICONMETRICS)
...
@@ -2441,6 +2441,7 @@ DECL_WINELIB_TYPE_AW(LPICONMETRICS)
/* WINE internal... */
/* WINE internal... */
#define WS_EX_TRAYWINDOW 0x80000000L
#define WS_EX_TRAYWINDOW 0x80000000L
#define WS_EX_MANAGED 0x40000000L
/* Window managed by the window system */
/* Window scrolling */
/* Window scrolling */
#define SW_SCROLLCHILDREN 0x0001
#define SW_SCROLLCHILDREN 0x0001
...
...
windows/nonclient.c
View file @
557066db
...
@@ -592,7 +592,7 @@ static void NC_GetInsideRect( HWND hwnd, RECT *rect )
...
@@ -592,7 +592,7 @@ static void NC_GetInsideRect( HWND hwnd, RECT *rect )
rect
->
right
=
wndPtr
->
rectWindow
.
right
-
wndPtr
->
rectWindow
.
left
;
rect
->
right
=
wndPtr
->
rectWindow
.
right
-
wndPtr
->
rectWindow
.
left
;
rect
->
bottom
=
wndPtr
->
rectWindow
.
bottom
-
wndPtr
->
rectWindow
.
top
;
rect
->
bottom
=
wndPtr
->
rectWindow
.
bottom
-
wndPtr
->
rectWindow
.
top
;
if
((
wndPtr
->
dwStyle
&
WS_ICONIC
)
||
(
wndPtr
->
flags
&
WIN
_MANAGED
))
goto
END
;
if
((
wndPtr
->
dwStyle
&
WS_ICONIC
)
||
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
))
goto
END
;
/* Remove frame from rectangle */
/* Remove frame from rectangle */
if
(
HAS_THICKFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
if
(
HAS_THICKFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
...
@@ -631,7 +631,7 @@ NC_GetInsideRect95 (HWND hwnd, RECT *rect)
...
@@ -631,7 +631,7 @@ NC_GetInsideRect95 (HWND hwnd, RECT *rect)
rect
->
right
=
wndPtr
->
rectWindow
.
right
-
wndPtr
->
rectWindow
.
left
;
rect
->
right
=
wndPtr
->
rectWindow
.
right
-
wndPtr
->
rectWindow
.
left
;
rect
->
bottom
=
wndPtr
->
rectWindow
.
bottom
-
wndPtr
->
rectWindow
.
top
;
rect
->
bottom
=
wndPtr
->
rectWindow
.
bottom
-
wndPtr
->
rectWindow
.
top
;
if
((
wndPtr
->
dwStyle
&
WS_ICONIC
)
||
(
wndPtr
->
flags
&
WIN
_MANAGED
))
goto
END
;
if
((
wndPtr
->
dwStyle
&
WS_ICONIC
)
||
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
))
goto
END
;
/* Remove frame from rectangle */
/* Remove frame from rectangle */
if
(
HAS_THICKFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
if
(
HAS_THICKFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
...
@@ -681,7 +681,7 @@ static LONG NC_DoNCHitTest (WND *wndPtr, POINT pt )
...
@@ -681,7 +681,7 @@ static LONG NC_DoNCHitTest (WND *wndPtr, POINT pt )
if
(
wndPtr
->
dwStyle
&
WS_MINIMIZE
)
return
HTCAPTION
;
if
(
wndPtr
->
dwStyle
&
WS_MINIMIZE
)
return
HTCAPTION
;
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
))
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
))
{
{
/* Check borders */
/* Check borders */
if
(
HAS_THICKFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
if
(
HAS_THICKFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
...
@@ -816,7 +816,7 @@ static LONG NC_DoNCHitTest95 (WND *wndPtr, POINT pt )
...
@@ -816,7 +816,7 @@ static LONG NC_DoNCHitTest95 (WND *wndPtr, POINT pt )
if
(
wndPtr
->
dwStyle
&
WS_MINIMIZE
)
return
HTCAPTION
;
if
(
wndPtr
->
dwStyle
&
WS_MINIMIZE
)
return
HTCAPTION
;
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
))
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
))
{
{
/* Check borders */
/* Check borders */
if
(
HAS_THICKFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
if
(
HAS_THICKFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
...
@@ -978,7 +978,7 @@ void NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down )
...
@@ -978,7 +978,7 @@ void NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down )
HBITMAP
hbitmap
;
HBITMAP
hbitmap
;
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
)
)
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
)
{
{
NC_GetInsideRect
(
hwnd
,
&
rect
);
NC_GetInsideRect
(
hwnd
,
&
rect
);
hdcMem
=
CreateCompatibleDC
(
hdc
);
hdcMem
=
CreateCompatibleDC
(
hdc
);
...
@@ -1002,7 +1002,7 @@ static void NC_DrawMaxButton( HWND hwnd, HDC16 hdc, BOOL down )
...
@@ -1002,7 +1002,7 @@ static void NC_DrawMaxButton( HWND hwnd, HDC16 hdc, BOOL down )
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
HDC
hdcMem
;
HDC
hdcMem
;
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
)
)
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
)
{
{
NC_GetInsideRect
(
hwnd
,
&
rect
);
NC_GetInsideRect
(
hwnd
,
&
rect
);
hdcMem
=
CreateCompatibleDC
(
hdc
);
hdcMem
=
CreateCompatibleDC
(
hdc
);
...
@@ -1028,7 +1028,7 @@ static void NC_DrawMinButton( HWND hwnd, HDC16 hdc, BOOL down )
...
@@ -1028,7 +1028,7 @@ static void NC_DrawMinButton( HWND hwnd, HDC16 hdc, BOOL down )
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
HDC
hdcMem
;
HDC
hdcMem
;
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
)
)
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
)
{
{
NC_GetInsideRect
(
hwnd
,
&
rect
);
NC_GetInsideRect
(
hwnd
,
&
rect
);
hdcMem
=
CreateCompatibleDC
(
hdc
);
hdcMem
=
CreateCompatibleDC
(
hdc
);
...
@@ -1065,7 +1065,7 @@ NC_DrawSysButton95 (HWND hwnd, HDC hdc, BOOL down)
...
@@ -1065,7 +1065,7 @@ NC_DrawSysButton95 (HWND hwnd, HDC hdc, BOOL down)
{
{
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
)
)
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
)
{
{
HICON
hIcon
;
HICON
hIcon
;
RECT
rect
;
RECT
rect
;
...
@@ -1112,7 +1112,7 @@ static void NC_DrawCloseButton95 (HWND hwnd, HDC hdc, BOOL down, BOOL bGrayed)
...
@@ -1112,7 +1112,7 @@ static void NC_DrawCloseButton95 (HWND hwnd, HDC hdc, BOOL down, BOOL bGrayed)
HDC
hdcMem
;
HDC
hdcMem
;
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
)
)
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
)
{
{
BITMAP
bmp
;
BITMAP
bmp
;
HBITMAP
hBmp
,
hOldBmp
;
HBITMAP
hBmp
,
hOldBmp
;
...
@@ -1187,7 +1187,7 @@ static void NC_DrawMaxButton95(HWND hwnd,HDC16 hdc,BOOL down, BOOL bGrayed)
...
@@ -1187,7 +1187,7 @@ static void NC_DrawMaxButton95(HWND hwnd,HDC16 hdc,BOOL down, BOOL bGrayed)
HDC
hdcMem
;
HDC
hdcMem
;
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
))
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
))
{
{
BITMAP
bmp
;
BITMAP
bmp
;
HBITMAP
hBmp
,
hOldBmp
;
HBITMAP
hBmp
,
hOldBmp
;
...
@@ -1246,7 +1246,7 @@ static void NC_DrawMinButton95(HWND hwnd,HDC16 hdc,BOOL down, BOOL bGrayed)
...
@@ -1246,7 +1246,7 @@ static void NC_DrawMinButton95(HWND hwnd,HDC16 hdc,BOOL down, BOOL bGrayed)
HDC
hdcMem
;
HDC
hdcMem
;
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
))
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
))
{
{
BITMAP
bmp
;
BITMAP
bmp
;
...
@@ -1460,7 +1460,7 @@ static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd,
...
@@ -1460,7 +1460,7 @@ static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd,
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
WND
*
wndPtr
=
WIN_FindWndPtr
(
hwnd
);
char
buffer
[
256
];
char
buffer
[
256
];
if
(
wndPtr
->
flags
&
WIN
_MANAGED
)
if
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
{
{
WIN_ReleaseWndPtr
(
wndPtr
);
WIN_ReleaseWndPtr
(
wndPtr
);
return
;
return
;
...
@@ -1566,7 +1566,7 @@ static void NC_DrawCaption95(
...
@@ -1566,7 +1566,7 @@ static void NC_DrawCaption95(
HPEN
hPrevPen
;
HPEN
hPrevPen
;
HMENU
hSysMenu
;
HMENU
hSysMenu
;
if
(
wndPtr
->
flags
&
WIN
_MANAGED
)
if
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
{
{
WIN_ReleaseWndPtr
(
wndPtr
);
WIN_ReleaseWndPtr
(
wndPtr
);
return
;
return
;
...
@@ -1685,7 +1685,7 @@ static void NC_DoNCPaint( WND* wndPtr, HRGN clip, BOOL suppress_menupaint )
...
@@ -1685,7 +1685,7 @@ static void NC_DoNCPaint( WND* wndPtr, HRGN clip, BOOL suppress_menupaint )
SelectObject
(
hdc
,
GetSysColorPen
(
COLOR_WINDOWFRAME
)
);
SelectObject
(
hdc
,
GetSysColorPen
(
COLOR_WINDOWFRAME
)
);
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
))
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
))
{
{
if
(
HAS_ANYFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
if
(
HAS_ANYFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
{
{
...
@@ -1816,7 +1816,7 @@ static void NC_DoNCPaint95(
...
@@ -1816,7 +1816,7 @@ static void NC_DoNCPaint95(
SelectObject
(
hdc
,
GetSysColorPen
(
COLOR_WINDOWFRAME
)
);
SelectObject
(
hdc
,
GetSysColorPen
(
COLOR_WINDOWFRAME
)
);
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
))
{
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
))
{
if
(
HAS_BIGFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
{
if
(
HAS_BIGFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
{
DrawEdge
(
hdc
,
&
rect
,
EDGE_RAISED
,
BF_RECT
|
BF_ADJUST
);
DrawEdge
(
hdc
,
&
rect
,
EDGE_RAISED
,
BF_RECT
|
BF_ADJUST
);
}
}
...
@@ -2139,7 +2139,7 @@ static void NC_DoSizeMove( HWND hwnd, WORD wParam )
...
@@ -2139,7 +2139,7 @@ static void NC_DoSizeMove( HWND hwnd, WORD wParam )
capturePoint
=
pt
;
capturePoint
=
pt
;
if
(
IsZoomed
(
hwnd
)
||
!
IsWindowVisible
(
hwnd
)
||
if
(
IsZoomed
(
hwnd
)
||
!
IsWindowVisible
(
hwnd
)
||
(
wndPtr
->
flags
&
WIN
_MANAGED
))
goto
END
;
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
))
goto
END
;
if
((
wParam
&
0xfff0
)
==
SC_MOVE
)
if
((
wParam
&
0xfff0
)
==
SC_MOVE
)
{
{
...
...
windows/win.c
View file @
557066db
...
@@ -2675,7 +2675,7 @@ BOOL WIN_InternalShowOwnedPopups( HWND owner, BOOL fShow, BOOL unmanagedOnly )
...
@@ -2675,7 +2675,7 @@ BOOL WIN_InternalShowOwnedPopups( HWND owner, BOOL fShow, BOOL unmanagedOnly )
{
{
if
(
IsWindowVisible
(
pWnd
[
count
]
->
hwndSelf
)
&&
/* hide only if window is visible */
if
(
IsWindowVisible
(
pWnd
[
count
]
->
hwndSelf
)
&&
/* hide only if window is visible */
!
(
pWnd
[
count
]
->
flags
&
WIN_NEEDS_INTERNALSOP
)
&&
/* don't hide if previous call already did it */
!
(
pWnd
[
count
]
->
flags
&
WIN_NEEDS_INTERNALSOP
)
&&
/* don't hide if previous call already did it */
!
(
unmanagedOnly
&&
(
pWnd
[
count
]
->
flags
&
WIN_MANAGED
)
)
)
/* don't hide managed windows if unmanagedOnly is TRUE */
!
(
unmanagedOnly
&&
(
pWnd
[
count
]
->
dwExStyle
&
WS_EX_MANAGED
)
)
)
/* don't hide managed windows if unmanagedOnly is TRUE */
{
{
/*
/*
* Call ShowWindow directly because an application can intercept WM_SHOWWINDOW messages
* Call ShowWindow directly because an application can intercept WM_SHOWWINDOW messages
...
...
windows/winpos.c
View file @
557066db
...
@@ -461,7 +461,7 @@ INT16 WINPOS_WindowFromPoint( WND* wndScope, POINT16 pt, WND **ppWnd )
...
@@ -461,7 +461,7 @@ INT16 WINPOS_WindowFromPoint( WND* wndScope, POINT16 pt, WND **ppWnd )
goto
end
;
goto
end
;
}
}
if
(
wndScope
->
flags
&
WIN_MANAGED
)
if
(
wndScope
->
dwExStyle
&
WS_EX_MANAGED
)
{
{
/* In managed mode we have to check wndScope first as it is also
/* In managed mode we have to check wndScope first as it is also
* a window which received the mouse event. */
* a window which received the mouse event. */
...
@@ -1112,7 +1112,7 @@ BOOL WINPOS_ShowIconTitle( WND* pWnd, BOOL bShow )
...
@@ -1112,7 +1112,7 @@ BOOL WINPOS_ShowIconTitle( WND* pWnd, BOOL bShow )
{
{
LPINTERNALPOS
lpPos
=
(
LPINTERNALPOS
)
GetPropA
(
pWnd
->
hwndSelf
,
atomInternalPos
);
LPINTERNALPOS
lpPos
=
(
LPINTERNALPOS
)
GetPropA
(
pWnd
->
hwndSelf
,
atomInternalPos
);
if
(
lpPos
&&
!
(
pWnd
->
flags
&
WIN
_MANAGED
))
if
(
lpPos
&&
!
(
pWnd
->
dwExStyle
&
WS_EX
_MANAGED
))
{
{
HWND16
hWnd
=
lpPos
->
hwndIconTitle
;
HWND16
hWnd
=
lpPos
->
hwndIconTitle
;
...
@@ -1159,7 +1159,7 @@ void WINPOS_GetMinMaxInfo( WND *wndPtr, POINT *maxSize, POINT *maxPos,
...
@@ -1159,7 +1159,7 @@ void WINPOS_GetMinMaxInfo( WND *wndPtr, POINT *maxSize, POINT *maxPos,
MinMax
.
ptMaxTrackSize
.
x
=
GetSystemMetrics
(
SM_CXSCREEN
);
MinMax
.
ptMaxTrackSize
.
x
=
GetSystemMetrics
(
SM_CXSCREEN
);
MinMax
.
ptMaxTrackSize
.
y
=
GetSystemMetrics
(
SM_CYSCREEN
);
MinMax
.
ptMaxTrackSize
.
y
=
GetSystemMetrics
(
SM_CYSCREEN
);
if
(
wndPtr
->
flags
&
WIN
_MANAGED
)
xinc
=
yinc
=
0
;
if
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
xinc
=
yinc
=
0
;
else
if
(
HAS_DLGFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
else
if
(
HAS_DLGFRAME
(
wndPtr
->
dwStyle
,
wndPtr
->
dwExStyle
))
{
{
xinc
=
GetSystemMetrics
(
SM_CXDLGFRAME
);
xinc
=
GetSystemMetrics
(
SM_CXDLGFRAME
);
...
@@ -1824,7 +1824,7 @@ BOOL WINPOS_SetActiveWindow( HWND hWnd, BOOL fMouse, BOOL fChangeFocus)
...
@@ -1824,7 +1824,7 @@ BOOL WINPOS_SetActiveWindow( HWND hWnd, BOOL fMouse, BOOL fChangeFocus)
if
(
IsIconic
(
hwndPrevActive
)
)
WINPOS_RedrawIconTitle
(
hwndPrevActive
);
if
(
IsIconic
(
hwndPrevActive
)
)
WINPOS_RedrawIconTitle
(
hwndPrevActive
);
/* managed windows will get ConfigureNotify event */
/* managed windows will get ConfigureNotify event */
if
(
wndPtr
&&
!
(
wndPtr
->
dwStyle
&
WS_CHILD
)
&&
!
(
wndPtr
->
flags
&
WIN
_MANAGED
))
if
(
wndPtr
&&
!
(
wndPtr
->
dwStyle
&
WS_CHILD
)
&&
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
))
{
{
/* check Z-order and bring hWnd to the top */
/* check Z-order and bring hWnd to the top */
for
(
wndTemp
=
WIN_LockWndPtr
(
WIN_GetDesktop
()
->
child
);
wndTemp
;
WIN_UpdateWndPtr
(
&
wndTemp
,
wndTemp
->
next
))
for
(
wndTemp
=
WIN_LockWndPtr
(
WIN_GetDesktop
()
->
child
);
wndTemp
;
WIN_UpdateWndPtr
(
&
wndTemp
,
wndTemp
->
next
))
...
@@ -2785,7 +2785,7 @@ Pos: /* -----------------------------------------------------------------------
...
@@ -2785,7 +2785,7 @@ Pos: /* -----------------------------------------------------------------------
* only the nonclient area by setting bit gravity hint for the host window system.
* only the nonclient area by setting bit gravity hint for the host window system.
*/
*/
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
)
)
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
)
{
{
HRGN
hrgn
=
CreateRectRgn
(
0
,
0
,
newWindowRect
.
right
-
newWindowRect
.
left
,
HRGN
hrgn
=
CreateRectRgn
(
0
,
0
,
newWindowRect
.
right
-
newWindowRect
.
left
,
newWindowRect
.
bottom
-
newWindowRect
.
top
);
newWindowRect
.
bottom
-
newWindowRect
.
top
);
...
@@ -2816,7 +2816,7 @@ Pos: /* -----------------------------------------------------------------------
...
@@ -2816,7 +2816,7 @@ Pos: /* -----------------------------------------------------------------------
wndPtr
->
dwStyle
|=
WS_VISIBLE
;
wndPtr
->
dwStyle
|=
WS_VISIBLE
;
if
(
wndPtr
->
flags
&
WIN
_MANAGED
)
resync
=
TRUE
;
if
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
resync
=
TRUE
;
/* focus was set to unmapped window, reset host focus
/* focus was set to unmapped window, reset host focus
* since the window is now visible */
* since the window is now visible */
...
...
windows/x11drv/event.c
View file @
557066db
...
@@ -487,12 +487,12 @@ static BOOL __check_query_condition( WND** pWndA, WND** pWndB )
...
@@ -487,12 +487,12 @@ static BOOL __check_query_condition( WND** pWndA, WND** pWndB )
/* return TRUE if we have at least two managed windows */
/* return TRUE if we have at least two managed windows */
for
(
*
pWndB
=
NULL
;
*
pWndA
;
*
pWndA
=
(
*
pWndA
)
->
next
)
for
(
*
pWndB
=
NULL
;
*
pWndA
;
*
pWndA
=
(
*
pWndA
)
->
next
)
if
(
(
*
pWndA
)
->
flags
&
WIN_MANAGED
&&
if
(
(
(
*
pWndA
)
->
dwExStyle
&
WS_EX_MANAGED
)
&&
(
*
pWndA
)
->
dwStyle
&
WS_VISIBLE
)
break
;
(
(
*
pWndA
)
->
dwStyle
&
WS_VISIBLE
)
)
break
;
if
(
*
pWndA
)
if
(
*
pWndA
)
for
(
*
pWndB
=
(
*
pWndA
)
->
next
;
*
pWndB
;
*
pWndB
=
(
*
pWndB
)
->
next
)
for
(
*
pWndB
=
(
*
pWndA
)
->
next
;
*
pWndB
;
*
pWndB
=
(
*
pWndB
)
->
next
)
if
(
(
*
pWndB
)
->
flags
&
WIN_MANAGED
&&
if
(
(
(
*
pWndB
)
->
dwExStyle
&
WS_EX_MANAGED
)
&&
(
*
pWndB
)
->
dwStyle
&
WS_VISIBLE
)
break
;
(
(
*
pWndB
)
->
dwStyle
&
WS_VISIBLE
)
)
break
;
return
((
*
pWndB
)
!=
NULL
);
return
((
*
pWndB
)
!=
NULL
);
}
}
...
@@ -584,7 +584,7 @@ static HWND EVENT_QueryZOrder( HWND hWndCheck)
...
@@ -584,7 +584,7 @@ static HWND EVENT_QueryZOrder( HWND hWndCheck)
if
(
pWnd
!=
pWndCheck
)
if
(
pWnd
!=
pWndCheck
)
{
{
if
(
!
(
pWnd
->
flags
&
WIN
_MANAGED
)
||
if
(
!
(
pWnd
->
dwExStyle
&
WS_EX
_MANAGED
)
||
!
(
w
=
__get_top_decoration
(
X11DRV_WND_GetXWindow
(
pWnd
),
parent
))
)
!
(
w
=
__get_top_decoration
(
X11DRV_WND_GetXWindow
(
pWnd
),
parent
))
)
continue
;
continue
;
pos
=
__td_lookup
(
w
,
children
,
total
);
pos
=
__td_lookup
(
w
,
children
,
total
);
...
@@ -1827,7 +1827,7 @@ void EVENT_MapNotify( HWND hWnd, XMapEvent *event )
...
@@ -1827,7 +1827,7 @@ void EVENT_MapNotify( HWND hWnd, XMapEvent *event )
HWND
hwndFocus
=
GetFocus
();
HWND
hwndFocus
=
GetFocus
();
WND
*
wndFocus
=
WIN_FindWndPtr
(
hwndFocus
);
WND
*
wndFocus
=
WIN_FindWndPtr
(
hwndFocus
);
WND
*
pWnd
=
WIN_FindWndPtr
(
hWnd
);
WND
*
pWnd
=
WIN_FindWndPtr
(
hWnd
);
if
(
pWnd
&&
(
pWnd
->
flags
&
WIN
_MANAGED
))
if
(
pWnd
&&
(
pWnd
->
dwExStyle
&
WS_EX
_MANAGED
))
{
{
DCE_InvalidateDCE
(
pWnd
,
&
pWnd
->
rectWindow
);
DCE_InvalidateDCE
(
pWnd
,
&
pWnd
->
rectWindow
);
pWnd
->
dwStyle
&=
~
WS_MINIMIZE
;
pWnd
->
dwStyle
&=
~
WS_MINIMIZE
;
...
@@ -1851,7 +1851,7 @@ void EVENT_MapNotify( HWND hWnd, XMapEvent *event )
...
@@ -1851,7 +1851,7 @@ void EVENT_MapNotify( HWND hWnd, XMapEvent *event )
void
EVENT_UnmapNotify
(
HWND
hWnd
,
XUnmapEvent
*
event
)
void
EVENT_UnmapNotify
(
HWND
hWnd
,
XUnmapEvent
*
event
)
{
{
WND
*
pWnd
=
WIN_FindWndPtr
(
hWnd
);
WND
*
pWnd
=
WIN_FindWndPtr
(
hWnd
);
if
(
pWnd
&&
(
pWnd
->
flags
&
WIN
_MANAGED
))
if
(
pWnd
&&
(
pWnd
->
dwExStyle
&
WS_EX
_MANAGED
))
{
{
EndMenu
();
EndMenu
();
if
(
pWnd
->
dwStyle
&
WS_VISIBLE
)
if
(
pWnd
->
dwStyle
&
WS_VISIBLE
)
...
...
windows/x11drv/wnd.c
View file @
557066db
...
@@ -320,7 +320,7 @@ BOOL X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCTA *cs, BO
...
@@ -320,7 +320,7 @@ BOOL X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCTA *cs, BO
ButtonPressMask
|
ButtonReleaseMask
|
ButtonPressMask
|
ButtonReleaseMask
|
FocusChangeMask
|
StructureNotifyMask
;
FocusChangeMask
|
StructureNotifyMask
;
win_attr
.
override_redirect
=
FALSE
;
win_attr
.
override_redirect
=
FALSE
;
wndPtr
->
flags
|=
WIN
_MANAGED
;
wndPtr
->
dwExStyle
|=
WS_EX
_MANAGED
;
}
else
{
}
else
{
win_attr
.
event_mask
=
ExposureMask
|
KeyPressMask
|
win_attr
.
event_mask
=
ExposureMask
|
KeyPressMask
|
KeyReleaseMask
|
PointerMotionMask
|
KeyReleaseMask
|
PointerMotionMask
|
...
@@ -365,7 +365,7 @@ BOOL X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCTA *cs, BO
...
@@ -365,7 +365,7 @@ BOOL X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCTA *cs, BO
if
(
wndPtr
->
dwExStyle
&
WS_EX_TRAYWINDOW
)
if
(
wndPtr
->
dwExStyle
&
WS_EX_TRAYWINDOW
)
X11DRV_WND_DockWindow
(
wndPtr
);
X11DRV_WND_DockWindow
(
wndPtr
);
if
(
wndPtr
->
flags
&
WIN
_MANAGED
)
if
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
{
{
XClassHint
*
class_hints
=
TSXAllocClassHint
();
XClassHint
*
class_hints
=
TSXAllocClassHint
();
XSizeHints
*
size_hints
=
TSXAllocSizeHints
();
XSizeHints
*
size_hints
=
TSXAllocSizeHints
();
...
@@ -417,7 +417,7 @@ BOOL X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCTA *cs, BO
...
@@ -417,7 +417,7 @@ BOOL X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCTA *cs, BO
wm_hints
->
flags
=
InputHint
|
StateHint
|
WindowGroupHint
;
wm_hints
->
flags
=
InputHint
|
StateHint
|
WindowGroupHint
;
wm_hints
->
input
=
True
;
wm_hints
->
input
=
True
;
if
(
wndPtr
->
flags
&
WIN_MANAGED
)
if
(
wndPtr
->
dwExStyle
&
WS_EX_MANAGED
)
{
{
X11DRV_WND_IconChanged
(
wndPtr
);
X11DRV_WND_IconChanged
(
wndPtr
);
X11DRV_WND_SetIconHints
(
wndPtr
,
wm_hints
);
X11DRV_WND_SetIconHints
(
wndPtr
,
wm_hints
);
...
@@ -555,7 +555,7 @@ void X11DRV_WND_ForceWindowRaise(WND *wndPtr)
...
@@ -555,7 +555,7 @@ void X11DRV_WND_ForceWindowRaise(WND *wndPtr)
return
;
return
;
}
}
if
(
!
wndPtr
||
!
X11DRV_WND_GetXWindow
(
wndPtr
)
||
(
wndPtr
->
flags
&
WIN
_MANAGED
)
)
if
(
!
wndPtr
||
!
X11DRV_WND_GetXWindow
(
wndPtr
)
||
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
)
{
{
WIN_ReleaseDesktop
();
WIN_ReleaseDesktop
();
return
;
return
;
...
@@ -589,7 +589,7 @@ void X11DRV_WND_ForceWindowRaise(WND *wndPtr)
...
@@ -589,7 +589,7 @@ void X11DRV_WND_ForceWindowRaise(WND *wndPtr)
*/
*/
static
Window
X11DRV_WND_FindDesktopXWindow
(
WND
*
wndPtr
)
static
Window
X11DRV_WND_FindDesktopXWindow
(
WND
*
wndPtr
)
{
{
if
(
!
(
wndPtr
->
flags
&
WIN
_MANAGED
))
if
(
!
(
wndPtr
->
dwExStyle
&
WS_EX
_MANAGED
))
return
X11DRV_WND_GetXWindow
(
wndPtr
);
return
X11DRV_WND_GetXWindow
(
wndPtr
);
else
else
{
{
...
@@ -658,7 +658,7 @@ void X11DRV_WND_SetWindowPos(WND *wndPtr, const WINDOWPOS *winpos, BOOL bChangeP
...
@@ -658,7 +658,7 @@ void X11DRV_WND_SetWindowPos(WND *wndPtr, const WINDOWPOS *winpos, BOOL bChangeP
/* Tweak dialog window size hints */
/* Tweak dialog window size hints */
if
((
winposPtr
->
flags
&
WIN
_MANAGED
)
&&
if
((
winposPtr
->
dwExStyle
&
WS_EX
_MANAGED
)
&&
HAS_DLGFRAME
(
winposPtr
->
dwStyle
,
winposPtr
->
dwExStyle
))
HAS_DLGFRAME
(
winposPtr
->
dwStyle
,
winposPtr
->
dwExStyle
))
{
{
XSizeHints
*
size_hints
=
TSXAllocSizeHints
();
XSizeHints
*
size_hints
=
TSXAllocSizeHints
();
...
@@ -821,7 +821,7 @@ void X11DRV_WND_SetFocus(WND *wndPtr)
...
@@ -821,7 +821,7 @@ void X11DRV_WND_SetFocus(WND *wndPtr)
while
(
w
&&
!
((
X11DRV_WND_DATA
*
)
w
->
pDriverData
)
->
window
)
while
(
w
&&
!
((
X11DRV_WND_DATA
*
)
w
->
pDriverData
)
->
window
)
w
=
w
->
parent
;
w
=
w
->
parent
;
if
(
!
w
)
w
=
wndPtr
;
if
(
!
w
)
w
=
wndPtr
;
if
(
w
->
flags
&
WIN
_MANAGED
)
return
;
if
(
w
->
dwExStyle
&
WS_EX
_MANAGED
)
return
;
if
(
!
hwnd
)
/* If setting the focus to 0, uninstall the colormap */
if
(
!
hwnd
)
/* If setting the focus to 0, uninstall the colormap */
{
{
...
@@ -1038,7 +1038,7 @@ BOOL X11DRV_WND_SetHostAttr(WND* wnd, INT ha, INT value)
...
@@ -1038,7 +1038,7 @@ BOOL X11DRV_WND_SetHostAttr(WND* wnd, INT ha, INT value)
if
(
X11DRV_WND_IsZeroSizeWnd
(
wnd
))
if
(
X11DRV_WND_IsZeroSizeWnd
(
wnd
))
return
TRUE
;
return
TRUE
;
if
(
(
wnd
->
flags
&
WIN
_MANAGED
)
)
if
(
(
wnd
->
dwExStyle
&
WS_EX
_MANAGED
)
)
{
{
if
(
value
)
if
(
value
)
{
{
...
@@ -1095,13 +1095,13 @@ BOOL X11DRV_WND_SetHostAttr(WND* wnd, INT ha, INT value)
...
@@ -1095,13 +1095,13 @@ BOOL X11DRV_WND_SetHostAttr(WND* wnd, INT ha, INT value)
return
TRUE
;
return
TRUE
;
case
HAK_ICONS
:
/* called when the icons change */
case
HAK_ICONS
:
/* called when the icons change */
if
(
(
wnd
->
flags
&
WIN
_MANAGED
)
)
if
(
(
wnd
->
dwExStyle
&
WS_EX
_MANAGED
)
)
X11DRV_WND_UpdateIconHints
(
wnd
);
X11DRV_WND_UpdateIconHints
(
wnd
);
return
TRUE
;
return
TRUE
;
case
HAK_ACCEPTFOCUS
:
/* called when a window is disabled/enabled */
case
HAK_ACCEPTFOCUS
:
/* called when a window is disabled/enabled */
if
(
(
wnd
->
flags
&
WIN
_MANAGED
)
)
if
(
(
wnd
->
dwExStyle
&
WS_EX
_MANAGED
)
)
return
X11DRV_SetWMHint
(
display
,
wnd
,
InputHint
,
value
);
return
X11DRV_SetWMHint
(
display
,
wnd
,
InputHint
,
value
);
}
}
}
}
...
...
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