From 163caebf0b262bb3af234aff7a8457ba2c637aa7 Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 10 Jan 2025 17:06:42 +0100 Subject: [PATCH] lcl: gtk2: moved singleton MenuWidget to TGtk2WidgetSet, do not interfere with gtk2 focus evtns fixing AppActive with Alt-Tab and switching to another workspace --- lcl/interfaces/gtk2/gtk2callback.inc | 2 +- lcl/interfaces/gtk2/gtk2int.pas | 3 ++ lcl/interfaces/gtk2/gtk2widgetset.inc | 9 +++++ lcl/interfaces/gtk2/gtk2wsforms.pp | 49 +++++++++++++-------------- lcl/interfaces/gtk2/gtk2wsmenus.pp | 31 +++++++++++------ 5 files changed, 56 insertions(+), 38 deletions(-) diff --git a/lcl/interfaces/gtk2/gtk2callback.inc b/lcl/interfaces/gtk2/gtk2callback.inc index aa40834d53..e12b795499 100644 --- a/lcl/interfaces/gtk2/gtk2callback.inc +++ b/lcl/interfaces/gtk2/gtk2callback.inc @@ -678,7 +678,7 @@ begin and gtk_window_has_TopLevel_Focus(Window) then begin // fake focus-out event - {$IFDEF VerboseFocus} + {$IF defined(VerboseFocus) or defined(VerboseGtk2Focus)} DebugLn('NOTE: Window with stalled focus found!, faking focus-out event'); {$ENDIF} event := gdk_event_new(GDK_FOCUS_CHANGE); diff --git a/lcl/interfaces/gtk2/gtk2int.pas b/lcl/interfaces/gtk2/gtk2int.pas index 5f572fbaff..63e386fae4 100644 --- a/lcl/interfaces/gtk2/gtk2int.pas +++ b/lcl/interfaces/gtk2/gtk2int.pas @@ -272,10 +272,12 @@ type private {$IFDEF HASX} FDesktopWidget: PGtkWidget; + FMenuWidget: PGtkWidget; FWSFrameRect: TRect; {$ENDIF} procedure Gtk2Create; procedure Gtk2Destroy; + procedure SetMenuWidget(const AValue: PGtkWidget); protected function GetAppHandle: TLCLHandle; override; @@ -334,6 +336,7 @@ type property LastFocusOut: PGtkWidget read FLastFocusOut write FLastFocusOut; property MultiThreadingEnabled: boolean read FMultiThreadingEnabled; property KeyStateList: TFPList read FKeyStateList_; + property MenuWidget: PGtkWidget read FMenuWidget write SetMenuWidget; end; {$I gtk2listslh.inc} diff --git a/lcl/interfaces/gtk2/gtk2widgetset.inc b/lcl/interfaces/gtk2/gtk2widgetset.inc index 5835859da1..4956b73290 100644 --- a/lcl/interfaces/gtk2/gtk2widgetset.inc +++ b/lcl/interfaces/gtk2/gtk2widgetset.inc @@ -1925,6 +1925,12 @@ begin end; +procedure TGtk2WidgetSet.SetMenuWidget(const AValue: PGtkWidget); +begin + if FMenuWidget=AValue then Exit; + FMenuWidget:=AValue; +end; + {$ifdef Unix} {$IFDEF HASX} @@ -2759,6 +2765,9 @@ procedure TGtk2WidgetSet.SetAppActive(const AValue: Boolean); begin if AValue <> FAppActive then begin + {$IFDEF VerboseGtk2Focus} + debugln(['TGtk2WidgetSet.SetAppActive ',AValue]); + {$ENDIF} FAppActive := AValue; if FAppActive then begin diff --git a/lcl/interfaces/gtk2/gtk2wsforms.pp b/lcl/interfaces/gtk2/gtk2wsforms.pp index 13d500abd1..57a9804ee6 100644 --- a/lcl/interfaces/gtk2/gtk2wsforms.pp +++ b/lcl/interfaces/gtk2/gtk2wsforms.pp @@ -273,36 +273,31 @@ begin // Application.Activate/Deactivate is done via a timer // Every time a form looses the focus a timer is started // and every time focus is gained the timer is stopped. - // Note: It seems gtk2 itself does not always detect focus lost - // For example in LinuxMint switching from a TEdit using Alt-Tab to another - // app generates a focus out, but gtk2 still shows the TEdit focused - // with blinking cursor. - // Switching focus using the mouse to another app, also generates - // a focus out, and gtk2 hides the blinking cursor and focus coloring. - // Switching to another workspace does not generate a focus out event . if PGdkEventFocus(event)^._in = 0 then begin // focus out - //debugln(['Gtk2FormEvent focus out ',DbgSName(ACtl)]); - //if ACtl.Parent<>nil then - // debugln(['Gtk2FormEvent ACtl.Parent=',DbgSName(ACtl.Parent)]); + {$IFDEF VerboseGtk2Focus} + debugln(['Gtk2FormEvent focus out ',DbgSName(ACtl)]); + {$ENDIF} - // Test switch to another app via mouse, Alt-Tab, workspace. And test open popup menu click GetFocus. + // When touching this code: + // Test switching to another app via mouse, Alt-Tab, workspace. + // And test open popup menu then click and GetFocus. - {$IFDEF HASX} - //if ACtl.Parent<>nil then - //begin - XDisplay := gdk_display; - XGetInputFocus(XDisplay, @Window, @RevertStatus); - // Window - 1 is our frame ! - if (RevertStatus = RevertToParent) and - (GDK_WINDOW_XID(Widget^.Window) = Window - 1) then - begin - // Note: on LinuxMint switching via Alt-Tab to another window - // generates RevertToParent. - exit(True); // stop - end; - //end; + {$IF defined(HASX) and defined(EnableKeepGtk2WidgetActivated)} + // MG: this code kept the gtk state activated, so that GetFocus + // returned the last focused form. + // This broke AppActive when switching on Linux with Atl-Tab or to another Workspace + XDisplay := gdk_display; + XGetInputFocus(XDisplay, @Window, @RevertStatus); + // Window - 1 is our frame ! + if (RevertStatus = RevertToParent) and + (GDK_WINDOW_XID(Widget^.Window) = Window - 1) then + begin + // Note: on LinuxMint switching via Alt-Tab to another window + // generates RevertToParent. + exit(True); // stop + end; {$ENDIF} with Gtk2WidgetSet do begin @@ -312,7 +307,9 @@ begin end; end else begin - //debugln(['Gtk2FormEvent focus in ',DbgSName(ACtl)]); + {$IFDEF VerboseGtk2Focus} + debugln(['Gtk2FormEvent focus in ',DbgSName(ACtl)]); + {$ENDIF} with Gtk2WidgetSet do begin StopAppFocusTimer; diff --git a/lcl/interfaces/gtk2/gtk2wsmenus.pp b/lcl/interfaces/gtk2/gtk2wsmenus.pp index a1f0915d79..a30d472806 100644 --- a/lcl/interfaces/gtk2/gtk2wsmenus.pp +++ b/lcl/interfaces/gtk2/gtk2wsmenus.pp @@ -24,7 +24,7 @@ uses // RTL Classes, Types, glib2, gdk2, gtk2, math, // LazUtils - LazTracer, + LazTracer, LazLoggerBase, // LCL Gtk2Int, Gtk2Proc, Gtk2Globals, Gtk2Def, Gtk2Extra, LCLType, LCLIntf, InterfaceBase, WSMenus, LMessages, Graphics, Menus, Forms; @@ -79,9 +79,6 @@ implementation {$I gtk2defines.inc} -var - MenuWidget: PGtkWidget = nil; - function Gtk2MenuItemButtonPress(widget: PGtkWidget; event: PGdkEventButton; {%H-}user_data: gpointer): gboolean; cdecl; var @@ -387,7 +384,7 @@ end; class procedure TGtk2WSMenuItem.SetShortCut(const AMenuItem: TMenuItem; const ShortCutK1, ShortCutK2: TShortCut); //var - //MenuWidget: PGtkMenuItem; + //aMenuWidget: PGtkMenuItem; //accel_path: String; //CurKey: Word; //CurShift: TShiftState; @@ -398,8 +395,8 @@ begin UpdateInnerMenuItem(AMenuItem, {%H-}PGTKWidget(AMenuItem.Handle), ShortCutK1, ShortCutK2); { // Gets the inner widgets. They should already be created by now - MenuWidget := PGtkMenuItem(AMenuItem.Handle); - if (MenuWidget=nil) then Exit; + aMenuWidget := PGtkMenuItem(AMenuItem.Handle); + if (aMenuWidget=nil) then Exit; // Converts the shortcut to a gtk friendly format and sets it ShortCutToKey(NewShortCut, CurKey, CurShift); accel_path := 'LCLApp/Menu/' + GetAcceleratorString(CurKey, CurShift); @@ -628,13 +625,15 @@ end; procedure gtkWSPopupMenuDeactivate(widget: PGtkWidget; data: gPointer); cdecl; begin - if widget = MenuWidget then - MenuWidget := nil; + {$IFDEF VerboseGtk2Focus} + DebugLn('gtkWSPopupMenuDeactivate '); + {$ENDIF} + if widget = TGtk2WidgetSet(WidgetSet).MenuWidget then + TGtk2WidgetSet(WidgetSet).MenuWidget := nil; if data <> nil then g_idle_add(@gtkWSPopupDelayedClose, Pointer(PWidgetInfo(data)^.LCLObject)); end; - class procedure TGtk2WSPopupMenu.SetCallbacks(const AGtkWidget: PGtkWidget; const AWidgetInfo: PWidgetInfo); begin @@ -663,8 +662,9 @@ var APoint: TPoint; AProc: Pointer; WidgetInfo: PWidgetInfo; + MenuWidget: PGtkWidget; begin - if MenuWidget<>nil then //cannot popup when another popup menu is visible + if TGtk2WidgetSet(WidgetSet).MenuWidget<>nil then //cannot popup when another popup menu is visible Exit; ReleaseMouseCapture; @@ -679,8 +679,14 @@ begin // MenuWidget can be either GtkMenu or GtkMenuItem submenu if GTK_IS_MENU_ITEM(MenuWidget) then MenuWidget := gtk_menu_item_get_submenu(PGtkMenuItem(MenuWidget)); + + TGtk2WidgetSet(WidgetSet).MenuWidget:=MenuWidget; gtk_menu_popup(PGtkMenu(MenuWidget), nil, nil, TGtkMenuPositionFunc(AProc), WidgetInfo, 0, gtk_get_current_event_time()); + TGtk2WidgetSet(WidgetSet).LastFocusIn:=MenuWidget; + {$IFDEF VerboseGtk2Focus} + debugln('TGtk2WSPopupMenu.Popup REPEAT...'); + {$ENDIF} repeat try WidgetSet.AppProcessMessages; // process all events @@ -694,6 +700,9 @@ begin break; Application.Idle(true); until False; + {$IFDEF VerboseGtk2Focus} + debugln('TGtk2WSPopupMenu.Popup END'); + {$ENDIF} end; end.