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

Hack to get drawing on non-retained windows working.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@25529 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2007-10-18 16:51:56 +00:00
parent 18f790a690
commit 8d37c37008
4 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-10-18 Fred Kiefer <FredKiefer@gmx.de>
* Source/cairo/CairoContext.m,
* Source/cairo/CairoGState.m: Format cleanup.
* Source/cairo/XGCairoXImageSurface.m (-initWithDevice:): Use
XGCairoSurface when a NSBackingStoreNonretained type window is used.
2007-10-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XGServerWindow.m (-placewindow:): Change window to be

6
Source/cairo/CairoContext.m
View file

@ -73,19 +73,19 @@
}
/* Private backend methods */
+(void) handleExposeRect: (NSRect)rect forDriver: (void *)driver
+ (void) handleExposeRect: (NSRect)rect forDriver: (void *)driver
{
[(XWindowBuffer *)driver _exposeRect: rect];
}
#ifdef XSHM
+(void) _gotShmCompletion: (Drawable)d
+ (void) _gotShmCompletion: (Drawable)d
{
[XWindowBuffer _gotShmCompletion: d];
}
-(void) gotShmCompletion: (Drawable)d
- (void) gotShmCompletion: (Drawable)d
{
[XWindowBuffer _gotShmCompletion: d];
}

28
Source/cairo/CairoGState.m
View file

@ -103,7 +103,7 @@
status = cairo_status(copy->_ct);
if (status != CAIRO_STATUS_SUCCESS)
{
NSLog(@"Cairo status %s in copy", cairo_status_to_string(status));
NSLog(@"Cairo status '%s' in copy", cairo_status_to_string(status));
_ct = NULL;
}
else
@ -118,7 +118,7 @@
status = cairo_status(copy->_ct);
if (status != CAIRO_STATUS_SUCCESS)
{
NSLog(@"Cairo status %s in set matrix", cairo_status_to_string(status));
NSLog(@"Cairo status '%s' in set matrix", cairo_status_to_string(status));
}
cpath = cairo_copy_path(_ct);
@ -131,7 +131,7 @@
old path had no elements.
At least in cairo 1.4.10 (See file cairo-path.c, line 379).
*/
// NSLog(@"Cairo status %s in copy path", cairo_status_to_string(status));
// NSLog(@"Cairo status '%s' in copy path", cairo_status_to_string(status));
}
else
{
@ -167,7 +167,7 @@
status = clip_rects->status;
if (status != CAIRO_STATUS_SUCCESS)
{
NSLog(@"Cairo status %s in copy clip", cairo_status_to_string(status));
NSLog(@"Cairo status '%s' in copy clip", cairo_status_to_string(status));
}
else
{
@ -362,8 +362,8 @@
cairo_transform(_ct, &local_matrix);
[(CairoFontInfo *)font drawGlyphs: glyphs
length: length
on: _ct];
length: length
on: _ct];
cairo_restore(_ct);
}
}
@ -391,7 +391,7 @@
status = cairo_status(_ct);
if (status != CAIRO_STATUS_SUCCESS)
{
NSLog(@"Cairo status %s in DPSinitgraphics", cairo_status_to_string(status));
NSLog(@"Cairo status '%s' in DPSinitgraphics", cairo_status_to_string(status));
_ct = NULL;
return;
}
@ -696,7 +696,7 @@
{
[self _setPath:YES];
cairo_clip(_ct);
}
}
}
- (void) DPSeoclip
@ -807,7 +807,7 @@
status = cairo_surface_status(isurface);
if (status != CAIRO_STATUS_SUCCESS)
{
NSLog(@"Cairo status %s in GSReadRect", cairo_status_to_string(status));
NSLog(@"Cairo status '%s' in GSReadRect", cairo_status_to_string(status));
return nil;
}
@ -815,7 +815,7 @@
status = cairo_status(ct);
if (status != CAIRO_STATUS_SUCCESS)
{
NSLog(@"Cairo status %s in GSReadRect", cairo_status_to_string(status));
NSLog(@"Cairo status '%s' in GSReadRect", cairo_status_to_string(status));
cairo_surface_destroy(isurface);
return nil;
}
@ -1030,7 +1030,7 @@ _set_op(cairo_t *ct, NSCompositingOperation op)
status = cairo_surface_status(surface);
if (status != CAIRO_STATUS_SUCCESS)
{
NSLog(@"Cairo status %s in DPSimage", cairo_status_to_string(status));
NSLog(@"Cairo status '%s' in DPSimage", cairo_status_to_string(status));
if (tmp)
{
objc_free(tmp);
@ -1154,13 +1154,13 @@ _set_op(cairo_t *ct, NSCompositingOperation op)
if (!NSIsEmptyRect(NSIntersectionRect(aRect, targetRect)))
{
copyOnSelf = YES;
copyOnSelf = YES;
}
}
cairo_save(_ct);
if (copyOnSelf) cairo_push_group (_ct);
if (copyOnSelf) cairo_push_group(_ct);
cairo_new_path(_ct);
_set_op(_ct, op);
@ -1217,7 +1217,7 @@ _set_op(cairo_t *ct, NSCompositingOperation op)
if (copyOnSelf)
{
cairo_pop_group_to_source (_ct);
cairo_pop_group_to_source(_ct);
cairo_paint(_ct);
}

9
Source/cairo/XGCairoXImageSurface.m
View file

@ -25,6 +25,7 @@
#include "x11/XGServerWindow.h"
#include "x11/XWindowBuffer.h"
#include "cairo/XGCairoXImageSurface.h"
#include "cairo/XGCairoSurface.h"
#define GSWINDEVICE ((gswindow_device_t *)gsDevice)
@ -35,6 +36,14 @@
struct XWindowBuffer_depth_info_s di;
gsDevice = device;
if (GSWINDEVICE->type == NSBackingStoreNonretained)
{
// FIXME: This is a hack to get non-reatined backing store working.
// I see no reason, why it isn't working, as the code is identical
// to the one in the art backend.
RELEASE(self);
return [[XGCairoSurface alloc] initWithDevice: device];
}
di.drawing_depth = GSWINDEVICE->depth;
// FIXME: The next four lines may be wrong for depth <> 32.