option to disable focus stealing

This commit is contained in:
April Ayres-Griffiths 2019-04-13 20:14:05 +10:00
parent be63b3fe96
commit ed9176f944
8 changed files with 60 additions and 0 deletions

View File

@ -5474,6 +5474,7 @@ object GUIForm: TGUIForm
top = 48 top = 48
object MenuItem1: TMenuItem object MenuItem1: TMenuItem
Caption = 'File' Caption = 'File'
OnClick = MenuItem1Click
object miProfiles: TMenuItem object miProfiles: TMenuItem
Caption = 'Profiles' Caption = 'Profiles'
OnClick = miProfilesClick OnClick = miProfilesClick
@ -5650,6 +5651,13 @@ object GUIForm: TGUIForm
object MenuItem6: TMenuItem object MenuItem6: TMenuItem
Caption = '-' Caption = '-'
end end
object miDisableFocusStealing: TMenuItem
Caption = 'Disable GUI Focus Stealing'
OnClick = miDisableFocusStealingClick
end
object N11: TMenuItem
Caption = '-'
end
object MenuItem2: TMenuItem object MenuItem2: TMenuItem
Caption = 'Quit' Caption = 'Quit'
OnClick = MenuItem2Click OnClick = MenuItem2Click

View File

@ -21,6 +21,8 @@ type
{ TGUIForm } { TGUIForm }
TGUIForm = class(TForm) TGUIForm = class(TForm)
N11: TMenuItem;
miDisableFocusStealing: TMenuItem;
miDisk2WPToggle: TMenuItem; miDisk2WPToggle: TMenuItem;
miDisk1WPToggle: TMenuItem; miDisk1WPToggle: TMenuItem;
MenuItem14: TMenuItem; MenuItem14: TMenuItem;
@ -337,6 +339,7 @@ type
procedure MenuItem16Click(Sender: TObject); procedure MenuItem16Click(Sender: TObject);
procedure MenuItem17Click(Sender: TObject); procedure MenuItem17Click(Sender: TObject);
procedure MenuItem18Click(Sender: TObject); procedure MenuItem18Click(Sender: TObject);
procedure MenuItem1Click(Sender: TObject);
// procedure MenuItem1Click(Sender: TObject); // procedure MenuItem1Click(Sender: TObject);
procedure MenuItem2Click(Sender: TObject); procedure MenuItem2Click(Sender: TObject);
procedure Freeze; procedure Freeze;
@ -368,6 +371,7 @@ type
procedure miDHRMonoDotsClick(Sender: TObject); procedure miDHRMonoDotsClick(Sender: TObject);
procedure miDHRMonoRasterClick(Sender: TObject); procedure miDHRMonoRasterClick(Sender: TObject);
procedure miDHRMonoVoxelsClick(Sender: TObject); procedure miDHRMonoVoxelsClick(Sender: TObject);
procedure miDisableFocusStealingClick(Sender: TObject);
procedure miDisk1WPToggleClick(Sender: TObject); procedure miDisk1WPToggleClick(Sender: TObject);
procedure miDisk2WPToggleClick(Sender: TObject); procedure miDisk2WPToggleClick(Sender: TObject);
procedure miDiskMenuWPClick(Sender: TObject); procedure miDiskMenuWPClick(Sender: TObject);
@ -511,6 +515,7 @@ type
lastMouseX, lastMouseY: longint; lastMouseX, lastMouseY: longint;
inPopup: boolean; inPopup: boolean;
isFS: boolean; isFS: boolean;
disableFocusStealing: boolean;
public public
procedure AppActivate(Sender: TObject); procedure AppActivate(Sender: TObject);
procedure AppDeactivate(Sender: TObject); procedure AppDeactivate(Sender: TObject);
@ -923,6 +928,11 @@ begin
UpdateConfig( 'video/init.video.dhgrmode', '4', true ); UpdateConfig( 'video/init.video.dhgrmode', '4', true );
end; end;
procedure TGUIForm.miDisableFocusStealingClick(Sender: TObject);
begin
disableFocusStealing:=(not disableFocusStealing);
end;
procedure TGUIForm.miDisk1WPToggleClick(Sender: TObject); procedure TGUIForm.miDisk1WPToggleClick(Sender: TObject);
begin begin
SimpleGet( baseUrl + '/api/control/hardware/disk/wp/0/toggle' ); SimpleGet( baseUrl + '/api/control/hardware/disk/wp/0/toggle' );
@ -1630,6 +1640,8 @@ var
x, y: longint; x, y: longint;
p, q: TPoint; p, q: TPoint;
begin begin
if isFS then
exit;
x := Mouse.CursorPos.x; x := Mouse.CursorPos.x;
y := Mouse.CursorPos.y; y := Mouse.CursorPos.y;
if (x <> lastMouseX) or (y <> lastMouseY) then if (x <> lastMouseX) or (y <> lastMouseY) then
@ -2661,6 +2673,12 @@ begin
SimpleGet(baseUrl + '/api/control/hardware/disk/blank/1'); SimpleGet(baseUrl + '/api/control/hardware/disk/blank/1');
end; end;
procedure TGUIForm.MenuItem1Click(Sender: TObject);
begin
{ focus stealing }
miDisableFocusStealing.Checked := disableFocusStealing;
end;
procedure TGUIForm.MenuItem2Click(Sender: TObject); procedure TGUIForm.MenuItem2Click(Sender: TObject);
begin begin
SimpleGet( baseUrl+'/api/control/quit' ); SimpleGet( baseUrl+'/api/control/quit' );

View File

@ -5474,6 +5474,7 @@ object GUIForm: TGUIForm
top = 48 top = 48
object MenuItem1: TMenuItem object MenuItem1: TMenuItem
Caption = 'File' Caption = 'File'
OnClick = MenuItem1Click
object miProfiles: TMenuItem object miProfiles: TMenuItem
Caption = 'Profiles' Caption = 'Profiles'
OnClick = miProfilesClick OnClick = miProfilesClick
@ -5650,6 +5651,13 @@ object GUIForm: TGUIForm
object MenuItem6: TMenuItem object MenuItem6: TMenuItem
Caption = '-' Caption = '-'
end end
object miDisableFocusStealing: TMenuItem
Caption = 'Disable GUI Focus Stealing'
OnClick = miDisableFocusStealingClick
end
object N11: TMenuItem
Caption = '-'
end
object MenuItem2: TMenuItem object MenuItem2: TMenuItem
Caption = 'Quit' Caption = 'Quit'
OnClick = MenuItem2Click OnClick = MenuItem2Click

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -5474,6 +5474,7 @@ object GUIForm: TGUIForm
top = 48 top = 48
object MenuItem1: TMenuItem object MenuItem1: TMenuItem
Caption = 'File' Caption = 'File'
OnClick = MenuItem1Click
object miProfiles: TMenuItem object miProfiles: TMenuItem
Caption = 'Profiles' Caption = 'Profiles'
OnClick = miProfilesClick OnClick = miProfilesClick
@ -5650,6 +5651,13 @@ object GUIForm: TGUIForm
object MenuItem6: TMenuItem object MenuItem6: TMenuItem
Caption = '-' Caption = '-'
end end
object miDisableFocusStealing: TMenuItem
Caption = 'Disable GUI Focus Stealing'
OnClick = miDisableFocusStealingClick
end
object N11: TMenuItem
Caption = '-'
end
object MenuItem2: TMenuItem object MenuItem2: TMenuItem
Caption = 'Quit' Caption = 'Quit'
OnClick = MenuItem2Click OnClick = MenuItem2Click

View File

