Commit b9ac96e5 authored by Elliot Lee's avatar Elliot Lee

Handle GDK_INCLUDE_INFERIORS subwindow_mode.



Handle GDK_INCLUDE_INFERIORS subwindow_mode.

Call gobject finalize routine in gdk_gc_finalize.

Unrememberable etcs.
parent bc3f1cfc
...@@ -209,6 +209,9 @@ gdk_fb_clip_region(GdkDrawable *drawable, GdkGC *gc, gboolean do_clipping, gbool ...@@ -209,6 +209,9 @@ gdk_fb_clip_region(GdkDrawable *drawable, GdkGC *gc, gboolean do_clipping, gbool
if(skipit) if(skipit)
return real_clip_region; return real_clip_region;
if(gc && GDK_GC_FBDATA(gc)->values.subwindow_mode == GDK_INCLUDE_INFERIORS)
do_children = FALSE;
if(do_clipping && GDK_IS_WINDOW(GDK_DRAWABLE_FBDATA(drawable)->wrapper) && GDK_WINDOW_P(GDK_DRAWABLE_P(drawable)->wrapper)->mapped && !GDK_WINDOW_P(GDK_DRAWABLE_FBDATA(drawable)->wrapper)->input_only) if(do_clipping && GDK_IS_WINDOW(GDK_DRAWABLE_FBDATA(drawable)->wrapper) && GDK_WINDOW_P(GDK_DRAWABLE_P(drawable)->wrapper)->mapped && !GDK_WINDOW_P(GDK_DRAWABLE_FBDATA(drawable)->wrapper)->input_only)
{ {
GdkWindow *parentwin, *lastwin; GdkWindow *parentwin, *lastwin;
......
...@@ -100,6 +100,8 @@ gdk_fb_gc_finalize (GObject *obj) ...@@ -100,6 +100,8 @@ gdk_fb_gc_finalize (GObject *obj)
gdk_pixmap_unref(GDK_GC_FBDATA (gc)->values.stipple); gdk_pixmap_unref(GDK_GC_FBDATA (gc)->values.stipple);
if (GDK_GC_FBDATA (gc)->values.tile) if (GDK_GC_FBDATA (gc)->values.tile)
gdk_pixmap_unref(GDK_GC_FBDATA (gc)->values.tile); gdk_pixmap_unref(GDK_GC_FBDATA (gc)->values.tile);
G_OBJECT_CLASS (parent_class)->finalize (obj);
} }
static void static void
......
...@@ -922,7 +922,7 @@ keyboard_get_state(Keyboard *k) ...@@ -922,7 +922,7 @@ keyboard_get_state(Keyboard *k)
return retval; return retval;
} }
static GdkWindow * GdkWindow *
gdk_window_find_focus(void) gdk_window_find_focus(void)
{ {
if(_gdk_fb_keyboard_grab_window) if(_gdk_fb_keyboard_grab_window)
......
...@@ -472,6 +472,7 @@ pango_fb_font_get_glyph_info(PangoFont *font, PangoGlyph glyph) ...@@ -472,6 +472,7 @@ pango_fb_font_get_glyph_info(PangoFont *font, PangoGlyph glyph)
FT_GlyphSlot g; FT_GlyphSlot g;
PangoRectangle *my_logical_rect, *my_ink_rect; PangoRectangle *my_logical_rect, *my_ink_rect;
FT_Face ftf; FT_Face ftf;
gboolean free_buffer = FALSE;
ftf = fbf->ftf; ftf = fbf->ftf;
...@@ -506,6 +507,7 @@ pango_fb_font_get_glyph_info(PangoFont *font, PangoGlyph glyph) ...@@ -506,6 +507,7 @@ pango_fb_font_get_glyph_info(PangoFont *font, PangoGlyph glyph)
g_error("Glyph render failed"); g_error("Glyph render failed");
renderme = &bgy->bitmap; renderme = &bgy->bitmap;
free_buffer = TRUE;
} }
else else
renderme = &g->bitmap; renderme = &g->bitmap;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment