paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-31 04:12:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes crashes related to GetForegroundWindow by rewrapping the X11 window into a GdkWindow

Browse Source 
git-svn-id: trunk@32725 -
This commit is contained in:
sekelsenmat 2011-10-07 07:11:49 +00:00
parent 5fd3a7a645
commit 1acfc93cd4
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/gtk2/gtk2int.pas
View File

@ -299,7 +299,7 @@ type
{$I gtk2lclintfh.inc}
public
{$IFDEF HASX}
function X11Raise(AHandle: HWND): boolean;
//function X11Raise(AHandle: HWND): boolean; currently not used
function X11GetActiveWindow: HWND;
{$ENDIF}
procedure StartFocusTimer;

19
lcl/interfaces/gtk2/gtk2widgetset.inc
View File

@ -4254,7 +4254,7 @@ begin
end;
{$IFDEF HASX}
function TGtk2WidgetSet.X11Raise(AHandle: HWND): boolean;
{function TGtk2WidgetSet.X11Raise(AHandle: HWND): boolean;
var
Display: PDisplay;
RootWin: TWindow;
@ -4283,12 +4283,12 @@ begin
Result:=XSendEvent (Display, RootWin, False,
SubstructureRedirectMask or SubstructureNotifyMask,
@XClient)<>0;
end;
end;}
function TGtk2WidgetSet.X11GetActivewindow: HWND;
var
Display: PDisplay;
RootWin: TWindow;
RootWin, ResultWindow: TWindow;
ScreenNum: Integer;
WMAtom: TAtom;
ActualTypeReturn: TAtom;
@ -4298,11 +4298,13 @@ var
screen: PGdkScreen;
Valid: Boolean;
begin
Result := 0;
screen:=gdk_screen_get_default;
Display := gdk_x11_get_default_xdisplay;
if Display = nil then
exit;
if Display = nil then Exit;
ScreenNum := gdk_screen_get_number(screen);
RootWin := gdk_x11_get_default_root_xwindow;
WMAtom := XInternAtom(Display,'_NET_ACTIVE_WINDOW', False);
@ -4314,11 +4316,12 @@ begin
try
if (ActualTypeReturn = None) or (ActualFormatReturn <> 32) or not Assigned(Ptr) then
Valid := False;
if Valid then Result := PCardinal(Ptr)^;
if Valid then ResultWindow := PWindow(Ptr)^;
finally
if Assigned(Ptr) then
XFree(Ptr);
if Assigned(Ptr) then XFree(Ptr);
end;
if Valid then Result := HWND(gdk_window_foreign_new(ResultWindow));
end;
{$ENDIF}
{------------------------------------------------------------------------------

6
lcl/interfaces/gtk2/gtk2winapi.inc
View File

@ -8323,7 +8323,6 @@ var
GdkWindow: PGdkWindow;
AForm: TCustomForm;
begin
try
{$IFDEF VerboseFocus}
DbgOut('TGtk2WidgetSet.SetForegroundWindow hWnd=',DbgS(hWnd));
LCLObject:=TControl(GetLCLObject(Pointer(hWnd)));
@ -8370,11 +8369,6 @@ begin
gtk_window_present(PGtkWindow(hWnd));
end;
end;
except
{$IFDEF HASX}
Result:=X11Raise(hWnd);
{$ENDIF}
end;
end;
function TGtk2WidgetSet.SetMapMode(DC: HDC; fnMapMode : Integer): Integer;