Skip to content

W
wine-winehq
Commit d47f5ccf authored by Yvon Belleau's avatar Yvon Belleau Committed by Alexandre Julliard
Browse files
Options

- Implemented keyboard navigation (Up / Down / PgUp / PgDn / ESC).

- Shadow windows (behind popups) were reacting to mouse clicks and were going over the popup. Make them close the popup instead. - Title was not displayed when the help file was opened by the command line. - Corrected incorrect links behavior (in relation with the scrollbar).
parent 9c489004
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 5 deletions
programs/winhelp/winhelp.c
View file @ d47f5ccf
......@@ -4,6 +4,7 @@
* Copyright 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
* 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
* 2002 Eric Pouech <eric.pouech@wanadoo.fr>
* 2004 Ken Belleau <jamez@ivic.qc.ca>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -42,7 +43,9 @@ static BOOL WINHELP_RegisterWinClasses(void);
static LRESULT CALLBACK WINHELP_MainWndProc(HWND, UINT, WPARAM, LPARAM);
static LRESULT CALLBACK WINHELP_TextWndProc(HWND, UINT, WPARAM, LPARAM);
static LRESULT CALLBACK WINHELP_ButtonBoxWndProc(HWND, UINT, WPARAM, LPARAM);
static LRESULT CALLBACK WINHELP_ButtonWndProc(HWND, UINT, WPARAM, LPARAM);
static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND, UINT, WPARAM, LPARAM);
static LRESULT CALLBACK WINHELP_ShadowWndProc(HWND, UINT, WPARAM, LPARAM);
static void WINHELP_CheckPopup(UINT);
static BOOL WINHELP_SplitLines(HWND hWnd, LPSIZE);
static void WINHELP_InitFonts(HWND hWnd);
......@@ -51,7 +54,7 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW*);
static void WINHELP_SetupText(HWND hWnd);
static WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW*, WPARAM, LPARAM);
WINHELP_GLOBALS Globals = {3, 0, 0, 0, 1, 0, 0};
WINHELP_GLOBALS Globals = {3, 0, 0, 0, 1, 0, 0, NULL};
/***********************************************************************
*
......@@ -249,7 +252,7 @@ static BOOL WINHELP_RegisterWinClasses(void)
class_text.lpszClassName = TEXT_WIN_CLASS_NAME;
class_shadow = class_main;
class_shadow.lpfnWndProc = DefWindowProc;
class_shadow.lpfnWndProc = WINHELP_ShadowWndProc;
class_shadow.hbrBackground = GetStockObject(GRAY_BRUSH);
class_shadow.lpszClassName = SHADOW_WIN_CLASS_NAME;
......@@ -530,6 +533,7 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi,
win->histIndex = win->backIndex = 1;
win->history[0] = win->back[0] = page;
page->file->wRefCount += 2;
strcpy(wi->caption, page->file->lpszTitle);
}
}
......@@ -570,7 +574,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
WINHELP_WINDOW *win;
WINHELP_BUTTON *button;
RECT rect, button_box_rect;
INT text_top;
INT text_top, curPos, min, max, dy, keyDelta;
WINHELP_CheckPopup(msg);
......@@ -653,6 +657,49 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
break;
case WM_COPYDATA:
return WINHELP_HandleCommand((HWND)wParam, lParam);
case WM_KEYDOWN:
keyDelta = 0;
switch (wParam)
{
case VK_UP:
case VK_DOWN:
keyDelta = GetSystemMetrics(SM_CXVSCROLL);
if (wParam == VK_UP)
keyDelta = -keyDelta;
case VK_PRIOR:
case VK_NEXT:
win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
curPos = GetScrollPos(win->hTextWnd, SB_VERT);
GetScrollRange(win->hTextWnd, SB_VERT, &min, &max);
if (keyDelta == 0)
{
GetClientRect(win->hTextWnd, &rect);
keyDelta = (rect.bottom - rect.top) / 2;
if (wParam == VK_PRIOR)
keyDelta = -keyDelta;
}
curPos += keyDelta;
if (curPos > max)
curPos = max;
else if (curPos < min)
curPos = min;
dy = GetScrollPos(win->hTextWnd, SB_VERT) - curPos;
SetScrollPos(win->hTextWnd, SB_VERT, curPos, TRUE);
ScrollWindow(win->hTextWnd, 0, dy, NULL, NULL);
UpdateWindow(win->hTextWnd);
return 0;
case VK_ESCAPE:
MACRO_Exit();
return 0;
}
break;
}
return DefWindowProc(hWnd, msg, wParam, lParam);
}
......@@ -691,11 +738,18 @@ static LRESULT CALLBACK WINHELP_ButtonBoxWndProc(HWND hWnd, UINT msg, WPARAM wPa
HDC hDc;
SIZE textsize;
if (!button->hWnd)
{
button->hWnd = CreateWindow(STRING_BUTTON, (LPSTR) button->lpszName,
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
0, 0, 0, 0,
hWnd, (HMENU) button->wParam,
Globals.hInstance, 0);
if (button->hWnd) {
if (Globals.button_proc == NULL)
Globals.button_proc = (WNDPROC) GetWindowLong(button->hWnd, GWL_WNDPROC);
SetWindowLong(button->hWnd, GWL_WNDPROC, (LONG) WINHELP_ButtonWndProc);
}
}
hDc = GetDC(button->hWnd);
GetTextExtentPoint(hDc, button->lpszName,
lstrlen(button->lpszName), &textsize);
......@@ -729,6 +783,22 @@ static LRESULT CALLBACK WINHELP_ButtonBoxWndProc(HWND hWnd, UINT msg, WPARAM wPa
/***********************************************************************
*
* WINHELP_ButtonWndProc
*/
static LRESULT CALLBACK WINHELP_ButtonWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
WINHELP_WINDOW* win;
if (msg == WM_LBUTTONUP)
{
win = (WINHELP_WINDOW*) GetWindowLong(GetParent(hWnd), 0);
SetFocus(win->hMainWnd);
}
return CallWindowProc(Globals.button_proc, hWnd, msg, wParam, lParam);
}
/***********************************************************************
*
* WINHELP_TextWndProc
*/
static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
......@@ -1099,6 +1169,16 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara
/***********************************************************************
*
* WINHELP_ShadowWndProc
*/
static LRESULT CALLBACK WINHELP_ShadowWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
WINHELP_CheckPopup(msg);
return DefWindowProc(hWnd, msg, wParam, lParam);
}
/***********************************************************************
*
* SetupText
*/
static void WINHELP_SetupText(HWND hWnd)
......@@ -1116,7 +1196,11 @@ static void WINHELP_SetupText(HWND hWnd)
WINHELP_SplitLines(hWnd, &newsize);
SetScrollRange(hWnd, SB_VERT, 0, rect.top + newsize.cy - rect.bottom, TRUE);
}
else SetScrollPos(hWnd, SB_VERT, 0, FALSE);
else
{
SetScrollPos(hWnd, SB_VERT, 0, FALSE);
SetScrollRange(hWnd, SB_VERT, 0, 0, FALSE);
}
ReleaseDC(hWnd, hDc);
}
......@@ -1652,7 +1736,7 @@ WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW* win, WPARAM wParam, LPARAM
POINT mouse;
WINHELP_LINE *line;
WINHELP_LINE_PART *part;
int scroll_pos = GetScrollPos(win->hMainWnd, SB_VERT);
int scroll_pos = GetScrollPos(win->hTextWnd, SB_VERT);
mouse.x = LOWORD(lParam);
mouse.y = HIWORD(lParam);
......
programs/winhelp/winhelp.h
View file @ d47f5ccf
......@@ -131,6 +131,7 @@ typedef struct
BOOL isBook;
WINHELP_WINDOW* active_win;
WINHELP_WINDOW* win_list;
WNDPROC button_proc;
} WINHELP_GLOBALS;
extern WINHELP_GLOBALS Globals;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment