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
Sebastian Mayr
wine
Commits
bfa999ea
Commit
bfa999ea
authored
17 years ago
by
eric pouech
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
winhelp: Allow links inside popups to work properly.
parent
9d92b761
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
programs/winhelp/winhelp.c
+19
-9
19 additions, 9 deletions
programs/winhelp/winhelp.c
with
19 additions
and
9 deletions
programs/winhelp/winhelp.c
+
19
−
9
View file @
bfa999ea
...
...
@@ -771,28 +771,28 @@ static HLPFILE_LINK* WINHELP_FindLink(WINHELP_WINDOW* win, LPARAM pos)
* WINHELP_HandleTextMouse
*
*/
static
BOOL
WINHELP_HandleTextMouse
(
WINHELP_WINDOW
*
win
,
const
MSGFILTER
*
msgf
)
static
BOOL
WINHELP_HandleTextMouse
(
WINHELP_WINDOW
*
win
,
UINT
msg
,
LPARAM
lParam
)
{
HLPFILE
*
hlpfile
;
HLPFILE_LINK
*
link
;
BOOL
ret
=
FALSE
;
switch
(
msgf
->
msg
)
switch
(
msg
)
{
case
WM_MOUSEMOVE
:
if
(
WINHELP_FindLink
(
win
,
msgf
->
lParam
))
if
(
WINHELP_FindLink
(
win
,
lParam
))
SetCursor
(
win
->
hHandCur
);
else
SetCursor
(
LoadCursor
(
0
,
IDC_ARROW
));
break
;
case
WM_LBUTTONDOWN
:
if
((
win
->
current_link
=
WINHELP_FindLink
(
win
,
msgf
->
lParam
)))
if
((
win
->
current_link
=
WINHELP_FindLink
(
win
,
lParam
)))
ret
=
TRUE
;
break
;
case
WM_LBUTTONUP
:
if
((
link
=
WINHELP_FindLink
(
win
,
msgf
->
lParam
))
&&
link
==
win
->
current_link
)
if
((
link
=
WINHELP_FindLink
(
win
,
lParam
))
&&
link
==
win
->
current_link
)
{
HLPFILE_WINDOWINFO
*
wi
;
...
...
@@ -816,7 +816,7 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, const MSGFILTER* msgf)
case
hlp_link_popup
:
if
((
hlpfile
=
WINHELP_LookupHelpFile
(
link
->
string
)))
WINHELP_OpenHelpWindow
(
HLPFILE_PageByHash
,
hlpfile
,
link
->
hash
,
WINHELP_GetPopupWindowInfo
(
hlpfile
,
win
,
msgf
->
lParam
),
WINHELP_GetPopupWindowInfo
(
hlpfile
,
win
,
lParam
),
SW_NORMAL
);
break
;
case
hlp_link_macro
:
...
...
@@ -955,8 +955,13 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
switch
(((
NMHDR
*
)
lParam
)
->
code
)
{
case
EN_MSGFILTER
:
return
WINHELP_HandleTextMouse
((
WINHELP_WINDOW
*
)
GetWindowLong
(
hWnd
,
0
),
(
const
MSGFILTER
*
)
lParam
);
{
const
MSGFILTER
*
msgf
=
(
const
MSGFILTER
*
)
lParam
;
return
WINHELP_HandleTextMouse
((
WINHELP_WINDOW
*
)
GetWindowLong
(
hWnd
,
0
),
msgf
->
msg
,
msgf
->
lParam
);
}
break
;
case
EN_REQUESTRESIZE
:
rc
=
((
REQRESIZE
*
)
lParam
)
->
rc
;
win
=
(
WINHELP_WINDOW
*
)
GetWindowLong
(
hWnd
,
0
);
...
...
@@ -2001,13 +2006,18 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam
break
;
case
WM_COMMAND
:
if
(
use_richedit
)
break
;
/* fall through */
goto
doit
;
case
WM_LBUTTONUP
:
case
WM_LBUTTONDOWN
:
if
(
WINHELP_HandleTextMouse
(
Globals
.
active_popup
,
msg
,
lParam
)
&&
msg
==
WM_LBUTTONDOWN
)
return
FALSE
;
/* fall through */
case
WM_MBUTTONDOWN
:
case
WM_RBUTTONDOWN
:
case
WM_NCLBUTTONDOWN
:
case
WM_NCMBUTTONDOWN
:
case
WM_NCRBUTTONDOWN
:
doit:
hPopup
=
Globals
.
active_popup
->
hMainWnd
;
Globals
.
active_popup
=
NULL
;
DestroyWindow
(
hPopup
);
...
...
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