GNOME.org
 

[gtk+] directfb: Remove

commit 8856bfc60e23f633fbd3908c43757c627f56b722
Author: Benjamin Otte <otte redhat com>
Date:   Mon Aug 23 12:44:58 2010 +0200

    directfb: Remove
    
    As announced by email and on IRC, this backend is removed from GTK 3.
    It has been broken for over a year with no one fixing it.

 configure.ac                                |   21 +-
 docs/reference/gdk/Makefile.am              |    1 -
 docs/reference/gdk/gdk3-sections.txt        |    1 -
 docs/reference/gtk/Makefile.am              |    1 -
 docs/reference/gtk/building.sgml            |    5 +-
 docs/reference/gtk/directfb.sgml            |   44 -
 docs/reference/gtk/gtk-docs.sgml            |    1 -
 gdk/Makefile.am                             |    8 +-
 gdk/directfb/AUTHORS                        |   28 -
 gdk/directfb/Makefile.am                    |   57 -
 gdk/directfb/README                         |  106 -
 gdk/directfb/TODO                           |   56 -
 gdk/directfb/gdkapplaunchcontext-directfb.c |   42 -
 gdk/directfb/gdkcolor-directfb.c            |  463 -----
 gdk/directfb/gdkcursor-directfb.c           |  546 -----
 gdk/directfb/gdkdirectfb.h                  |   82 -
 gdk/directfb/gdkdisplay-directfb.c          |  540 -----
 gdk/directfb/gdkdisplay-directfb.h          |   59 -
 gdk/directfb/gdkdnd-directfb.c              |  634 ------
 gdk/directfb/gdkdrawable-directfb.c         |  626 ------
 gdk/directfb/gdkevents-directfb.c           |  963 ---------
 gdk/directfb/gdkgeometry-directfb.c         |  254 ---
 gdk/directfb/gdkglobals-directfb.c          |   58 -
 gdk/directfb/gdkim-directfb.c               |   60 -
 gdk/directfb/gdkinput-directfb.c            |  327 ---
 gdk/directfb/gdkinput-directfb.h            |  143 --
 gdk/directfb/gdkkeys-directfb.c             | 2032 -------------------
 gdk/directfb/gdkmain-directfb.c             |  417 ----
 gdk/directfb/gdkpixmap-directfb.c           |  232 ---
 gdk/directfb/gdkprivate-directfb.h          |  381 ----
 gdk/directfb/gdkproperty-directfb.c         |  397 ----
 gdk/directfb/gdkscreen-directfb.c           |  248 ---
 gdk/directfb/gdkselection-directfb.c        |  494 -----
 gdk/directfb/gdkspawn-directfb.c            |  104 -
 gdk/directfb/gdktestutils-directfb.c        |  263 ---
 gdk/directfb/gdkvisual-directfb.c           |  493 -----
 gdk/directfb/gdkwindow-directfb.c           | 2891 ---------------------------
 gdk/directfb/gdkwindowid.c                  |   69 -
 gdk/directfb/x-cursors.xbm                  |  924 ---------
 gdk/gdk.symbols                             |   17 -
 gtk/Makefile.am                             |    6 +-
 gtk/gtkiconfactory.c                        |    4 +-
 gtk/gtkwindow-decorate.c                    |   14 -
 po-properties/POTFILES.in                   |    1 -
 po/POTFILES.in                              |    1 -
 45 files changed, 10 insertions(+), 14104 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2de9818..089bb3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -257,13 +257,13 @@ else
   gdktarget=x11
 fi
 
-AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
+AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz]] select non-default GDK target],
 	gdktarget=$with_gdktarget)
 
 AC_SUBST(gdktarget)
 case $gdktarget in
-  x11|win32|quartz|directfb) ;;
-  *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
+  x11|win32|quartz) ;;
+  *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz or win32.]);;
 esac
 
 gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
@@ -1248,17 +1248,6 @@ else
   AM_CONDITIONAL(USE_QUARTZ, false)
 fi
 
-if test "x$gdktarget" = "xdirectfb"; then
-  DIRECTFB_REQUIRED_VERSION=1.0.0
-  AC_MSG_CHECKING(for DirectFB)
-
-  PKG_CHECK_MODULES(DIRECTFB, [directfb >= $DIRECTFB_REQUIRED_VERSION])
-  AM_CONDITIONAL(USE_DIRECTFB, true)
-else
-  AM_CONDITIONAL(USE_DIRECTFB, false)
-fi
-
-
 # Check for Pango flags
 
 if test "x$gdktarget" = "xwin32"; then
