diff --git a/ChangeLog b/ChangeLog index bf65c85e01..f031d82e21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2000-11-02 Alexander Larsson + + * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c, + gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c, + gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c: + Add last argument to t_type_register_static call. + + * gdk/linux-fb/gdkdrawable-fb2.c: + Add last argument to t_type_register_static call. + export the get_image drawable virtual function. + + * gdk/linux-fb/gdkimage-fb.c: + Add last argument to t_type_register_static call. + rename gtk_image_get to _gdk_fb_get_image and + export it for use by gdkdrawable-fb2. + + * gdk/linux-fb/gdkprivate-fb.h: + export _gdk_fb_get_image. + + * gdk/linux-fb/gdkselection-fb.c: + Add new api call stubs. + + * gtk/Makefile.am: + Missing ( in linux-fb part. + + * modules/linux-fb/Makefile.am: + Must link with gdk_pixbuf or get unresolved symbol. + 2000-11-01 Havoc Pennington * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bf65c85e01..f031d82e21 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,31 @@ +2000-11-02 Alexander Larsson + + * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c, + gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c, + gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c: + Add last argument to t_type_register_static call. + + * gdk/linux-fb/gdkdrawable-fb2.c: + Add last argument to t_type_register_static call. + export the get_image drawable virtual function. + + * gdk/linux-fb/gdkimage-fb.c: + Add last argument to t_type_register_static call. + rename gtk_image_get to _gdk_fb_get_image and + export it for use by gdkdrawable-fb2. + + * gdk/linux-fb/gdkprivate-fb.h: + export _gdk_fb_get_image. + + * gdk/linux-fb/gdkselection-fb.c: + Add new api call stubs. + + * gtk/Makefile.am: + Missing ( in linux-fb part. + + * modules/linux-fb/Makefile.am: + Must link with gdk_pixbuf or get unresolved symbol. + 2000-11-01 Havoc Pennington * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bf65c85e01..f031d82e21 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,31 @@ +2000-11-02 Alexander Larsson + + * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c, + gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c, + gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c: + Add last argument to t_type_register_static call. + + * gdk/linux-fb/gdkdrawable-fb2.c: + Add last argument to t_type_register_static call. + export the get_image drawable virtual function. + + * gdk/linux-fb/gdkimage-fb.c: + Add last argument to t_type_register_static call. + rename gtk_image_get to _gdk_fb_get_image and + export it for use by gdkdrawable-fb2. + + * gdk/linux-fb/gdkprivate-fb.h: + export _gdk_fb_get_image. + + * gdk/linux-fb/gdkselection-fb.c: + Add new api call stubs. + + * gtk/Makefile.am: + Missing ( in linux-fb part. + + * modules/linux-fb/Makefile.am: + Must link with gdk_pixbuf or get unresolved symbol. + 2000-11-01 Havoc Pennington * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bf65c85e01..f031d82e21 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,31 @@ +2000-11-02 Alexander Larsson + + * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c, + gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c, + gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c: + Add last argument to t_type_register_static call. + + * gdk/linux-fb/gdkdrawable-fb2.c: + Add last argument to t_type_register_static call. + export the get_image drawable virtual function. + + * gdk/linux-fb/gdkimage-fb.c: + Add last argument to t_type_register_static call. + rename gtk_image_get to _gdk_fb_get_image and + export it for use by gdkdrawable-fb2. + + * gdk/linux-fb/gdkprivate-fb.h: + export _gdk_fb_get_image. + + * gdk/linux-fb/gdkselection-fb.c: + Add new api call stubs. + + * gtk/Makefile.am: + Missing ( in linux-fb part. + + * modules/linux-fb/Makefile.am: + Must link with gdk_pixbuf or get unresolved symbol. + 2000-11-01 Havoc Pennington * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bf65c85e01..f031d82e21 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,31 @@ +2000-11-02 Alexander Larsson + + * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c, + gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c, + gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c: + Add last argument to t_type_register_static call. + + * gdk/linux-fb/gdkdrawable-fb2.c: + Add last argument to t_type_register_static call. + export the get_image drawable virtual function. + + * gdk/linux-fb/gdkimage-fb.c: + Add last argument to t_type_register_static call. + rename gtk_image_get to _gdk_fb_get_image and + export it for use by gdkdrawable-fb2. + + * gdk/linux-fb/gdkprivate-fb.h: + export _gdk_fb_get_image. + + * gdk/linux-fb/gdkselection-fb.c: + Add new api call stubs. + + * gtk/Makefile.am: + Missing ( in linux-fb part. + + * modules/linux-fb/Makefile.am: + Must link with gdk_pixbuf or get unresolved symbol. + 2000-11-01 Havoc Pennington * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bf65c85e01..f031d82e21 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,31 @@ +2000-11-02 Alexander Larsson + + * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c, + gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c, + gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c: + Add last argument to t_type_register_static call. + + * gdk/linux-fb/gdkdrawable-fb2.c: + Add last argument to t_type_register_static call. + export the get_image drawable virtual function. + + * gdk/linux-fb/gdkimage-fb.c: + Add last argument to t_type_register_static call. + rename gtk_image_get to _gdk_fb_get_image and + export it for use by gdkdrawable-fb2. + + * gdk/linux-fb/gdkprivate-fb.h: + export _gdk_fb_get_image. + + * gdk/linux-fb/gdkselection-fb.c: + Add new api call stubs. + + * gtk/Makefile.am: + Missing ( in linux-fb part. + + * modules/linux-fb/Makefile.am: + Must link with gdk_pixbuf or get unresolved symbol. + 2000-11-01 Havoc Pennington * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bf65c85e01..f031d82e21 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,31 @@ +2000-11-02 Alexander Larsson + + * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c, + gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c, + gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c: + Add last argument to t_type_register_static call. + + * gdk/linux-fb/gdkdrawable-fb2.c: + Add last argument to t_type_register_static call. + export the get_image drawable virtual function. + + * gdk/linux-fb/gdkimage-fb.c: + Add last argument to t_type_register_static call. + rename gtk_image_get to _gdk_fb_get_image and + export it for use by gdkdrawable-fb2. + + * gdk/linux-fb/gdkprivate-fb.h: + export _gdk_fb_get_image. + + * gdk/linux-fb/gdkselection-fb.c: + Add new api call stubs. + + * gtk/Makefile.am: + Missing ( in linux-fb part. + + * modules/linux-fb/Makefile.am: + Must link with gdk_pixbuf or get unresolved symbol. + 2000-11-01 Havoc Pennington * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use diff --git a/gdk/linux-fb/gdkcolor-fb.c b/gdk/linux-fb/gdkcolor-fb.c index 85851a8d79..4ad668696d 100644 --- a/gdk/linux-fb/gdkcolor-fb.c +++ b/gdk/linux-fb/gdkcolor-fb.c @@ -94,7 +94,8 @@ gdk_colormap_get_type (void) object_type = g_type_register_static (G_TYPE_OBJECT, "GdkColormap", - &object_info); + &object_info, + 0); } return object_type; diff --git a/gdk/linux-fb/gdkdnd-fb.c b/gdk/linux-fb/gdkdnd-fb.c index a77fd5c1c0..6d18fe4474 100644 --- a/gdk/linux-fb/gdkdnd-fb.c +++ b/gdk/linux-fb/gdkdnd-fb.c @@ -117,7 +117,8 @@ gdk_drag_context_get_type (void) object_type = g_type_register_static (G_TYPE_OBJECT, "GdkDragContext", - &object_info); + &object_info, + 0); } return object_type; diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c index 413c4ab785..f5aa693f01 100644 --- a/gdk/linux-fb/gdkdrawable-fb2.c +++ b/gdk/linux-fb/gdkdrawable-fb2.c @@ -127,6 +127,8 @@ gdk_drawable_impl_fb_class_init (GdkDrawableFBClass *klass) drawable_class->set_colormap = gdk_fb_set_colormap; drawable_class->get_colormap = gdk_fb_get_colormap; drawable_class->get_size = gdk_fb_get_size; + + drawable_class->get_image = _gdk_fb_get_image; } GType @@ -151,7 +153,8 @@ gdk_drawable_impl_fb_get_type (void) object_type = g_type_register_static (GDK_TYPE_DRAWABLE, "GdkDrawableFB", - &object_info); + &object_info, + 0); } return object_type; diff --git a/gdk/linux-fb/gdkgc-fb.c b/gdk/linux-fb/gdkgc-fb.c index fe55f6d447..b599500ff6 100644 --- a/gdk/linux-fb/gdkgc-fb.c +++ b/gdk/linux-fb/gdkgc-fb.c @@ -60,7 +60,8 @@ GType gdk_gc_fb_get_type (void) object_type = g_type_register_static (GDK_TYPE_GC, "GdkGCFB", - &object_info); + &object_info, + 0); } return object_type; diff --git a/gdk/linux-fb/gdkimage-fb.c b/gdk/linux-fb/gdkimage-fb.c index 717e1896f0..beec927a41 100644 --- a/gdk/linux-fb/gdkimage-fb.c +++ b/gdk/linux-fb/gdkimage-fb.c @@ -97,7 +97,8 @@ gdk_image_get_type (void) object_type = g_type_register_static (G_TYPE_OBJECT, "GdkImage", - &object_info); + &object_info, + 0); } return object_type; @@ -150,11 +151,11 @@ gdk_image_new (GdkImageType type, } GdkImage* -gdk_image_get (GdkWindow *window, - gint x, - gint y, - gint width, - gint height) +_gdk_fb_get_image (GdkWindow *window, + gint x, + gint y, + gint width, + gint height) { GdkImage *image; GdkImagePrivateFB *private; diff --git a/gdk/linux-fb/gdkpango-fb.c b/gdk/linux-fb/gdkpango-fb.c index fba3fcad78..bb5499bf13 100644 --- a/gdk/linux-fb/gdkpango-fb.c +++ b/gdk/linux-fb/gdkpango-fb.c @@ -99,7 +99,8 @@ pango_fb_font_map_get_type(void) object_type = g_type_register_static (PANGO_TYPE_FONT_MAP, "PangoFBFontMap", - &object_info); + &object_info, + 0); } return object_type; @@ -435,7 +436,8 @@ pango_fb_font_get_type (void) object_type = g_type_register_static (PANGO_TYPE_FONT, "PangoFBFont", - &object_info); + &object_info, + 0); } return object_type; diff --git a/gdk/linux-fb/gdkpixmap-fb.c b/gdk/linux-fb/gdkpixmap-fb.c index f441d279fe..368bb02036 100644 --- a/gdk/linux-fb/gdkpixmap-fb.c +++ b/gdk/linux-fb/gdkpixmap-fb.c @@ -104,7 +104,8 @@ _gdk_pixmap_impl_get_type (void) object_type = g_type_register_static (gdk_drawable_impl_fb_get_type(), "GdkPixmapFB", - &object_info); + &object_info, + 0); } return object_type; diff --git a/gdk/linux-fb/gdkprivate-fb.h b/gdk/linux-fb/gdkprivate-fb.h index 2f1a122ef2..1967638aad 100644 --- a/gdk/linux-fb/gdkprivate-fb.h +++ b/gdk/linux-fb/gdkprivate-fb.h @@ -202,7 +202,13 @@ void gdk_window_invalidate_region_clear(GdkWindow *window, GdkRegion *region); void gdk_window_invalidate_rect_clear(GdkWindow *window, GdkRectangle *rect); GdkGC *_gdk_fb_gc_new(GdkDrawable *drawable, GdkGCValues *values, GdkGCValuesMask values_mask); -void gdk_fb_drawable_clear(GdkDrawable *drawable); +GdkImage*_gdk_fb_get_image (GdkWindow *window, + gint x, + gint y, + gint width, + gint height); + +void gdk_fb_drawable_clear (GdkDrawable *drawable); void gdk_fb_draw_drawable (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, diff --git a/gdk/linux-fb/gdkselection-fb.c b/gdk/linux-fb/gdkselection-fb.c index 75a59f48d4..a9a0053e80 100644 --- a/gdk/linux-fb/gdkselection-fb.c +++ b/gdk/linux-fb/gdkselection-fb.c @@ -102,3 +102,71 @@ gdk_string_to_compound_text (const gchar *str, void gdk_free_compound_text (guchar *ctext) { } + +/** + * gdk_utf8_to_string_target: + * @str: a UTF-8 string + * + * Convert an UTF-8 string into the best possible representation + * as a STRING. The representation of characters not in STRING + * is not specified; it may be as pseudo-escape sequences + * \x{ABCD}, or it may be in some other form of approximation. + * + * Return value: the newly allocated string, or %NULL if the + * conversion failed. (It should not fail for + * any properly formed UTF-8 string.) + **/ +gchar * +gdk_utf8_to_string_target (const gchar *str) +{ + return 0; +} + +/** + * gdk_utf8_to_compound_text: + * @str: a UTF-8 string + * @encoding: location to store resulting encoding + * @format: location to store format of the result + * @ctext: location to store the data of the result + * @length: location to store the length of the data + * stored in @ctext + * + * Convert from UTF-8 to compound text. + * + * Return value: %TRUE if the conversion succeeded, otherwise + * false. + **/ +gboolean +gdk_utf8_to_compound_text (const gchar *str, + GdkAtom *encoding, + gint *format, + guchar **ctext, + gint *length) +{ + return 0; +} + +/** + * gdk_text_property_to_utf8_list: + * @encoding: an atom representing the encoding of the text + * @format: the format of the property + * @text: the text to convert + * @length: the length of @text, in bytes + * @list: location to store the list of strings or %NULL. The + * list should be freed with g_strfreev(). + * + * Convert a text property in the giving encoding to + * a list of UTF-8 strings. + * + * Return value: the number of strings in the resulting + * list. + **/ +gint +gdk_text_property_to_utf8_list (GdkAtom encoding, + gint format, + const guchar *text, + gint length, + gchar ***list) +{ + return 0; +} diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c index d0750dbf76..e12c165b3e 100644 --- a/gdk/linux-fb/gdkwindow-fb.c +++ b/gdk/linux-fb/gdkwindow-fb.c @@ -105,7 +105,8 @@ _gdk_window_impl_get_type (void) object_type = g_type_register_static (gdk_drawable_impl_fb_get_type(), "GdkWindowFB", - &object_info); + &object_info, + 0); } return object_type; diff --git a/gtk/Makefile.am b/gtk/Makefile.am index d8fea54f63..23cea4d199 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -494,7 +494,7 @@ libgtk_nanox_1_3_la_SOURCES = $(gtk_target_sources) endif if USE_LINUX_FB libgtk_linux_fb_includedir = $(includedir)/gtk-2.0/gtk -libgtk_linux_fb_include_HEADERS = $gtk_target_headers) +libgtk_linux_fb_include_HEADERS = $(gtk_target_headers) libgtk_linux_fb_1_3_la_SOURCES = $(gtk_target_sources) endif EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-nanox-1.3.la libgtk-linux-fb-1.3.la diff --git a/modules/linux-fb/Makefile.am b/modules/linux-fb/Makefile.am index c6f191fd56..f56f4ba344 100644 --- a/modules/linux-fb/Makefile.am +++ b/modules/linux-fb/Makefile.am @@ -24,7 +24,7 @@ LDFLAGS = @STRIP_BEGIN@ \ fb_basic_la_SOURCES = basic.c fb_basic_la_LDFLAGS = -export-dynamic -avoid-version -module -fb_basic_la_LIBADD = $(PANGO_LIBS) -L$(top_builddir)/gdk/.libs -lgdk-linux-fb-1.3 +fb_basic_la_LIBADD = $(PANGO_LIBS) -L$(top_builddir)/gdk/.libs -lgdk-linux-fb-1.3 -lgdk_pixbuf-1.3 if USE_LINUX_FB