paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-06 09:42:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: support for the greater combination of menu key short cuts #33502. The patch is provided by user named lks; the patch has been modified to reduce the amount of memory reallocations on string conversion

Browse Source 
git-svn-id: trunk@58413 -
This commit is contained in:
dmitry 2018-06-26 03:16:02 +00:00
parent df7740dcb6
commit 8364a171f3
2 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lcl/interfaces/cocoa/cocoautils.pas
View File

@ -68,7 +68,8 @@ function NSColorToRGB(const Color: NSColor): TColorRef; inline;
function NSColorToColorRef(const Color: NSColor): TColorRef;
function ColorToNSColor(const Color: TColorRef): NSColor; inline;
procedure ShortcutToKeyEquivalent(const AShortCut: TShortcut; out Key: string; out shiftKeyMask: NSUInteger);
// the returned "Key" should not be released, as it's not memory owned
procedure ShortcutToKeyEquivalent(const AShortCut: TShortcut; out Key: NSString; out shiftKeyMask: NSUInteger);
const
DEFAULT_CFSTRING_ENCODING = kCFStringEncodingUTF8;
@ -84,6 +85,7 @@ const
{$I mackeycodes.inc}
function VirtualKeyCodeToMac(AKey: Word): Word;
function VirtualKeyCodeToMacString(AKey: Word): NSString;
procedure FillStandardDescription(out Desc: TRawImageDescription);
@ -188,18 +190,13 @@ begin
((Color shr 16) and $FF) / $FF, 1);
end;
procedure ShortcutToKeyEquivalent(const AShortCut: TShortcut; out Key: string; out shiftKeyMask: NSUInteger);
procedure ShortcutToKeyEquivalent(const AShortCut: TShortcut; out Key: NSString; out shiftKeyMask: NSUInteger);
var
w: word;
s: TShiftState;
begin
ShortCutToKey(AShortCut, w, s);
case w of
VK_DELETE: key := char(NSDeleteCharacter);
VK_OEM_2 : key := char(44);
else
key := lowercase(char(w and $ff));
end;
key := VirtualKeyCodeToMacString(w);
shiftKeyMask := 0;
if ssShift in s then
ShiftKeyMask := ShiftKeyMask + NSShiftKeyMask;
@ -521,6 +518,53 @@ begin
end;
end;
function VirtualKeyCodeToMacString(AKey: Word): NSString;
type
WideChar = System.WideChar;
var
w : WideChar;
begin
w:=#0;
case AKey of
VK_MULTIPLY : w := '*';
VK_ADD, VK_OEM_PLUS : w := '+';
VK_SUBTRACT, VK_OEM_MINUS : w := '-';
VK_OEM_COMMA : w := ',';
VK_OEM_PERIOD: w := '.';
VK_OEM_1 : w := ';';
VK_OEM_2 : w := '/';
VK_OEM_3 : w := '`';
VK_OEM_4 : w := '[';
VK_OEM_5 : w := '\';
VK_OEM_6 : w := ']';
VK_OEM_7 : w := '''';
VK_BACK : w := WideChar(NSBackspaceCharacter);
VK_CLEAR : w := WideChar(NSClearDisplayFunctionKey);
VK_PAUSE : w := WideChar(NSPauseFunctionKey);
VK_PRIOR : w := WideChar(NSPageUpFunctionKey);
VK_NEXT : w := WideChar(NSPageDownFunctionKey);
VK_END : w := WideChar(NSEndFunctionKey);
VK_HOME : w := WideChar(NSHomeFunctionKey);
VK_LEFT : w := WideChar(NSLeftArrowFunctionKey);
VK_UP : w := WideChar(NSUpArrowFunctionKey);
VK_RIGHT : w := WideChar(NSRightArrowFunctionKey);
VK_DOWN : w := WideChar(NSDownArrowFunctionKey);
VK_SELECT : w := WideChar(NSSelectFunctionKey);
VK_PRINT : w := WideChar(NSPrintFunctionKey);
VK_EXECUTE : w := WideChar(NSExecuteFunctionKey);
VK_INSERT : w := WideChar(NSInsertFunctionKey);
VK_DELETE : w := WideChar(NSDeleteCharacter);
VK_HELP : w := WideChar(NSHelpFunctionKey);
VK_SCROLL : w := WideChar(NSScrollLockFunctionKey);
VK_F1..VK_F24: w := WideChar(NSF1FunctionKey + AKey - VK_F1);
VK_A..VK_Z : w := WideChar(Ord('a') + AKey - VK_A);
else
w := WideChar(AKey and $ff);
end;
if w<>#0
then Result:=NSString.stringWithCharacters_length(@w, 1)
else Result:=NSString.string_;
end;
{------------------------------------------------------------------------------
Name: FillStandardDescription
Params: Desc - Raw image description

11
lcl/interfaces/cocoa/cocoawsmenus.pas
View File

@ -505,11 +505,10 @@ begin
begin
s := AMenuItem.Caption;
DeleteAmpersands(s);
ShortcutToKeyEquivalent(AMenuItem.ShortCut, key, ShiftSt);
ShortcutToKeyEquivalent(AMenuItem.ShortCut, nsKey, ShiftSt);
nsKey := NSString(CFStringCreateWithCString(nil, pointer(pchar(key)), kCFStringEncodingASCII));
ns := NSStringUtf8(s);
item := TCocoaMenuItem.alloc.initWithTitle_action_keyEquivalent(ns,
item := TCocoaMenuItem(TCocoaMenuItem.alloc).initWithTitle_action_keyEquivalent(ns,
objcselector('lclItemSelected:'), nsKey);
item.setKeyEquivalentModifierMask(ShiftSt);
TCocoaMenuItem(item).FMenuItemTarget := AMenuItem;
@ -522,7 +521,6 @@ begin
end;
ns.release;
nsKey.release;
item.setTarget(item);
TCocoaMenuItem(item).menuItemCallback:=TLCLMenuItemCallback.Create(item, AMenuItem);
@ -601,15 +599,12 @@ end;
class procedure TCocoaWSMenuItem.SetShortCut(const AMenuItem: TMenuItem;
const ShortCutK1, ShortCutK2: TShortCut);
var
key: string;
ShiftState: NSUInteger;
ns: NSString;
begin
ShortcutToKeyEquivalent(ShortCutK1, key, ShiftState);
ns := NSString(CFStringCreateWithCString(nil, pointer(pchar(key)), kCFStringEncodingASCII));
ShortcutToKeyEquivalent(ShortCutK1, ns, ShiftState);
TCocoaMenuItem(AMenuItem.Handle).setKeyEquivalentModifierMask(ShiftState);
TCocoaMenuItem(AMenuItem.Handle).setKeyEquivalent(ns);
ns.release;
end;
{------------------------------------------------------------------------------