@@ -1652,9 +1641,6 @@ elif test "x$gdktarget" = "xwin32" ; then
 elif test "x$gdktarget" = "xquartz" ; then
   gdk_windowing='
 #define GDK_WINDOWING_QUARTZ'
-elif test "x$gdktarget" = "xdirectfb" ; then
-  gdk_windowing='
-#define GDK_WINDOWING_DIRECTFB'
 fi
 
 if test x$gdk_wchar_h = xyes; then
@@ -1730,7 +1716,6 @@ gdk/win32/Makefile
 gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
-gdk/directfb/Makefile
 gdk/tests/Makefile
 gtk/Makefile
 gtk/makefile.msc
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index d726ac2..3015baa 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -29,7 +29,6 @@ IGNORE_HFILES=			\
 	gdkpoly-generic.h	\
 	keyname-table.h		\
 	win32 			\
-	directfb		\
 	x11			\
 	quartz
 
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index 9f6a878..fe5d5de 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -52,7 +52,6 @@ gdk_error_trap_pop
 GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
 GDK_WINDOWING_QUARTZ
-GDK_WINDOWING_DIRECTFB
 
 <SUBSECTION Standard>
 GDK_TYPE_GRAB_STATUS
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 103e508..6766be8 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -117,7 +117,6 @@ content_files =					\
 	running.sgml				\
 	building.sgml				\
 	compiling.sgml				\
-	directfb.sgml				\
 	drawing-model.xml			\
 	glossary.xml				\
 	migrating-2to3.xml			\
diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index e6a316c..33064e2 100644
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -361,7 +361,7 @@ How to compile GTK+ itself
             <arg>--with-xinput=[no|yes]</arg>
           </group>
           <group>
-            <arg>--with-gdktarget=[x11|win32|quartz|directfb]</arg>
+            <arg>--with-gdktarget=[x11|win32|quartz]</arg>
           </group>
           <group>
             <arg>--disable-introspection</arg>
@@ -551,8 +551,7 @@ How to compile GTK+ itself
           Toggles between the supported backends for GDK.
           The default is x11, unless the platform is Windows, in which
           case the default is win32. Other supported backends are
-          the quartz backend for OS X, and the DirectFB backend
-          for the Linux framebuffer.
+          the quartz backend for OS X.
         </para>
       </formalpara>
       <formalpara>
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 08bc46b..4e97d0b 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -119,7 +119,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <xi:include href="x11.sgml" />
     <xi:include href="windows.sgml" />
     <xi:include href="osx.sgml" />
-    <xi:include href="directfb.sgml" />
     <xi:include href="resources.sgml" />
     <xi:include href="xml/question_index.sgml" />
     <xi:include href="drawing-model.xml" />
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 020f99f..fdd17cd 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -9,7 +9,7 @@ INTROSPECTION_COMPILER_ARGS = \
    --includedir=.
 
 SUBDIRS = $(gdktarget) . tests
-DIST_SUBDIRS = win32 x11 quartz directfb tests
+DIST_SUBDIRS = win32 x11 quartz tests
 
 CLEANFILES =
 
@@ -155,10 +155,6 @@ common_sources = 		\
 	gdkmarshalers.c		\
 	gdkmarshalers.h
 
-libgdk_directfb_3_0_la_SOURCES = $(common_sources)
-libgdk_directfb_3_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS)
-libgdk_directfb_3_0_la_LDFLAGS = $(LDADD)
-
 libgdk_x11_3_0_la_SOURCES = $(common_sources)
 libgdk_x11_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS)
 libgdk_x11_3_0_la_LDFLAGS = $(LDADD)
@@ -286,7 +282,7 @@ endif
 
 lib_LTLIBRARIES = $(gdktargetlib)
 
-EXTRA_LTLIBRARIES = libgdk-x11-3.0.la libgdk-win32-3.0.la libgdk-quartz-3.0.la libgdk-directfb-3.0.la
+EXTRA_LTLIBRARIES = libgdk-x11-3.0.la libgdk-win32-3.0.la libgdk-quartz-3.0.la
 
 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
 EXTRA_DIST += $(gdk_built_sources)
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 27f8f6a..21207fb 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -776,23 +776,6 @@ gdk_keyval_name G_GNUC_CONST
 #endif
 #endif
 
