Merge branch 'hotkeys-fix' into develop

Author: artem78

globalkeyhook.pas

@@ -17,6 +17,7 @@ interface
 type
 
   EGlobalKeyHookException = class(Exception);
+  EGlobalKeyHookRegistrationFailedException = class(EGlobalKeyHookException);
 
   TKeysMap = specialize TFPGMap<string, THotKey>;
 
@@ -91,8 +92,9 @@ procedure TGlobalKeyHook.RegisterKey(AHotKeyId: Integer; const AHotKey: THotKey
   UnregisterKey(AHotKeyId);
 
   if not RegisterHotKey(WndHandle, AHotkeyId, Modifiers, AHotKey.Key) then
-    raise EGlobalKeyHookException.CreateFmt('Failed to register hot key (RegisterHotKey, error %d)',
-                              [GetLastError]);
+    raise EGlobalKeyHookRegistrationFailedException.CreateFmt(
+             'Failed to register hot key %s (error code %d)',
+             [AHotKey.ToString, GetLastError]);
 end;
 
 procedure TGlobalKeyHook.UnregisterKey(AHotKeyId: Integer);
@@ -198,11 +200,15 @@ destructor TGlobalKeyHook.Destroy;
 
 procedure TGlobalKeyHook.RegisterKey(const AStringId: String;
   const AHotKey: THotKey);
-{$IfDef Windows}
 var
+  {$IfDef Windows}
   FullStrId: String;
   Id: Integer;
-{$EndIf}
+  {$EndIf}
+  {$IfDef Linux}
+  Res: Boolean;
+  ErrMsg: String;
+  {$EndIf}
 begin
   if AHotKey.IsEmpty then
   begin // No key set
@@ -213,34 +219,48 @@ procedure TGlobalKeyHook.RegisterKey(const AStringId: String;
   DebugLn('Start to register hotkey %s for %s',
       [AHotKey.ToString, AStringId]);
 
-  {$IfDef Windows}
-  // Find atom id
-  FullStrId := GetFullStringId(AStringId);
-  if KeysMap.IndexOf(AStringId) = -1 then
-    Id := GlobalAddAtom(PChar(FullStrId))
-  else
-  begin
-    if KeysMap.KeyData[AStringId] = AHotKey then
+  try
+    {$IfDef Windows}
+    // Find atom id
+    FullStrId := GetFullStringId(AStringId);
+    if KeysMap.IndexOf(AStringId) = -1 then
+      Id := GlobalAddAtom(PChar(FullStrId))
+    else
     begin
-      DebugLn('Hotkey %s for %s not changed', [AHotKey.ToString, AStringId]);
+      if KeysMap.KeyData[AStringId] = AHotKey then
+      begin
+        DebugLn('Hotkey %s for %s not changed', [AHotKey.ToString, AStringId]);
 
-      Exit;
+        Exit;
+      end;
+
+      Id := GlobalFindAtom(PChar(FullStrId));
     end;
 
-    Id := GlobalFindAtom(PChar(FullStrId));
-  end;
+    RegisterKey(Id, AHotKey);
+    {$EndIf}
+    {$IfDef Linux}
+    if (KeysMap.IndexOf(AStringId) <> -1) and (KeysMap.KeyData[AStringId] = AHotKey) then
+    begin
+      DebugLn('Hotkey %s for %s not changed', [AHotKey.ToString, AStringId]);
 
-  RegisterKey(Id, AHotKey);
-  {$EndIf}
-  {$IfDef Linux}
-  if (KeysMap.IndexOf(AStringId) <> -1) and (KeysMap.KeyData[AStringId] = AHotKey) then
-  begin
-    DebugLn('Hotkey %s for %s not changed', [AHotKey.ToString, AStringId]);
+      Exit;
+    end;
 
-    Exit;
+    Res := HKCapture.RegisterNotify(AHotKey.Key, AHotKey.ShiftState, @OnHotKeyEvent);
+    if not Res then
+    begin
+      ErrMsg := Format('Failed to register hotkey %s for %s', [AHotKey.ToString, AStringId]);
+      raise EGlobalKeyHookRegistrationFailedException.Create(ErrMsg);
+    end;
+    {$EndIf}
+  except
+    on E: Exception do
+    begin
+      DebugLn({E.ToString} E.Message);
+      raise;
+    end
   end;
-  HKCapture.RegisterNotify(AHotKey.Key, AHotKey.ShiftState, @OnHotKeyEvent);
-  {$EndIf}
 
   KeysMap.AddOrSetData(AStringId, AHotKey);
 

libs/Cross.Codebot

@@ -195,12 +195,14 @@   TMainForm = class(TForm)
     procedure SetStartAutoCaptureHotKey(AHotKey: THotKey);
     procedure SetStopAutoCaptureHotKey(AHotKey: THotKey);
     procedure SetSingleCaptureHotKey(AHotKey: THotKey);
+    procedure SetHotKey(AHotKeyId: String; AHotKey: THotKey);
     procedure SetCompressionLevel(ALevel: Tcompressionlevel);
     function GetCompressionLevel: Tcompressionlevel;
     procedure UpdateFormAutoSize;
 
     procedure OnHotKeyEvent(const AHotKeyId: String);
     procedure OnDebugLnEvent(Sender: TObject; S: string; var Handled: Boolean);
+    function OnHotKeysSaving(ASender: TObject; out AErrorMsg: string): Boolean;
 
     {$IfDef Linux}
     procedure OnScreenConfigurationChanged(const AEvent: TXEvent);
@@ -467,17 +469,9 @@ procedure TMainForm.ReadSettings;
 
 procedure TMainForm.FormCreate(Sender: TObject);
 const
-  StartAutoCaptureDefaultHotKey: THotKey = (
-    ShiftState: [ssCtrl];
-    Key: VK_F5;
-  );
-  StopAutoCaptureDefaultHotKey: THotKey = (
-    ShiftState: [ssCtrl];
-    Key: VK_F6;
-  );
-  SingleCaptureDefaultHotKey: THotKey = (
-    ShiftState: [ssCtrl];
-    Key: VK_F7;
+  NoHotKey: THotKey = (
+    ShiftState: [];
+    Key: VK_UNKNOWN;
   );
 var
   ///////
@@ -540,12 +534,24 @@ procedure TMainForm.FormCreate(Sender: TObject);
   // Enable global hotkeys
   KeyHook := TGlobalKeyHook.Create({$IfDef Windows}Handle, 'AutoScreenshot'{$EndIf}
                                    {$IfDef Linux}@OnHotKeyEvent{$EndIf});
-  HotKey := Ini.ReadHotKey(HotKeysIniSection, 'StartAutoCapture', StartAutoCaptureDefaultHotKey);
-  KeyHook.RegisterKey('StartAutoCapture', HotKey);
-  HotKey := Ini.ReadHotKey(HotKeysIniSection, 'StopAutoCapture', StopAutoCaptureDefaultHotKey);
-  KeyHook.RegisterKey('StopAutoCapture', HotKey);
-  HotKey := Ini.ReadHotKey(HotKeysIniSection, 'SingleCapture', SingleCaptureDefaultHotKey);
-  KeyHook.RegisterKey('SingleCapture', HotKey);
+  HotKey := Ini.ReadHotKey(HotKeysIniSection, 'StartAutoCapture', NoHotKey);
+  try
+    KeyHook.RegisterKey('StartAutoCapture', HotKey);
+  except
+    KeyHook.RegisterKey('StartAutoCapture', NoHotKey);
+  end;
+  HotKey := Ini.ReadHotKey(HotKeysIniSection, 'StopAutoCapture', NoHotKey);
+  try
+    KeyHook.RegisterKey('StopAutoCapture', HotKey);
+  except
+    KeyHook.RegisterKey('StopAutoCapture', NoHotKey);
+  end;
+  HotKey := Ini.ReadHotKey(HotKeysIniSection, 'SingleCapture', NoHotKey);
+  try
+    KeyHook.RegisterKey('SingleCapture', HotKey);
+  except
+    KeyHook.RegisterKey('SingleCapture', NoHotKey);
+  end;
 
   {$IfDef Linux}
   // Enable monitor confuguration changed updates in Linux
@@ -594,18 +600,15 @@ procedure TMainForm.FormShow(Sender: TObject);
 procedure TMainForm.HotKetsSettingsMenuItemClick(Sender: TObject);
 var
   HotKeysForm: THotKeysForm;
+  HasErrors: Boolean = False;
 begin
-  HotKeysForm := THotKeysForm.Create(Nil);
+  // ToDo: Reduce amount of code duplicates
+
+  HotKeysForm := THotKeysForm.Create(Nil, @OnHotKeysSaving);
   HotKeysForm.StartAutoCaptureKey := Self.KeyHook.FindHotKey('StartAutoCapture');
   HotKeysForm.StopAutoCaptureKey := Self.KeyHook.FindHotKey('StopAutoCapture');
   HotKeysForm.SingleCaptureKey := Self.KeyHook.FindHotKey('SingleCapture');
-  if HotKeysForm.ShowModal = mrOK then
-  begin
-    SetStartAutoCaptureHotKey(HotKeysForm.StartAutoCaptureKey);
-    SetStopAutoCaptureHotKey(HotKeysForm.StopAutoCaptureKey);
-    SetSingleCaptureHotKey(HotKeysForm.SingleCaptureKey);
-  end;
-
+  HotKeysForm.ShowModal;
   HotKeysForm.Free;
 end;
 
@@ -1618,20 +1621,23 @@ procedure TMainForm.SetAutoCheckForUpdates(AVal: Boolean);
 
 procedure TMainForm.SetStartAutoCaptureHotKey(AHotKey: THotKey);
 begin
-  KeyHook.RegisterKey('StartAutoCapture', AHotKey);
-  Ini.WriteHotKey(HotKeysIniSection, 'StartAutoCapture', AHotKey);
+  SetHotKey('StartAutoCapture', AHotKey);
 end;
 
 procedure TMainForm.SetStopAutoCaptureHotKey(AHotKey: THotKey);
 begin
-  KeyHook.RegisterKey('StopAutoCapture', AHotKey);
-  Ini.WriteHotKey(HotKeysIniSection, 'StopAutoCapture', AHotKey);
+  SetHotKey('StopAutoCapture', AHotKey);
 end;
 
 procedure TMainForm.SetSingleCaptureHotKey(AHotKey: THotKey);
 begin
-  KeyHook.RegisterKey('SingleCapture', AHotKey);
-  Ini.WriteHotKey(HotKeysIniSection, 'SingleCapture', AHotKey);
+  SetHotKey('SingleCapture', AHotKey);
+end;
+
+procedure TMainForm.SetHotKey(AHotKeyId: String; AHotKey: THotKey);
+begin
+  KeyHook.RegisterKey(AHotKeyId, AHotKey);
+  Ini.WriteHotKey(HotKeysIniSection, AHotKeyId, AHotKey);
 end;
 
 procedure TMainForm.SetCompressionLevel(ALevel: Tcompressionlevel);
@@ -1687,6 +1693,45 @@ procedure TMainForm.OnDebugLnEvent(Sender: TObject; S: string;
   Handled := True;
 end;
 
+function TMainForm.OnHotKeysSaving(ASender: TObject; out AErrorMsg: string): Boolean;
+var
+  HasErrors: Boolean = False;
+  HotKeysForm: THotKeysForm;
+begin
+  HotKeysForm := THotKeysForm(ASender);
+
+  try
+    SetStartAutoCaptureHotKey(HotKeysForm.StartAutoCaptureKey);
+    HotKeysForm.StartAutoCaptureMarked := False;
+  except
+    HasErrors := True;
+    HotKeysForm.StartAutoCaptureMarked := True;
+  end;
+
+  try
+    SetStopAutoCaptureHotKey(HotKeysForm.StopAutoCaptureKey);
+    HotKeysForm.StopAutoCaptureMarked := False;
+  except
+    HasErrors := True;
+    HotKeysForm.StopAutoCaptureMarked := True;
+  end;
+
+  try
+    SetSingleCaptureHotKey(HotKeysForm.SingleCaptureKey);
+    HotKeysForm.SingleCaptureMarked := False;
+  except
+    HasErrors := True;
+    HotKeysForm.SingleCaptureMarked := True;
+  end;
+
+  if HasErrors then
+    AErrorMsg := Localizer.I18N('HotKeyOccupied')
+  else
+    AErrorMsg := '';
+
+  Result := not HasErrors;
+end;
+
 {$IfDef Linux}
 procedure TMainForm.OnScreenConfigurationChanged(const AEvent: TXEvent);
 begin