paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-13 14:39:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtk: fix AV in GetWindowDebugReport based on patch of Flávio Etrusco (issue #0015857) + formatting

Browse Source 
git-svn-id: trunk@23811 -
This commit is contained in:
paul 2010-03-01 07:21:33 +00:00
parent d1fa7b28f6
commit 30c02025b3
2 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
lcl/interfaces/gtk/gtkproc.inc
View File

@ -459,7 +459,7 @@ end;
function GetWindowDebugReport(AWindow: PGDKWindow): string;
var
p: Pgpointer;
p: gpointer;
Widget: PGtkWidget;
WindowType: TGdkWindowType;
Width: Integer;
@ -469,52 +469,51 @@ var
{$endif}
TypeAsStr: String;
begin
Result:=DbgS(AWindow);
if AWindow=nil then exit;
Result := DbgS(AWindow);
if AWindow = nil then Exit;
// window type
WindowType:=gdk_window_get_type(AWindow);
WindowType := gdk_window_get_type(AWindow);
case WindowType of
GDK_WINDOW_ROOT: TypeAsStr:='Root';
GDK_WINDOW_TOPLEVEL: TypeAsStr:='TopLvl';
GDK_WINDOW_CHILD: TypeAsStr:='Child';
GDK_WINDOW_DIALOG: TypeAsStr:='Dialog';
GDK_WINDOW_TEMP: TypeAsStr:='Temp';
{$ifdef gtk1}
GDK_WINDOW_PIXMAP: TypeAsStr:='Pixmap';
{$endif gtk1}
GDK_WINDOW_FOREIGN: TypeAsStr:='Foreign';
else TypeAsStr:='Unknown';
GDK_WINDOW_ROOT: TypeAsStr := 'Root';
GDK_WINDOW_TOPLEVEL: TypeAsStr := 'TopLvl';
GDK_WINDOW_CHILD: TypeAsStr := 'Child';
GDK_WINDOW_DIALOG: TypeAsStr := 'Dialog';
GDK_WINDOW_TEMP: TypeAsStr := 'Temp';
{$ifdef gtk1}
GDK_WINDOW_PIXMAP: TypeAsStr := 'Pixmap';
{$endif gtk1}
GDK_WINDOW_FOREIGN: TypeAsStr := 'Foreign';
else
TypeAsStr := 'Unknown';
end;
Result:=Result+' Type='+TypeAsStr;
Result:=Result + ' Type=' + TypeAsStr;
DebugLn(Result);
// user data
if WindowType in [GDK_WINDOW_ROOT,GDK_WINDOW_TOPLEVEL,GDK_WINDOW_CHILD,
GDK_WINDOW_DIALOG]
then begin
p:=nil;
gdk_window_get_user_data(AWindow,p);
if GtkWidgetIsA(PGTKWidget(p),gtk_widget_get_type) then begin
Widget:=PGTKWidget(p);
Result:=Result+'<Widget['+GetWidgetDebugReport(Widget)+']>';
end else begin
Result:=Result+'<UserData='+DbgS(p)+']>';
end;
if WindowType in [GDK_WINDOW_ROOT,GDK_WINDOW_TOPLEVEL,GDK_WINDOW_CHILD, GDK_WINDOW_DIALOG] then
begin
p := nil;
gdk_window_get_user_data(AWindow, @p);
if GtkWidgetIsA(PGTKWidget(p), gtk_widget_get_type) then
begin
Widget := PGTKWidget(p);
Result := Result + '<Widget[' + GetWidgetDebugReport(Widget) + ']>';
end
else
Result := Result + '<UserData=' + DbgS(p) + ']>';
end;
// size
gdk_window_get_size(AWindow,@Width,@Height);
Result:=Result+' Size='+IntToStr(Width)+'x'+IntToStr(Height);
gdk_window_get_size(AWindow, @Width, @Height);
Result := Result + ' Size=' + IntToStr(Width) + 'x' + IntToStr(Height);
{$ifdef gtk1}
// visual
Visual:=gdk_window_get_visual(AWindow);
if Visual<>nil then begin
if WindowType in [GDK_WINDOW_PIXMAP] then begin
Result:=Result+' Depth='+IntToStr(Visual^.bits_per_rgb);
end;
end;
Visual := gdk_window_get_visual(AWindow);
if Visual <> nil then
if WindowType in [GDK_WINDOW_PIXMAP] then
Result := Result + ' Depth=' + IntToStr(Visual^.bits_per_rgb);
{$endif gtk1}
end;

4
lcl/interfaces/gtk/gtkwidgetset.inc
View File

@ -2687,8 +2687,8 @@ var
end;
{$IFDEF VerboseStretchCopyArea}
DebugLn('SrcDevBitmapToDrawable SrcPixmap=[',GetWindowDebugReport(SrcPixmap),']',
' MaskPixmap=[',GetWindowDebugReport(MaskPixmap),']');
DebugLn('SrcDevBitmapToDrawable SrcPixmap=[',GetWindowDebugReport(SrcDrawable),']',
' MaskPixmap=[',GetWindowDebugReport(MskBitmap),']');
{$ENDIF}
if (MskBitmap = nil) and (not SizeChange) and (ROP=SRCCOPY)