@ -21,6 +21,8 @@ type
{ TGUIForm } { TGUIForm }
TGUIForm = class(TForm) TGUIForm = class(TForm)
N11: TMenuItem;
miDisableFocusStealing: TMenuItem;
miDisk2WPToggle: TMenuItem; miDisk2WPToggle: TMenuItem;
miDisk1WPToggle: TMenuItem; miDisk1WPToggle: TMenuItem;
MenuItem14: TMenuItem; MenuItem14: TMenuItem;
@ -337,6 +339,7 @@ type
procedure MenuItem16Click(Sender: TObject); procedure MenuItem16Click(Sender: TObject);
procedure MenuItem17Click(Sender: TObject); procedure MenuItem17Click(Sender: TObject);
procedure MenuItem18Click(Sender: TObject); procedure MenuItem18Click(Sender: TObject);
procedure MenuItem1Click(Sender: TObject);
// procedure MenuItem1Click(Sender: TObject); // procedure MenuItem1Click(Sender: TObject);
procedure MenuItem2Click(Sender: TObject); procedure MenuItem2Click(Sender: TObject);
procedure Freeze; procedure Freeze;
@ -368,6 +371,7 @@ type
procedure miDHRMonoDotsClick(Sender: TObject); procedure miDHRMonoDotsClick(Sender: TObject);
procedure miDHRMonoRasterClick(Sender: TObject); procedure miDHRMonoRasterClick(Sender: TObject);
procedure miDHRMonoVoxelsClick(Sender: TObject); procedure miDHRMonoVoxelsClick(Sender: TObject);
procedure miDisableFocusStealingClick(Sender: TObject);
procedure miDisk1WPToggleClick(Sender: TObject); procedure miDisk1WPToggleClick(Sender: TObject);
procedure miDisk2WPToggleClick(Sender: TObject); procedure miDisk2WPToggleClick(Sender: TObject);
procedure miDiskMenuWPClick(Sender: TObject); procedure miDiskMenuWPClick(Sender: TObject);
@ -511,6 +515,7 @@ type
lastMouseX, lastMouseY: longint; lastMouseX, lastMouseY: longint;
inPopup: boolean; inPopup: boolean;
isFS: boolean; isFS: boolean;
disableFocusStealing: boolean;
public public
procedure AppActivate(Sender: TObject); procedure AppActivate(Sender: TObject);
procedure AppDeactivate(Sender: TObject); procedure AppDeactivate(Sender: TObject);
@ -923,6 +928,11 @@ begin
UpdateConfig( 'video/init.video.dhgrmode', '4', true ); UpdateConfig( 'video/init.video.dhgrmode', '4', true );
end; end;
procedure TGUIForm.miDisableFocusStealingClick(Sender: TObject);
begin
disableFocusStealing:=(not disableFocusStealing);
end;
procedure TGUIForm.miDisk1WPToggleClick(Sender: TObject); procedure TGUIForm.miDisk1WPToggleClick(Sender: TObject);
begin begin
SimpleGet( baseUrl + '/api/control/hardware/disk/wp/0/toggle' ); SimpleGet( baseUrl + '/api/control/hardware/disk/wp/0/toggle' );
@ -2310,6 +2320,8 @@ begin
exit; exit;
if WindowState = wsMinimized then if WindowState = wsMinimized then
exit; exit;
if disableFocusStealing then
exit;
//if hidden then //if hidden then
// exit; // exit;
if GetTitleOfActiveWindow = 'microM8' then if GetTitleOfActiveWindow = 'microM8' then
@ -2663,6 +2675,12 @@ begin
SimpleGet(baseUrl + '/api/control/hardware/disk/blank/1'); SimpleGet(baseUrl + '/api/control/hardware/disk/blank/1');
end; end;
procedure TGUIForm.MenuItem1Click(Sender: TObject);
begin
{ focus stealing }
miDisableFocusStealing.Checked := disableFocusStealing;
end;
procedure TGUIForm.MenuItem2Click(Sender: TObject); procedure TGUIForm.MenuItem2Click(Sender: TObject);
begin begin
SimpleGet( baseUrl+'/api/control/quit' ); SimpleGet( baseUrl+'/api/control/quit' );