paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-16 02:40:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix GetKeyState for carbon

Browse Source 
git-svn-id: trunk@14295 -
This commit is contained in:
paul 2008-02-28 06:59:17 +00:00
parent 40c9844f59
commit f181308801
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lcl/interfaces/carbon/carbonwinapi.inc
View File

@ -1315,8 +1315,11 @@ end;
Retrieves the status of the specified virtual key
------------------------------------------------------------------------------}
function TCarbonWidgetSet.GetKeyState(nVirtKey: Integer): Smallint;
const
StateDown = SmallInt($FF80);
StateToggled = SmallInt($0001);
begin
Result:=0;
Result := 0;
{$IFDEF VerboseKeyboard}
DebugLn('TCarbonWidgetSet.GetKeyState ' + DbgSVKCode(nVirtKey));
@ -1326,20 +1329,24 @@ begin
VK_MENU:
if (GetCurrentEventKeyModifiers and optionKey) > 0 then
// the ssAlt/VK_MENU is mapped to optionKey under MacOS
Result:=-1;
Result := StateDown;
VK_SHIFT:
if (GetCurrentEventKeyModifiers and shiftKey) > 0 then
Result:=-1;
Result := StateDown;
VK_CONTROL:
if (GetCurrentEventKeyModifiers and cmdKey) > 0 then
// the ssCtrl/VK_CONTROL is mapped to cmdKey under MacOS
Result:=-1;
Result := StateDown;
VK_LBUTTON:
if (GetCurrentEventButtonState and 1) > 0 then Result := -1;
if (GetCurrentEventButtonState and $01) > 0 then Result := StateDown;
VK_RBUTTON:
if (GetCurrentEventButtonState and 2) > 0 then Result := -1;
if (GetCurrentEventButtonState and $02) > 0 then Result := StateDown;
VK_MBUTTON:
if (GetCurrentEventButtonState and 4) > 0 then Result := -1;
if (GetCurrentEventButtonState and $04) > 0 then Result := StateDown;
VK_XBUTTON1:
if (GetCurrentEventButtonState and $08) > 0 then Result := StateDown;
VK_XBUTTON2:
if (GetCurrentEventButtonState and $10) > 0 then Result := StateDown;
else
DebugLn('TCarbonWidgetSet.GetKeyState TODO ', DbgSVKCode(Word(nVirtkey)));
end;

2
lcl/interfaces/qt/qtwinapi.inc
View File

@ -2077,7 +2077,7 @@ end;
function TQtWidgetSet.GetKeyState(nVirtKey: Integer): Smallint;
const
StateDown = SmallInt($FF80); // rather strange interpretation of "high-order bit is 1", but windows returns it
StateDown = SmallInt($FF80);
StateToggled = SmallInt($0001);
begin
Result := 0;