gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 15:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows resize/drawing patch by Christopher Armstrong

Browse source 
<carmstrong@fastmail.com.au>.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@26065 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2008-02-14 21:13:17 +00:00
parent e365010701
commit f3dd6d33cf
4 changed files with 55 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2008-02-14 Fred Kiefer <FredKiefer@gmx.de>
* Headers/win32/WIN32Server.h: Extend WIN_INTERN with
backingStoreEmpty flag.
* Source/win32/WIN32Server.m (-windowbacking::): Set
backingStoreEmpty to YES;
* Source/win32/w32_windowdisplay.m: Use backingStoreEmpty to
determine drawing method.
Patch by Christopher Armstrong <carmstrong@fastmail.com.au>.
2008-02-14 Fred Kiefer <FredKiefer@gmx.de>
* Tools/win32pbs.m (-receivedEvent:...forMode:): Don't call NSApp

1
Headers/win32/WIN32Server.h
View file

@ -174,6 +174,7 @@ typedef struct _win_intern {
HDC hdc;
HGDIOBJ old;
MINMAXINFO minmax;
BOOL backingStoreEmpty;
} WIN_INTERN;
#endif /* _WIN32Server_h_INCLUDE */

6
Source/win32/WIN32Server.m
View file

@ -1087,9 +1087,15 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT uMsg,
win->old = SelectObject(hdc2, hbitmap);
win->hdc = hdc2;
win->useHDC = YES;
win->backingStoreEmpty = YES;
ReleaseDC((HWND)winNum, hdc);
}
else
{
win->useHDC = NO;
win->hdc = NULL;
}
}
- (void) titlewindow: (NSString*)window_title : (int) winNum

75
Source/win32/w32_windowdisplay.m
View file

@ -37,6 +37,23 @@ invalidateWindow(WIN32Server *svr, HWND hwnd, RECT rect)
{
WIN_INTERN *win = (WIN_INTERN *)GetWindowLong((HWND)hwnd, GWL_USERDATA);
if (!win->useHDC || win->backingStoreEmpty)
{
NSWindow *window = GSWindowWithNumber((int)hwnd);
NSRect r = MSWindowRectToGS(svr, hwnd, rect);
/*
NSLog(@"Invalidated window %d %@ (%d, %d, %d, %d)", hwnd,
NSStringFromRect(r), rect.left, rect.top, rect.right, rect.bottom);
*/
/* Repaint the windows's client area */
[[[window contentView] superview] setNeedsDisplayInRect: r];
// FIXME: We should never do a direct draw call here!
[[[window contentView] superview] displayIfNeeded];
win->backingStoreEmpty = NO;
}
if (win->useHDC)
{
HDC hdc = GetDC((HWND)hwnd);
@ -47,22 +64,10 @@ invalidateWindow(WIN32Server *svr, HWND hwnd, RECT rect)
win->hdc, rect.left, rect.top, SRCCOPY);
if (!result)
{
NSLog(@"validateWindow failed %d", GetLastError());
}
NSLog(@"validateWindow failed %d", GetLastError());
}
ReleaseDC((HWND)hwnd, hdc);
}
else
{
NSWindow *window = GSWindowWithNumber((int)hwnd);
NSRect r = MSWindowRectToGS(svr, (HWND)hwnd, rect);
/*
NSLog(@"Invalidated window %d %@ (%d, %d, %d, %d)", hwnd,
NSStringFromRect(r), rect.left, rect.top, rect.right, rect.bottom);
*/
// Repaint the window's client area.
[[[window contentView] superview] setNeedsDisplayInRect: r];
}
}
@implementation WIN32Server (w32_windowdisplay)
@ -204,34 +209,28 @@ invalidateWindow(WIN32Server *svr, HWND hwnd, RECT rect)
- (void) decodeWM_PAINTParams: (WPARAM)wParam : (LPARAM)lParam : (HWND)hwnd
{
// reused from original author (added debug code)
RECT rect;
//LPPAINTSTRUCT lpPaint;
//HDC theHdc;
PAINTSTRUCT pPaint;
/*BOOL InvalidateRect(
HWND hWnd, // handle to window
CONST RECT* lpRect, // rectangle coordinates
BOOL bErase // erase state
);*/
//theHdc=BeginPaint(hwnd, lpPaint);
//if (flags.HOLD_PAINT_FOR_SIZING==FALSE)
// {
if (GetUpdateRect(hwnd, &rect, NO))
{
//InvalidateRect(hwnd, rect, YES);
/* FK:
I am not sure if calling BeginPaint/EndPaint here is the best
way to handle updates. These functions correspond more closely
to the lockFocus/unlockFocus methods and should rather be used there.
//InvalidateRect(hwnd, rect, YES);
// validate the whole window, for in some cases an infinite series
// of WM_PAINT is triggered
//ValidateRect(hwnd, NULL);
*/
if (GetUpdateRect(hwnd, &rect, TRUE))
{
BeginPaint(hwnd, &pPaint);
// Perform drawing (or blitting into buffer if needed)
invalidateWindow(self, hwnd, rect);
// validate the whole window, for in some cases an infinite series
// of WM_PAINT is triggered
ValidateRect(hwnd, NULL);
EndPaint(hwnd, &pPaint);
}
// }
flags._eventHandled=YES;
//flags.HOLD_PAINT_FOR_SIZING=FALSE;
//printf("WM_PAINT\n");
flags._eventHandled = YES;
}
- (void) decodeWM_SYNCPAINTParams: (WPARAM)wParam : (LPARAM)lParam : (HWND)hwnd
@ -258,7 +257,6 @@ invalidateWindow(WIN32Server *svr, HWND hwnd, RECT rect)
- (void) resizeBackingStoreFor: (HWND)hwnd
{
// reused from original author (added debug code)
RECT r;
WIN_INTERN *win = (WIN_INTERN *)GetWindowLong((HWND)hwnd, GWL_USERDATA);
@ -283,6 +281,9 @@ invalidateWindow(WIN32Server *svr, HWND hwnd, RECT rect)
win->hdc = hdc2;
ReleaseDC((HWND)hwnd, hdc);
// After resizing the backing store, we need to redraw the window
win->backingStoreEmpty = YES;
}
}