diff --git a/src/game/g_gui.pas b/src/game/g_gui.pas
index ba095b7a79f616613e233d541124cb00c817afd6..7acbf0b101213d9203f4c9562aa20bf4c868523c 100644 (file)
--- a/src/game/g_gui.pas
+++ b/src/game/g_gui.pas
case Msg.Msg of
WM_KEYDOWN:
case Msg.wParam of
- IK_RETURN: Click();
+ IK_RETURN, IK_KPRETURN: Click();
end;
end;
end;
case Msg.Msg of
WM_KEYDOWN:
case Msg.wParam of
- IK_UP:
+ IK_UP, IK_KPUP:
begin
repeat
Dec(FIndex);
g_Sound_PlayEx(MENU_CHANGESOUND);
end;
- IK_DOWN:
+ IK_DOWN, IK_KPDOWN:
begin
repeat
Inc(FIndex);
g_Sound_PlayEx(MENU_CHANGESOUND);
end;
- IK_RETURN: if (FIndex <> -1) and FButtons[FIndex].FEnabled then FButtons[FIndex].Click;
+ IK_RETURN, IK_KPRETURN: if (FIndex <> -1) and FButtons[FIndex].FEnabled then FButtons[FIndex].Click;
end;
end;
end;
case Msg.Msg of
WM_KEYDOWN:
case Msg.wParam of
- IK_RETURN: if @FOnClickEvent <> nil then FOnClickEvent();
+ IK_RETURN, IK_KPRETURN: if @FOnClickEvent <> nil then FOnClickEvent();
end;
end;
end;
WM_KEYDOWN:
begin
case Msg.wParam of
- IK_UP:
+ IK_UP, IK_KPUP:
begin
c := 0;
repeat
g_Sound_PlayEx(MENU_CHANGESOUND);
end;
- IK_DOWN:
+ IK_DOWN, IK_KPDOWN:
begin
c := 0;
repeat
g_Sound_PlayEx(MENU_CHANGESOUND);
end;
- IK_LEFT, IK_RIGHT:
+ IK_LEFT, IK_RIGHT, IK_KPLEFT, IK_KPRIGHT:
begin
if FIndex <> -1 then
if FItems[FIndex].Control <> nil then
FItems[FIndex].Control.OnMessage(Msg);
end;
- IK_RETURN:
+ IK_RETURN, IK_KPRETURN:
begin
if FIndex <> -1 then
if FItems[FIndex].Control <> nil then
WM_KEYDOWN:
begin
case Msg.wParam of
- IK_LEFT:
+ IK_LEFT, IK_KPLEFT:
if FValue > 0 then
begin
Dec(FValue);
g_Sound_PlayEx(SCROLL_SUBSOUND);
if @FOnChangeEvent <> nil then FOnChangeEvent(Self);
end;
- IK_RIGHT:
+ IK_RIGHT, IK_KPRIGHT:
if FValue < FMax then
begin
Inc(FValue);
case Msg.Msg of
WM_KEYDOWN:
case Msg.wParam of
- IK_RETURN, IK_RIGHT:
+ IK_RETURN, IK_RIGHT, IK_KPRETURN, IK_KPRIGHT:
begin
if FIndex < High(FItems) then
Inc(FIndex)
FOnChangeEvent(Self);
end;
- IK_LEFT:
+ IK_LEFT, IK_KPLEFT:
begin
if FIndex > 0 then
Dec(FIndex)
if FCaretPos > 0 then Dec(FCaretPos);
end;
IK_DELETE: Delete(FText, FCaretPos + 1, 1);
- IK_END: FCaretPos := Length(FText);
- IK_HOME: FCaretPos := 0;
- IK_LEFT: if FCaretPos > 0 then Dec(FCaretPos);
- IK_RIGHT: if FCaretPos < Length(FText) then Inc(FCaretPos);
- IK_RETURN:
+ IK_END, IK_KPEND: FCaretPos := Length(FText);
+ IK_HOME, IK_KPHOME: FCaretPos := 0;
+ IK_LEFT, IK_KPLEFT: if FCaretPos > 0 then Dec(FCaretPos);
+ IK_RIGHT, IK_KPRIGHT: if FCaretPos < Length(FText) then Inc(FCaretPos);
+ IK_RETURN, IK_KPRETURN:
with FWindow do
begin
if FActiveControl <> Self then
FIsQuery := False;
end;
- IK_RETURN:
+ IK_RETURN, IK_KPRETURN:
begin
if not FIsQuery then
begin
end;
MESSAGE_DIKEY:
- if FIsQuery and (wParam <> IK_ENTER) then // Not <Enter
+ if FIsQuery and (wParam <> IK_ENTER) and (wParam <> IK_KPRETURN) then // Not <Enter
begin
if e_KeyNames[wParam] <> '' then
FKey := wParam;
case Msg of
WM_KEYDOWN:
case wParam of
- IK_HOME:
+ IK_HOME, IK_KPHOME:
begin
FIndex := 0;
FStartLine := 0;
end;
- IK_END:
+ IK_END, IK_KPEND:
begin
FIndex := High(FItems);
FStartLine := Max(High(FItems)-FHeight+1, 0);
end;
- IK_UP, IK_LEFT:
+ IK_UP, IK_LEFT, IK_KPUP, IK_KPLEFT:
if FIndex > 0 then
begin
Dec(FIndex);
if FIndex < FStartLine then Dec(FStartLine);
if @FOnChangeEvent <> nil then FOnChangeEvent(Self);
end;
- IK_DOWN, IK_RIGHT:
+ IK_DOWN, IK_RIGHT, IK_KPDOWN, IK_KPRIGHT:
if FIndex < High(FItems) then
begin
Inc(FIndex);
if FIndex > FStartLine+FHeight-1 then Inc(FStartLine);
if @FOnChangeEvent <> nil then FOnChangeEvent(Self);
end;
- IK_RETURN:
+ IK_RETURN, IK_KPRETURN:
with FWindow do
begin
if FActiveControl <> Self then SetActive(Self)
case Msg of
WM_KEYDOWN:
case wParam of
- IK_HOME:
+ IK_HOME, IK_KPHOME:
begin
FIndex := 0;
FStartLine := 0;
FOnChangeEvent(Self);
end;
- IK_END:
+ IK_END, IK_KPEND:
begin
FIndex := High(FItems);
FStartLine := Max(High(FItems)-FHeight+1, 0);
FOnChangeEvent(Self);
end;
- IK_PAGEUP:
+ IK_PAGEUP, IK_KPPAGEUP:
begin
if FIndex > FHeight then
FIndex := FIndex-FHeight
FStartLine := 0;
end;
- IK_PAGEDN:
+ IK_PAGEDN, IK_KPPAGEDN:
begin
if FIndex < High(FItems)-FHeight then
FIndex := FIndex+FHeight
FStartLine := High(FItems)-FHeight+1;
end;
- IK_UP, IK_LEFT:
+ IK_UP, IK_LEFT, IK_KPUP, IK_KPLEFT:
if FIndex > 0 then
begin
Dec(FIndex);
FOnChangeEvent(Self);
end;
- IK_DOWN, IK_RIGHT:
+ IK_DOWN, IK_RIGHT, IK_KPDOWN, IK_KPRIGHT:
if FIndex < High(FItems) then
begin
Inc(FIndex);
FOnChangeEvent(Self);
end;
- IK_RETURN:
+ IK_RETURN, IK_KPRETURN:
with FWindow do
begin
if FActiveControl <> Self then
var
SR: TSearchRec;
i: Integer;
+ sm, sc: string;
begin
Clear();
path := IncludeTrailingPathDelimiter(path);
path := ExpandFileName(path);
-// Êàòàëîãè:
+ // Êàòàëîãè:
if FDirs then
begin
if FindFirst(path+'*', faDirectory, SR) = 0 then
FindClose(SR);
end;
-// Ôàéëû:
- if FindFirst(path+FFileMask, faAnyFile, SR) = 0 then
- repeat
- AddItem(SR.Name);
- until FindNext(SR) <> 0;
-
- FindClose(SR);
+ // Ôàéëû:
+ sm := FFileMask;
+ while sm <> '' do
+ begin
+ i := Pos('|', sm);
+ if i = 0 then i := length(sm)+1;
+ sc := Copy(sm, 1, i-1);
+ Delete(sm, 1, i);
+ if FindFirst(path+sc, faAnyFile, SR) = 0 then repeat AddItem(SR.Name); until FindNext(SR) <> 0;
+ FindClose(SR);
+ end;
for i := 0 to High(FItems) do
if FItems[i][1] = #1 then
case Msg of
WM_KEYDOWN:
case wParam of
- IK_UP, IK_LEFT:
+ IK_UP, IK_LEFT, IK_KPUP, IK_KPLEFT:
if FStartLine > 0 then
Dec(FStartLine);
- IK_DOWN, IK_RIGHT:
+ IK_DOWN, IK_RIGHT, IK_KPDOWN, IK_KPRIGHT:
if FStartLine < Length(FLines)-FHeight then
Inc(FStartLine);
- IK_RETURN:
+ IK_RETURN, IK_KPRETURN:
with FWindow do
begin
if FActiveControl <> Self then