gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-24 04:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rewrote cairo backend glitz code to fit with changed glitz interface.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@22819 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2006-04-25 22:40:49 +00:00
parent d43e17c67a
commit e6e743663b
3 changed files with 46 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-03-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/cairo/XGCairoGlitzSurface.m
* Headers/cairo/XGCairoGlitzSurface.h:
Rewrote to fit with changed glitz interface.
2006-03-13 Adam Fedor <fedor@gnu.org> 2006-03-13 Adam Fedor <fedor@gnu.org>
* Version 0.10.3 * Version 0.10.3

1
Headers/cairo/XGCairoGlitzSurface.h
View file

@ -27,7 +27,6 @@
#include "x11/XGServerWindow.h" #include "x11/XGServerWindow.h"
#include "cairo/CairoSurface.h" #include "cairo/CairoSurface.h"
#include <glitz.h>
@interface XGCairoGlitzSurface : CairoSurface @interface XGCairoGlitzSurface : CairoSurface
{ {

65
Source/cairo/XGCairoGlitzSurface.m
View file

@ -22,6 +22,8 @@
*/ */
#include "cairo/XGCairoGlitzSurface.h" #include "cairo/XGCairoGlitzSurface.h"
#include <cairo-glitz.h>
#include <glitz-glx.h>
#define GSWINDEVICE ((gswindow_device_t *)gsDevice) #define GSWINDEVICE ((gswindow_device_t *)gsDevice)
@ -29,14 +31,12 @@
- (id) initWithDevice: (void *)device - (id) initWithDevice: (void *)device
{ {
glitz_format_t *format; glitz_drawable_format_t templ;
Colormap cm; glitz_drawable_format_t *dformat = NULL;
XVisualInfo *vi; glitz_drawable_t *drawable = NULL;
unsigned long format_options = GLITZ_FORMAT_OPTION_ONSCREEN_MASK; glitz_format_t *format = NULL;
glitz_surface_t *surface = NULL;
/* FIXME format is ignore when Visual isn't NULL
* Cairo may change this API
*/
gsDevice = device; gsDevice = device;
/* /*
@ -48,41 +48,50 @@
} }
*/ */
format_options |= GLITZ_FORMAT_OPTION_NO_MULTISAMPLE_MASK; templ.doublebuffer = 0;
format_options |= GLITZ_FORMAT_OPTION_SINGLEBUFFER_MASK; dformat = glitz_glx_find_drawable_format(GSWINDEVICE->display,
format = glitz_glx_find_standard_format(GSWINDEVICE->display,
GSWINDEVICE->screen, GSWINDEVICE->screen,
format_options, GLITZ_FORMAT_DOUBLEBUFFER_MASK,
GLITZ_STANDARD_RGB24); &templ,
0);
if (!format) if (!dformat)
{ {
NSLog(@"XGCairoGlitzSurface : %d : no format",__LINE__); NSLog(@"XGCairoGlitzSurface : %d : no format",__LINE__);
exit(1); exit(1);
} }
vi = glitz_glx_get_visual_info_from_format(GSWINDEVICE->display, drawable = glitz_glx_create_drawable_for_window(GSWINDEVICE->display,
GSWINDEVICE->screen, GSWINDEVICE->screen,
format); dformat,
GSWINDEVICE->ident,
if (!vi) GSWINDEVICE->xframe.size.width,
GSWINDEVICE->xframe.size.height);
if (!drawable)
{ {
NSLog(@"XGCairoGlitzSurface : %d : no visual info",__LINE__); NSLog(@"XGCairoGlitzSurface : %d : no glitz drawable", __LINE__);
exit(1); exit(1);
} }
/* format = glitz_find_standard_format(drawable, GLITZ_STANDARD_ARGB32);
cm = XCreateColormap(GSWINDEVICE->display, if (!format)
GSWINDEVICE->root, vi->visual, AllocNone); {
NSLog(@"XGCairoGlitzSurface : %d : couldn't find ARGB32 surface format", __LINE__);
exit(1);
}
XSetWindowColormap(GSWINDEVICE->display,GSWINDEVICE->ident,cm); surface = glitz_surface_create(drawable, format,
*/ GSWINDEVICE->xframe.size.width,
GSWINDEVICE->xframe.size.height,
0, NULL);
if (!surface)
{
NSLog(@"XGCairoGlitzSurface : %d : couldn't create glitz surface", __LINE__);
exit(1);
}
_surface = cairo_glitz_surface_create(glitz_glx_surface_create(GSWINDEVICE->display, glitz_surface_attach(surface, drawable, GLITZ_DRAWABLE_BUFFER_FRONT_COLOR, 0, 0);
GSWINDEVICE->screen, _surface = cairo_glitz_surface_create(surface);
format,
GSWINDEVICE->ident));
return self; return self;
} }