Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync to work

Browse Source
This commit is contained in:
Havoc Pennington
2000-05-17 04:39:56 +00:00
parent e0a5ea778c
commit 1545f2fac3
10 changed files with 250 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/gdk.c
View File

@@ -334,8 +334,8 @@ gdk_init_check (int *argc,
gdk_events_init ();
gdk_visual_init ();
gdk_window_init ();
gdk_image_init ();
gdk_windowing_window_init ();
gdk_windowing_image_init ();
gdk_input_init ();
gdk_dnd_init ();

17
gdk/gdkdraw.c
View File

@@ -141,6 +141,23 @@ gdk_drawable_get_depth (GdkDrawable *drawable)
return GDK_DRAWABLE_GET_CLASS (drawable)->get_depth (drawable);
}
void
gdk_drawable_set_colormap (GdkDrawable *drawable,
GdkColormap *cmap)
{
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
GDK_DRAWABLE_GET_CLASS (drawable)->set_colormap (drawable, cmap);
}
GdkColormap*
gdk_drawable_get_colormap (GdkDrawable *drawable)
{
g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
return GDK_DRAWABLE_GET_CLASS (drawable)->get_colormap (drawable);
}
GdkDrawable*
gdk_drawable_ref (GdkDrawable *drawable)
{

4
gdk/gdkinternals.h
View File

@@ -212,11 +212,11 @@ void _gdk_windowing_window_destroy (GdkWindow *window,
* Initialization and exit routines *
************************************/
void gdk_window_init (void);
void gdk_windowing_window_init (void);
void gdk_visual_init (void);
void gdk_dnd_init (void);
void gdk_image_init (void);
void gdk_windowing_image_init (void);
void gdk_image_exit (void);
void gdk_input_init (void);

25
gdk/gdkwindow.c
View File

@@ -193,8 +193,25 @@ static void
gdk_window_finalize (GObject *object)
{
GdkWindow *window = GDK_WINDOW (object);
GdkWindowObject *obj = (GdkWindowObject *) object;
if (!GDK_WINDOW_DESTROYED (window))
{
if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
{
g_warning ("losing last reference to undestroyed window\n");
_gdk_window_destroy (window, FALSE);
}
else
/* We use TRUE here, to keep us from actually calling
* XDestroyWindow() on the window
*/
_gdk_window_destroy (window, TRUE);
}
g_object_unref (G_OBJECT (obj->impl));
obj->impl = NULL;
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -1296,6 +1313,9 @@ gdk_window_set_colormap (GdkDrawable *drawable,
{
g_return_if_fail (GDK_IS_WINDOW (drawable));
if (GDK_WINDOW_DESTROYED (drawable))
return;
gdk_drawable_set_colormap (GDK_WINDOW (drawable)->impl, cmap);
}
@@ -1304,6 +1324,9 @@ gdk_window_get_colormap (GdkDrawable *drawable)
{
g_return_val_if_fail (GDK_IS_WINDOW (drawable), NULL);
if (GDK_WINDOW_DESTROYED (drawable))
return NULL;
return gdk_drawable_get_colormap (GDK_WINDOW (drawable)->impl);
}

3
gdk/gdkwindow.h
View File

@@ -167,8 +167,7 @@ struct _GdkWindowObject
gint width;
gint height;
/* GdkColormap *colormap; */
GdkWindowObject *parent;
gint x;
gint y;

226
gdk/x11/gdkdrawable-x11.c
View File

@@ -26,8 +26,6 @@
#include "gdkprivate-x11.h"
static void gdk_x11_drawable_destroy (GdkDrawable *drawable);
static void gdk_x11_draw_rectangle (GdkDrawable *drawable,
GdkGC *gc,
gint filled,
@@ -85,6 +83,11 @@ static void gdk_x11_draw_lines (GdkDrawable *drawable,
GdkPoint *points,
gint npoints);
static void gdk_x11_set_colormap (GdkDrawable *drawable,
GdkColormap *colormap);
static GdkColormap* gdk_x11_get_colormap (GdkDrawable *drawable);
static void gdk_drawable_impl_init (GdkDrawableImpl *drawable);
static void gdk_drawable_impl_class_init (GdkDrawableImplClass *klass);
static void gdk_drawable_impl_finalize (GObject *object);
@@ -130,10 +133,25 @@ static void
gdk_drawable_impl_class_init (GdkDrawableImplClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GdkDrawableClass *drawable_class = GDK_DRAWABLE_CLASS (klass);
parent_class = g_type_class_peek (GDK_TYPE_DRAWABLE);
object_class->finalize = gdk_drawable_impl_finalize;
drawable_class->create_gc = _gdk_x11_gc_new;
drawable_class->draw_rectangle = gdk_x11_draw_rectangle;
drawable_class->draw_arc = gdk_x11_draw_arc;
drawable_class->draw_polygon = gdk_x11_draw_polygon;
drawable_class->draw_text = gdk_x11_draw_text;
drawable_class->draw_text_wc = gdk_x11_draw_text_wc;
drawable_class->draw_drawable = gdk_x11_draw_drawable;
drawable_class->draw_points = gdk_x11_draw_points;
drawable_class->draw_segments = gdk_x11_draw_segments;
drawable_class->draw_lines = gdk_x11_draw_lines;
drawable_class->set_colormap = gdk_x11_set_colormap;
drawable_class->get_colormap = gdk_x11_get_colormap;
}
static void
@@ -145,94 +163,45 @@ gdk_drawable_impl_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object);
}
GdkDrawableClass _gdk_x11_drawable_class = {
gdk_x11_drawable_destroy,
_gdk_x11_gc_new,
gdk_x11_draw_rectangle,
gdk_x11_draw_arc,
gdk_x11_draw_polygon,
gdk_x11_draw_text,
gdk_x11_draw_text_wc,
gdk_x11_draw_drawable,
gdk_x11_draw_points,
gdk_x11_draw_segments,
gdk_x11_draw_lines
};
/*****************************************************
* X11 specific implementations of generic functions *
*****************************************************/
GdkColormap*
gdk_drawable_get_colormap (GdkDrawable *drawable)
static GdkColormap*
gdk_x11_get_colormap (GdkDrawable *drawable)
{
GdkDrawablePrivate *drawable_private;
XWindowAttributes window_attributes;
g_return_val_if_fail (drawable != NULL, NULL);
drawable_private = (GdkDrawablePrivate*) drawable;
if (!GDK_DRAWABLE_DESTROYED (drawable))
{
if (drawable_private->colormap == NULL &&
GDK_IS_WINDOW (drawable))
{
XGetWindowAttributes (GDK_DRAWABLE_XDISPLAY (drawable),
GDK_DRAWABLE_XID (drawable),
&window_attributes);
drawable_private->colormap = gdk_colormap_lookup (window_attributes.colormap);
}
GdkDrawableImpl *impl;
return drawable_private->colormap;
}
return NULL;
g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL (drawable), NULL);
impl = GDK_DRAWABLE_IMPL (drawable);
return impl->colormap;
}
void
gdk_drawable_set_colormap (GdkDrawable *drawable,
GdkColormap *colormap)
static void
gdk_x11_set_colormap (GdkDrawable *drawable,
GdkColormap *colormap)
{
GdkDrawablePrivate *drawable_private;
GdkColormapPrivateX *colormap_private;
GdkDrawableImpl *impl;
g_return_if_fail (drawable != NULL);
g_return_if_fail (GDK_IS_DRAWABLE_IMPL (drawable));
g_return_if_fail (colormap != NULL);
drawable_private = (GdkDrawablePrivate *)drawable;
colormap_private = (GdkColormapPrivateX *)colormap;
impl = GDK_DRAWABLE_IMPL (drawable);
if (impl->colormap == colormap)
return;
if (!GDK_DRAWABLE_DESTROYED (drawable))
{
if (GDK_IS_WINDOW (drawable))
{
g_return_if_fail (colormap_private->base.visual !=
((GdkColormapPrivate *)(drawable_private->colormap))->visual);
XSetWindowColormap (GDK_DRAWABLE_XDISPLAY (drawable),
GDK_DRAWABLE_XID (drawable),
colormap_private->xcolormap);
}
if (drawable_private->colormap)
gdk_colormap_unref (drawable_private->colormap);
drawable_private->colormap = colormap;
gdk_colormap_ref (drawable_private->colormap);
if (GDK_IS_WINDOW (drawable) &&
drawable_private->window_type != GDK_WINDOW_TOPLEVEL)
gdk_window_add_colormap_windows (drawable);
}
if (impl->colormap)
gdk_colormap_unref (impl->colormap);
impl->colormap = colormap;
if (impl->colormap)
gdk_colormap_ref (impl->colormap);
}
/* Drawing
*/
static void
gdk_x11_drawable_destroy (GdkDrawable *drawable)
{
}
static void
gdk_x11_draw_rectangle (GdkDrawable *drawable,
@@ -243,11 +212,17 @@ gdk_x11_draw_rectangle (GdkDrawable *drawable,
gint width,
gint height)
{
GdkDrawableImpl *impl;
g_return_if_fail (GDK_IS_DRAWABLE_IMPL (drawable));
impl = GDK_DRAWABLE_IMPL (drawable);
if (filled)
XFillRectangle (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XFillRectangle (impl->xdisplay, impl->xid,
GDK_GC_GET_XGC (gc), x, y, width, height);
else
XDrawRectangle (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XDrawRectangle (impl->xdisplay, impl->xid,
GDK_GC_GET_XGC (gc), x, y, width, height);
}
@@ -262,11 +237,18 @@ gdk_x11_draw_arc (GdkDrawable *drawable,
gint angle1,
gint angle2)
{
GdkDrawableImpl *impl;
g_return_if_fail (GDK_IS_DRAWABLE_IMPL (drawable));
impl = GDK_DRAWABLE_IMPL (drawable);
if (filled)
XFillArc (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XFillArc (impl->xdisplay, impl->xid,
GDK_GC_GET_XGC (gc), x, y, width, height, angle1, angle2);
else
XDrawArc (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XDrawArc (impl->xdisplay, impl->xid,
GDK_GC_GET_XGC (gc), x, y, width, height, angle1, angle2);
}
@@ -279,7 +261,13 @@ gdk_x11_draw_polygon (GdkDrawable *drawable,
{
XPoint *tmp_points;
gint tmp_npoints, i;
GdkDrawableImpl *impl;
g_return_if_fail (GDK_IS_DRAWABLE_IMPL (drawable));
impl = GDK_DRAWABLE_IMPL (drawable);
if (!filled &&
(points[0].x != points[npoints-1].x || points[0].y != points[npoints-1].y))
{
@@ -301,10 +289,10 @@ gdk_x11_draw_polygon (GdkDrawable *drawable,
}
if (filled)
XFillPolygon (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XFillPolygon (impl->xdisplay, impl->xid,
GDK_GC_GET_XGC (gc), tmp_points, tmp_npoints, Complex, CoordModeOrigin);
else
XDrawLines (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XDrawLines (impl->xdisplay, impl->xid,
GDK_GC_GET_XGC (gc), tmp_points, tmp_npoints, CoordModeOrigin);
g_free (tmp_points);
@@ -325,25 +313,31 @@ gdk_x11_draw_text (GdkDrawable *drawable,
const gchar *text,
gint text_length)
{
GdkDrawableImpl *impl;
g_return_if_fail (GDK_IS_DRAWABLE_IMPL (drawable));
impl = GDK_DRAWABLE_IMPL (drawable);
if (font->type == GDK_FONT_FONT)
{
XFontStruct *xfont = (XFontStruct *) GDK_FONT_XFONT (font);
XSetFont(GDK_DRAWABLE_XDISPLAY (drawable), GDK_GC_GET_XGC (gc), xfont->fid);
XSetFont(impl->xdisplay, GDK_GC_GET_XGC (gc), xfont->fid);
if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0))
{
XDrawString (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XDrawString (impl->xdisplay, impl->xid,
GDK_GC_GET_XGC (gc), x, y, text, text_length);
}
else
{
XDrawString16 (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XDrawString16 (impl->xdisplay, impl->xid,
GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
}
}
else if (font->type == GDK_FONT_FONTSET)
{
XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
XmbDrawString (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XmbDrawString (impl->xdisplay, impl->xid,
fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
}
else
@@ -359,15 +353,21 @@ gdk_x11_draw_text_wc (GdkDrawable *drawable,
const GdkWChar *text,
gint text_length)
{
GdkDrawableImpl *impl;
g_return_if_fail (GDK_IS_DRAWABLE_IMPL (drawable));
impl = GDK_DRAWABLE_IMPL (drawable);
if (font->type == GDK_FONT_FONT)
{
XFontStruct *xfont = (XFontStruct *) GDK_FONT_XFONT (font);
gchar *text_8bit;
gint i;
XSetFont(GDK_DRAWABLE_XDISPLAY (drawable), GDK_GC_GET_XGC (gc), xfont->fid);
XSetFont(impl->xdisplay, GDK_GC_GET_XGC (gc), xfont->fid);
text_8bit = g_new (gchar, text_length);
for (i=0; i<text_length; i++) text_8bit[i] = text[i];
XDrawString (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XDrawString (impl->xdisplay, impl->xid,
GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
g_free (text_8bit);
}
@@ -375,7 +375,7 @@ gdk_x11_draw_text_wc (GdkDrawable *drawable,
{
if (sizeof(GdkWChar) == sizeof(wchar_t))
{
XwcDrawString (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XwcDrawString (impl->xdisplay, impl->xid,
(XFontSet) GDK_FONT_XFONT (font),
GDK_GC_GET_XGC (gc), x, y, (wchar_t *)text, text_length);
}
@@ -385,7 +385,7 @@ gdk_x11_draw_text_wc (GdkDrawable *drawable,
gint i;
text_wchar = g_new (wchar_t, text_length);
for (i=0; i<text_length; i++) text_wchar[i] = text[i];
XwcDrawString (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XwcDrawString (impl->xdisplay, impl->xid,
(XFontSet) GDK_FONT_XFONT (font),
GDK_GC_GET_XGC (gc), x, y, text_wchar, text_length);
g_free (text_wchar);
@@ -408,12 +408,18 @@ gdk_x11_draw_drawable (GdkDrawable *drawable,
{
int src_depth = gdk_drawable_get_depth (src);
int dest_depth = gdk_drawable_get_depth (drawable);
GdkDrawableImpl *impl;
g_return_if_fail (GDK_IS_DRAWABLE_IMPL (drawable));
impl = GDK_DRAWABLE_IMPL (drawable);
if (src_depth == 1)
{
XCopyArea (GDK_DRAWABLE_XDISPLAY (drawable),
XCopyArea (impl->xdisplay,
GDK_DRAWABLE_XID (src),
GDK_DRAWABLE_XID (drawable),
impl->xid,
GDK_GC_GET_XGC (gc),
xsrc, ysrc,
width, height,
@@ -421,9 +427,9 @@ gdk_x11_draw_drawable (GdkDrawable *drawable,
}
else if (dest_depth != 0 && src_depth == dest_depth)
{
XCopyArea (GDK_DRAWABLE_XDISPLAY (drawable),
XCopyArea (impl->xdisplay,
GDK_DRAWABLE_XID (src),
GDK_DRAWABLE_XID (drawable),
impl->xid,
GDK_GC_GET_XGC (gc),
xsrc, ysrc,
width, height,
@@ -439,13 +445,20 @@ gdk_x11_draw_points (GdkDrawable *drawable,
GdkPoint *points,
gint npoints)
{
GdkDrawableImpl *impl;
g_return_if_fail (GDK_IS_DRAWABLE_IMPL (drawable));
impl = GDK_DRAWABLE_IMPL (drawable);
/* We special-case npoints == 1, because X will merge multiple
* consecutive XDrawPoint requests into a PolyPoint request
*/
if (npoints == 1)
{
XDrawPoint (GDK_DRAWABLE_XDISPLAY (drawable),
GDK_DRAWABLE_XID (drawable),
XDrawPoint (impl->xdisplay,
impl->xid,
GDK_GC_GET_XGC (gc),
points[0].x, points[0].y);
}
@@ -460,8 +473,8 @@ gdk_x11_draw_points (GdkDrawable *drawable,
tmp_points[i].y = points[i].y;
}
XDrawPoints (GDK_DRAWABLE_XDISPLAY (drawable),
GDK_DRAWABLE_XID (drawable),
XDrawPoints (impl->xdisplay,
impl->xid,
GDK_GC_GET_XGC (gc),
tmp_points,
npoints,
@@ -477,12 +490,19 @@ gdk_x11_draw_segments (GdkDrawable *drawable,
GdkSegment *segs,
gint nsegs)
{
GdkDrawableImpl *impl;
g_return_if_fail (GDK_IS_DRAWABLE_IMPL (drawable));
impl = GDK_DRAWABLE_IMPL (drawable);
/* We special-case nsegs == 1, because X will merge multiple
* consecutive XDrawLine requests into a PolySegment request
*/
if (nsegs == 1)
{
XDrawLine (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
XDrawLine (impl->xdisplay, impl->xid,
GDK_GC_GET_XGC (gc), segs[0].x1, segs[0].y1,
segs[0].x2, segs[0].y2);
}
@@ -499,8 +519,8 @@ gdk_x11_draw_segments (GdkDrawable *drawable,
tmp_segs[i].y2 = segs[i].y2;
}
XDrawSegments (GDK_DRAWABLE_XDISPLAY (drawable),
GDK_DRAWABLE_XID (drawable),
XDrawSegments (impl->xdisplay,
impl->xid,
GDK_GC_GET_XGC (gc),
tmp_segs, nsegs);
@@ -516,15 +536,21 @@ gdk_x11_draw_lines (GdkDrawable *drawable,
{
gint i;
XPoint *tmp_points = g_new (XPoint, npoints);
GdkDrawableImpl *impl;
g_return_if_fail (GDK_IS_DRAWABLE_IMPL (drawable));
impl = GDK_DRAWABLE_IMPL (drawable);
for (i=0; i<npoints; i++)
{
tmp_points[i].x = points[i].x;
tmp_points[i].y = points[i].y;
}
XDrawLines (GDK_DRAWABLE_XDISPLAY (drawable),
GDK_DRAWABLE_XID (drawable),
XDrawLines (impl->xdisplay,
impl->xid,
GDK_GC_GET_XGC (gc),
tmp_points, npoints,
CoordModeOrigin);

6
gdk/x11/gdkdrawable-x11.h
View File

@@ -50,6 +50,12 @@ struct _GdkDrawableImpl
{
GdkDrawable parent_instance;
GdkDrawable *wrapper;
GdkColormap *colormap;
Window xid;
Display *xdisplay;
};
struct _GdkDrawableImplClass

109
gdk/x11/gdkwindow-x11.c
View File

@@ -79,7 +79,9 @@ static void gdk_window_set_static_win_gravity (GdkWindow *window,
gboolean on);
static gboolean gdk_window_have_shape_ext (void);
static GdkColormap* gdk_window_impl_get_colormap (GdkDrawable *drawable);
static void gdk_window_impl_set_colormap (GdkDrawable *drawable,
GdkColormap *cmap);
static void gdk_window_impl_init (GdkWindowImpl *window);
static void gdk_window_impl_class_init (GdkWindowImplClass *klass);
static void gdk_window_impl_finalize (GObject *object);
@@ -125,72 +127,91 @@ static void
gdk_window_impl_class_init (GdkWindowImplClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GdkDrawableClass *drawable_class = GDK_DRAWABLE_CLASS (klass);
parent_class = g_type_class_peek (GDK_TYPE_DRAWABLE_IMPL);
object_class->finalize = gdk_window_impl_finalize;
drawable_class->set_colormap = gdk_window_impl_set_colormap;
drawable_class->get_colormap = gdk_window_impl_get_colormap;
}
static void
gdk_window_impl_finalize (GObject *object)
{
GdkWindowImpl *impl = GDK_WINDOW_IMPL (object);
GdkWindowObject *wrapper;
GdkDrawableImpl *draw_impl;
GdkWindowImpl *window_impl;
g_return_if_fail (GDK_IS_WINDOW_IMPL (drawable));
drawable_impl = GDK_DRAWABLE_IMPL (drawable);
window_impl = GDK_WINDOW_IMPL (drawable);
wrapper = (GdkWindowObject*) GDK_DRAWABLE_IMPL (drawable)->wrapper;
if (!GDK_WINDOW_DESTROYED (wrapper))
{
gdk_xid_table_remove (drawable_impl->xid);
}
G_OBJECT_CLASS (parent_class)->finalize (object);
}
GdkDrawableClass _gdk_windowing_window_class;
static GdkColormap*
gdk_window_impl_get_colormap (GdkDrawable *drawable)
{
GdkDrawableImpl *drawable_impl;
GdkWindowImpl *window_impl;
g_return_val_if_fail (GDK_IS_WINDOW_IMPL (drawable), NULL);
drawable_impl = GDK_DRAWABLE_IMPL (drawable);
window_impl = GDK_WINDOW_IMPL (drawable);
if (drawable_impl->colormap == NULL)
{
XWindowAttributes window_attributes;
XGetWindowAttributes (drawable_impl->xdisplay,
drawable_impl->xid,
&window_attributes);
drawable_impl->colormap =
gdk_colormap_lookup (window_attributes.colormap);
}
return drawable_impl->colormap;
}
static void
gdk_x11_window_destroy (GdkDrawable *drawable)
gdk_window_impl_set_colormap (GdkDrawable *drawable,
GdkColormap *cmap)
{
if (!GDK_DRAWABLE_DESTROYED (drawable))
{
if (GDK_DRAWABLE_TYPE (drawable) != GDK_WINDOW_FOREIGN)
{
g_warning ("losing last reference to undestroyed window\n");
_gdk_window_destroy (drawable, FALSE);
}
else
/* We use TRUE here, to keep us from actually calling
* XDestroyWindow() on the window
*/
_gdk_window_destroy (drawable, TRUE);
gdk_xid_table_remove (GDK_DRAWABLE_XID (drawable));
}
g_free (GDK_DRAWABLE_XDATA (drawable));
}
static GdkWindow *
gdk_x11_window_alloc (void)
{
GdkWindow *window;
GdkWindowPrivate *private;
GdkWindowImpl *impl;
GdkDrawableImpl *draw_impl;
static gboolean initialized = FALSE;
g_return_if_fail (GDK_IS_WINDOW_IMPL (drawable));
g_return_if_fail (gdk_colormap_get_visual (cmap) != gdk_drawable_get_visual (drawable));
if (!initialized)
{
initialized = TRUE;
impl = GDK_WINDOW_IMPL (drawable);
draw_impl = GDK_DRAWABLE_IMPL (drawable);
_gdk_windowing_window_class = _gdk_x11_drawable_class;
_gdk_windowing_window_class.destroy = gdk_x11_window_destroy;
}
GDK_DRAWABLE_IMPL_GET_CLASS (draw_impl)->set_colormap (drawable, cmap);
XSetWindowColormap (draw_impl->xdisplay,
draw_impl->xid,
GDK_COLORMAP_XCOLORMAP (cmap));
window = _gdk_window_alloc ();
private = (GdkWindowPrivate *)window;
private->drawable.klass = &_gdk_window_class;
private->drawable.klass_data = g_new (GdkWindowXData, 1);
return window;
if (((GdkWindowObject*)draw_impl->wrapper)->window_type !=
GDK_WINDOW_TOPLEVEL)
gdk_window_add_colormap_windows (GDK_WINDOW (draw_impl->wrapper));
}
/********************* Continue here *********************/
void
gdk_window_init (void)
gdk_windowing_window_init (void)
{
GdkWindowPrivate *private;
XWindowAttributes xattributes;

1
gdk/x11/gdkwindow-x11.h
View File

@@ -50,6 +50,7 @@ struct _GdkWindowImpl
{
GdkDrawableImpl parent_instance;
GdkXPositionInfo position_info;
};
struct _GdkWindowImplClass

23
gdk/x11/gdkx.h
View File

@@ -34,8 +34,6 @@
#include <X11/Xutil.h>
typedef struct _GdkGCXData GdkGCXData;
typedef struct _GdkDrawableXData GdkDrawableXData;
typedef struct _GdkWindowXData GdkWindowXData;
typedef struct _GdkXPositionInfo GdkXPositionInfo;
typedef struct _GdkColormapPrivateX GdkColormapPrivateX;
typedef struct _GdkCursorPrivate GdkCursorPrivate;
@@ -47,7 +45,6 @@ typedef struct _GdkVisualPrivate GdkVisualPrivate;
typedef struct _GdkICPrivate GdkICPrivate;
#endif /* USE_XIM */
#define GDK_DRAWABLE_XDATA(win) ((GdkDrawableXData *)(((GdkDrawablePrivate*)(win))->klass_data))
#define GDK_WINDOW_XDATA(win) ((GdkWindowXData *)(((GdkDrawablePrivate*)(win))->klass_data))
#define GDK_GC_XDATA(gc) ((GdkGCXData *)(((GdkGCPrivate*)(gc))->klass_data))
@@ -59,12 +56,6 @@ struct _GdkGCXData
guint dirty_mask;
};
struct _GdkDrawableXData
{
Window xid;
Display *xdisplay;
};
struct _GdkXPositionInfo
{
gint x;
@@ -80,12 +71,6 @@ struct _GdkXPositionInfo
GdkRectangle clip_rect; /* visible rectangle of window */
};
struct _GdkWindowXData
{
GdkDrawableXData drawable_data;
GdkXPositionInfo position_info;
};
struct _GdkCursorPrivate
{
GdkCursor cursor;
@@ -147,8 +132,12 @@ struct _GdkICPrivate
#define GDK_ROOT_WINDOW() gdk_root_window
#define GDK_ROOT_PARENT() ((GdkWindow *)gdk_parent_root)
#define GDK_DISPLAY() gdk_display
#define GDK_DRAWABLE_XDISPLAY(win) (GDK_DRAWABLE_XDATA(win)->xdisplay)
#define GDK_DRAWABLE_XID(win) (GDK_DRAWABLE_XDATA(win)->xid)
#define GDK_WINDOW_XDISPLAY(win) (GDK_DRAWABLE_IMPL(((GdkWindowObject*)win)->impl)->xdisplay)
#define GDK_WINDOW_XID(win) (GDK_DRAWABLE_IMPL(((GdkWindowObject*)win)->impl)->xid)
#define GDK_PIXMAP_XDISPLAY(win) (GDK_DRAWABLE_IMPL(((GdkPixmapObject*)win)->impl)->xdisplay)
#define GDK_PIXMAP_XID(win) (GDK_DRAWABLE_IMPL(((GdkPixmapObject*)win)->impl)->xid)
#define GDK_DRAWABLE_XDISPLAY(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_XDISPLAY (win) : GDK_PIXMAP_XDISPLAY (win))
#define GDK_DRAWABLE_XID(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_XID (win) : GDK_PIXMAP_XID (win))
#define GDK_IMAGE_XDISPLAY(image) (((GdkImagePrivate*) image)->xdisplay)
#define GDK_IMAGE_XIMAGE(image) (((GdkImagePrivate*) image)->ximage)
#define GDK_GC_XDISPLAY(gc) (GDK_GC_XDATA(gc)->xdisplay)