-#if IN_HEADER(__GDK_KEYS_H__)
-#if IN_FILE(__GDK_KEYS_DIRECTFB_C__)
-gdk_keymap_get_direction
-gdk_keymap_get_entries_for_keycode
-gdk_keymap_get_entries_for_keyval
-gdk_keymap_get_for_display
-gdk_keymap_get_caps_lock_state
-gdk_keymap_get_num_lock_state
-gdk_keymap_lookup_key
-gdk_keymap_translate_keyboard_state
-gdk_keymap_add_virtual_modifiers
-gdk_keymap_map_virtual_modifiers
-gdk_keyval_from_name
-gdk_keyval_name G_GNUC_CONST
-#endif
-#endif
-
 #if IN_HEADER(__GDK_VISUAL_H__)
 #if IN_FILE(__GDK_VISUAL_C__)
 gdk_list_visuals
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index a1ab693..353765e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -821,27 +821,23 @@ gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 libgtk_x11_3_0_la_SOURCES = $(gtk_c_sources)
 libgtk_win32_3_0_la_SOURCES = $(gtk_c_sources)
 libgtk_quartz_3_0_la_SOURCES = $(gtk_c_sources)
-libgtk_directfb_3_0_la_SOURCES = $(gtk_c_sources)
 
 libgtk_x11_3_0_la_LDFLAGS = $(libtool_opts)
 libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
 libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts)
-libgtk_directfb_3_0_la_LDFLAGS = $(libtool_opts)
 
 libgtk_x11_3_0_la_LIBADD = $(libadd)
 libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
 libgtk_quartz_3_0_la_LIBADD = $(libadd)
-libgtk_directfb_3_0_la_LIBADD = $(libadd)
 
 libgtk_x11_3_0_la_DEPENDENCIES = $(deps)
 libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
 libgtk_quartz_3_0_la_DEPENDENCIES = $(deps)
-libgtk_directfb_3_0_la_DEPENDENCIES = $(deps)
 
 if USE_WIN32
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
-EXTRA_LTLIBRARIES = libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la libgtk-directfb-3.0.la
+EXTRA_LTLIBRARIES = libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 450c921..c872f5a 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -1462,8 +1462,8 @@ render_icon_name_pixbuf (GtkIconSource    *icon_source,
       names[2] = NULL;
 
       info = gtk_icon_theme_choose_icon (icon_theme,
-                                               names,
-                                               pixel_size, GTK_ICON_LOOKUP_USE_BUILTIN);
+                                         (const char **) names,
+                                         pixel_size, GTK_ICON_LOOKUP_USE_BUILTIN);
       g_free (names[0]);
       if (info)
         {
diff --git a/gtk/gtkwindow-decorate.c b/gtk/gtkwindow-decorate.c
index 9aa2dd8..ea14b52 100644
--- a/gtk/gtkwindow-decorate.c
+++ b/gtk/gtkwindow-decorate.c
@@ -278,20 +278,6 @@ gtk_decorated_window_realize (GtkWindow   *window)
   font_desc = pango_font_description_from_string(DECORATION_TITLE_FONT);
   pango_layout_set_font_description (deco->title_layout, font_desc);
   pango_font_description_free (font_desc);
-
-#if 0
-  /* What is this code exactly doing? I remember we were using the
-     decorated windows with the DirectFB port and it did just work,
-     and there was definitely no code in linux-fb involved. */
-  gdk_fb_window_set_child_handler (window->frame,
-				   gtk_decorated_window_inner_change,
-				   gtk_decorated_window_inner_get_pos,
-				   window);
-
-  /* This is a huge hack to make frames have the same shape as
-     the window they wrap */
-  gdk_window_shape_combine_mask (window->frame, GDK_FB_USE_CHILD_SHAPE, 0, 0);
-#endif
 }
 
 
diff --git a/po-properties/POTFILES.in b/po-properties/POTFILES.in
index 22240f0..2610c54 100644
--- a/po-properties/POTFILES.in
+++ b/po-properties/POTFILES.in
@@ -1,6 +1,5 @@
 # Files from the Gtk distribution which have already been
 # marked to allow runtime translation of messages
-gdk/directfb/gdkdisplay-directfb.c
 gdk/gdk.c
 gdk/gdkdisplaymanager.c
 gdk/gdkpango.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0e71fd8..22e05b7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 # Files from the Gtk distribution which have already been
 # marked to allow runtime translation of messages
-gdk/directfb/gdkdisplay-directfb.c
 gdk/gdk.c
 gdk/gdkdevice.c
 gdk/gdkdevicemanager.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]