Merge branch 'master' into mac-initial-open-source-checkin

2026-08-05 00:15:32 +00:00 · 2017-08-11 02:25:01 -04:00 · 2017-08-11 02:25:01 -04:00 · d061631ef5
commit d061631ef5
parent 6f990cd1de 791a6d39e3
4 changed files with 97 additions and 43 deletions
--- a/README.md
+++ b/README.md
@ -6,9 +6,9 @@ Open Source

 | Platform  | Master | Nightly | Beta | Stable |
 | --------  | :----: | :-----: | :--: | :----: |
-| Android   | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanAndroid_Build)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanAndroid_NightlyAlpha)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanAndroid_Beta)/statusIcon)| ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanAndroid_Stable)/statusIcon) |
-| Web       | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:Keymanweb_Build)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:Keymanweb_Nightly)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:Keymanweb_Beta)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:Keymanweb_Stable)/statusIcon)|
-| Windows   | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:Keyman_Build)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanDesktop_Nightly)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanDesktop_Beta)/statusIcon)| ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanDesktop_Stable)/statusIcon) |
+| Android   | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanAndroid_Build)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanAndroid_NightlyAlpha)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanAndroid_Beta),branch:(default:false)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanAndroid_Stable),branch:(default:false)/statusIcon) |
+| Web       | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:Keymanweb_Build)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:Keymanweb_Nightly)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:Keymanweb_Beta),branch:(default:false)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:Keymanweb_Stable),branch:(default:false)/statusIcon)|
+| Windows   | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:Keyman_Build)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanDesktop_Nightly)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanDesktop_Beta),branch:(default:false)/statusIcon)| ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanDesktop_Stable),branch:(default:false)/statusIcon) |
 | Mac       | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanMac_Master)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanMac_Nightly)/statusIcon) | ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanMac_Beta)/statusIcon)| ![Build Status](https://build.palaso.org/app/rest/builds/buildType:(id:KeymanMac_Stable)/statusIcon) |

 [Keyman](https://keyman.com) makes it possible for you to type in over 1,000 languages on Windows, iPhone, iPad, Android tablets and phones, and even instantly in your web browser.
--- a/windows/src/developer/TIKE/dialogs/UfrmVisualKeyboardImportKMX.dfm
+++ b/windows/src/developer/TIKE/dialogs/UfrmVisualKeyboardImportKMX.dfm
@ -4,13 +4,13 @@ inherited frmVisualKeyboardImportKMX: TfrmVisualKeyboardImportKMX
  BorderIcons = [biSystemMenu]
  BorderStyle = bsDialog
  Caption = 'Importing Keyboard'
-  ClientHeight = 41
+  ClientHeight = 71
  ClientWidth = 221
  Font.Name = 'MS Sans Serif'
  Position = poScreenCenter
  OnDestroy = FormDestroy
  ExplicitWidth = 227
-  ExplicitHeight = 70
+  ExplicitHeight = 100
  PixelsPerInch = 96
  TextHeight = 13
  object Label1: TLabel
@ -25,4 +25,12 @@ inherited frmVisualKeyboardImportKMX: TfrmVisualKeyboardImportKMX
      'keyboard.'
    WordWrap = True
  end
+  object lblStatus: TLabel
+    Left = 8
+    Top = 48
+    Width = 205
+    Height = 13
+    Alignment = taCenter
+    AutoSize = False
+  end
 end
--- a/windows/src/developer/TIKE/dialogs/UfrmVisualKeyboardImportKMX.pas
+++ b/windows/src/developer/TIKE/dialogs/UfrmVisualKeyboardImportKMX.pas
@ -38,6 +38,7 @@ const
 type
  TfrmVisualKeyboardImportKMX = class(TTIKEForm)
    Label1: TLabel;
+    lblStatus: TLabel;
    procedure FormShow(Sender: TObject);
    procedure FormCreate(Sender: TObject);
    procedure FormDestroy(Sender: TObject);
@ -63,6 +64,7 @@ type
    procedure ValidateLeftRightCtrlAlt;
    procedure ReadKeys(kfh: PKeyboardFileHeader; groupindex: Integer);
    procedure Validate102Key;
+    procedure SetStatus(const msg: string);
  protected
    procedure WndProc(var Message: TMessage); override;
  public
@ -125,6 +127,12 @@ end;
 - Prepare for key processing                                                  -
 ------------------------------------------------------------------------------}

+procedure TfrmVisualKeyboardImportKMX.SetStatus(const msg: string);
+begin
+  lblStatus.Caption := msg;
+  lblStatus.Update;
+end;
+
 procedure TfrmVisualKeyboardImportKMX.WMUserFormShown(var Message: TMessage);

  procedure DoFail(const msg: string);
@ -136,12 +144,14 @@ var
  FWasStarted: Boolean;
  hr: HRESULT;
 begin
+  SetStatus('Loading keyboard data');
  if (Message.WParam = 0) and not GetKeyboardKeys then
  begin
    DoFail('Could not load keyboard for import.');
    Exit;
  end;

+  SetStatus('Finding debug host keyboard');
  FDebugHostKeyboard := TDebugUtils.GetDebugHostKeyboard;
  if FDebugHostKeyboard = nil then
  begin
@ -149,6 +159,7 @@ begin
    Exit;
  end;

+  SetStatus('Starting Keyman Desktop');
  if not StartKeymanDesktopPro(FWasStarted) then
  begin
    DoFail('Unable to start Keyman Desktop for debugging - please make sure that Keyman Desktop is correctly installed (the error code was '+IntToHex(GetLastError, 8)+').');  // I3173   // I3504
@ -169,6 +180,7 @@ begin
    ShowMessage('Keyman Engine was reconfigured, please click OK to continue import.');
  end;

+  SetStatus('Selecting keyboard');
  if Keyman_ForceKeyboard(FFileName) then
  begin
    nkey := 0;
@ -204,6 +216,8 @@ var
  vk: TVKKey;
  inputs: array[0..10] of TInput;
  n: Integer;
+  shiftText: string;
+  keyText: string;
    procedure AddInput(vk: WORD; isDown, isExtended: Boolean);   // I4143
    const
      DownFlag: array[Boolean] of DWORD = (KEYEVENTF_KEYUP, 0);
@ -240,16 +254,37 @@ begin
 //    else lb.items.Add(Format('SendKey: nkey: %d vkey: %s shift: %d ansi', [nkey, VKeyNames[vk.vkey], vk.kmshift]));
 //  ShowMessage(Format('Sending key: %s / %d', [VKeyNames[vk.VKey], vk.shift]));

+  n := GetVKLegalShiftStateIndex(vk.shift);
+  if n < 0
+    then shiftText := Format('%x', [vk.shift])
+    else shiftText := VKLegalShiftStates[n].Desc;
+
+  if vk.vkey < 256
+    then keyText := VKeyNames[vk.vkey]
+    else keyText := Format('%x', [vk.vkey]);
+
+  SetStatus(Format('Importing %s %s', [shiftText, keyText]));
+
  n := 0;

  if (vk.kmshift and KMX_SHIFTFLAG) = KMX_SHIFTFLAG then AddInput(VK_SHIFT, True, False);   // I4143
  if (vk.kmshift and KMX_RALTFLAG) = KMX_RALTFLAG then AddInput(VK_MENU, True, True);
+  if (vk.kmshift and KMX_LALTFLAG) = KMX_LALTFLAG then AddInput(VK_MENU, True, False);   // I4156
+  if (vk.kmshift and KMX_RCTRLFLAG) = KMX_RCTRLFLAG then AddInput(VK_CONTROL, True, True);
+  if (vk.kmshift and KMX_LCTRLFLAG) = KMX_LCTRLFLAG then AddInput(VK_CONTROL, True, False);   // I4156
+
  if (vk.kmshift and KMX_CTRLFLAG) = KMX_CTRLFLAG then AddInput(VK_CONTROL, True, False);
  if (vk.kmshift and KMX_ALTFLAG) = KMX_ALTFLAG then AddInput(VK_MENU, True, False);   // I4156
+
  AddInput(vk.vkey, True, False);
  AddInput(vk.vkey, False, False);
+
  if (vk.kmshift and KMX_ALTFLAG) = KMX_ALTFLAG then AddInput(VK_MENU, False, False);   // I4156
  if (vk.kmshift and KMX_CTRLFLAG) = KMX_CTRLFLAG then AddInput(VK_CONTROL, False, False);
+
+  if (vk.kmshift and KMX_LCTRLFLAG) = KMX_LCTRLFLAG then AddInput(VK_CONTROL, False, False);   // I4156
+  if (vk.kmshift and KMX_RCTRLFLAG) = KMX_RCTRLFLAG then AddInput(VK_CONTROL, False, True);
+  if (vk.kmshift and KMX_LALTFLAG) = KMX_LALTFLAG then AddInput(VK_MENU, False, False);   // I4156
  if (vk.kmshift and KMX_RALTFLAG) = KMX_RALTFLAG then AddInput(VK_MENU, False, True);
  if (vk.kmshift and KMX_SHIFTFLAG) = KMX_SHIFTFLAG then AddInput(VK_SHIFT, False, False);

@ -407,7 +442,6 @@ procedure TfrmVisualKeyboardImportKMX.ReadKeys(kfh: PKeyboardFileHeader; groupin
 var
  gp: PKeyboardFileGroup;
  kp: PKeyboardFileKey;
-  pw: PWideChar;
  vkey, kmshift, shift, i, j: Integer;
  vk: TVKKey;
  Found: Boolean;
@ -418,39 +452,42 @@ begin
  kp := PKeyboardFileKey(DWord(kfh)+gp.dpKeyArray);
  for i := 0 to Integer(gp.cxKeyArray) - 1 do
  begin
-    pw := PWideChar(DWord(kfh)+kp.dpContext);
-    if pw^ = #0 then
+    Found := False;
+    if (kp.ShiftFlags and KMX_ISVIRTUALKEY) = 0 then
    begin
-      //
-      Found := False;
-      if (kp.ShiftFlags and KMX_ISVIRTUALKEY) = 0 then
-      begin
-        vkey := CharToVKey(kp.Key, shift, kmshift);
-      end
-      else
-      begin
-        vkey := kp.Key;
-        shift := KMXShiftToVKShift(kp.ShiftFlags);
-        kmshift := KMXShiftToActiveShift(kp.ShiftFlags);
-      end;
-
-      for j := 0 to keys.Count - 1 do
-        if (TVKKey(keys[j]).VKey = vkey) and (TVKKey(keys[j]).Shift = shift) then
-        begin
-          Found := True;
-          Break;
-        end;
-      if Found then
-      begin
-        Inc(kp);
-        Continue;
-      end;
-      vk := TVKKey.Create;
-      vk.VKey := vkey;
-      vk.Shift := shift;
-      vk.kmshift := kmshift;
-      keys.Add(vk);
+      vkey := CharToVKey(kp.Key, shift, kmshift);
+    end
+    else
+    begin
+      vkey := kp.Key;
+      shift := KMXShiftToVKShift(kp.ShiftFlags);
+      kmshift := KMXShiftToActiveShift(kp.ShiftFlags);
    end;
+
+    if vkey > 255 then
+    begin
+      // We don't try and import keys that are T_ touch virtual keys
+      Inc(kp);
+      Continue;
+    end;
+
+    for j := 0 to keys.Count - 1 do
+      if (TVKKey(keys[j]).VKey = vkey) and (TVKKey(keys[j]).Shift = shift) then
+      begin
+        Found := True;
+        Break;
+      end;
+    if Found then
+    begin
+      Inc(kp);
+      Continue;
+    end;
+    vk := TVKKey.Create;
+    vk.VKey := vkey;
+    vk.Shift := shift;
+    vk.kmshift := kmshift;
+    keys.Add(vk);
+
    Inc(kp);
  end;

--- a/windows/src/developer/TIKE/main/UframeOnScreenKeyboardEditor.pas
+++ b/windows/src/developer/TIKE/main/UframeOnScreenKeyboardEditor.pas
@ -1004,6 +1004,17 @@ begin
 end;

 procedure TframeOnScreenKeyboardEditor.VK_UpdateSelectedKeyDetails;
+  procedure SetKeyText(key: TOnScreenKeyboardKey);
+  begin
+    if key <> nil then
+    begin
+      if (key.ActiveKeyCap = '') or (key.ActiveKeyCap[1] < #32)
+        then VKkeySample.KeyText := key.KeyCaps[0]
+        else VKkeySample.KeyText := key.ActiveKeyCap;
+    end
+    else
+      VKkeySample.KeyText := '';
+  end;
 var
  k: TVisualKeyboardKey;
  osk: TOnScreenKeyboardKey;
@ -1012,18 +1023,16 @@ begin
  k := VK_GetCurrentKey;
  if not Assigned(k) then
  begin
-    VKkeySample.KeyText := '';
    VKkeySample.KeyData := '';
    VKkeySample.KeyGlyph := nil;
+    SetKeyText(kbdOnScreen.SelectedKey);
  end
  else
  begin
    osk := kbdOnScreen.Keys.ItemsByUSVK[k.VKey];  // I3022
    if Assigned(osk) then
    begin
-      if (osk.ActiveKeyCap = '') or (osk.ActiveKeyCap[1] < #32)
-        then VKkeySample.KeyText := osk.KeyCaps[0]
-        else VKkeySample.KeyText  := osk.ActiveKeyCap;
+      SetKeyText(osk);
      VKkeySample.KeyData  := k.Text;
      VKkeySample.KeyGlyph := k.Bitmap;
      osk.KeyGlyph := k.Bitmap;
@ -1046,8 +1055,8 @@ begin

  if kbdOnScreen.ShiftState * [essCtrl, essLCtrl, essRCtrl] <> [] then
  begin
-    if essLCtrl in kbdOnScreen.ShiftState then VKkeySampleAlt.KeyText := 'L Ctrl'
-    else if essRCtrl in kbdOnScreen.ShiftState then VKkeySampleAlt.KeyText := 'R Ctrl'
+    if essLCtrl in kbdOnScreen.ShiftState then VKkeySampleCtrl.KeyText := 'L Ctrl'
+    else if essRCtrl in kbdOnScreen.ShiftState then VKkeySampleCtrl.KeyText := 'R Ctrl'
    else VKkeySampleCtrl.KeyText := 'Ctrl';
    VKkeySampleCtrl.Left := x - 3 - VKkeySampleCtrl.Width;
    x := VKkeySampleCtrl.Left;