gtk+ r19749 - in trunk: . docs gdk/linux-fb gtk

[mitch svn gnome org]

Author: mitch
Date: Tue Mar 11 17:14:00 2008
New Revision: 19749
URL: http://svn.gnome.org/viewvc/gtk+?rev=19749&view=rev

Log:
2008-03-11  Michael Natterer  <mitch imendio com>

	* gdk/linux-fb/*: removed linux-fb backend files.

	* acconfig.h
	* config.h.win32.in
	* docs/README.linux-fb
	* gtk/Makefile.am: remove remaining traces of linux-fb.

	* gtk/gtkwindow-decorate.c: same here. There is some code that
	calls into linux-fb to set window move/resize callbacks. I put it
	in #if 0 as a reminder because we did use decorated windows with
	the DirectFB backend and it did work, so I don't really know why
	this code is needed or how it could work with DirectFB back then.
	The file does actually compile now if DECORATE_WINDOWS is defined,
	but I didn't test with DirectFB to check if it does anything.



Removed:
   trunk/docs/README.linux-fb
   trunk/gdk/linux-fb/
Modified:
   trunk/ChangeLog
   trunk/acconfig.h
   trunk/config.h.win32.in
   trunk/gtk/Makefile.am
   trunk/gtk/gtkwindow-decorate.c

Modified: trunk/acconfig.h
==============================================================================
--- trunk/acconfig.h	(original)
+++ trunk/acconfig.h	Tue Mar 11 17:14:00 2008
@@ -52,12 +52,6 @@
 /* Define to use XKB extension */
 #undef HAVE_XKB
 
-/* Define to use shadowfb in the linux-fb port */
-#undef ENABLE_SHADOW_FB
-
-/* Define to use a fb manager in the linux-fb port */
-#undef ENABLE_FB_MANAGER
-
 #undef XINPUT_NONE
 #undef XINPUT_GXI
 #undef XINPUT_XFREE

Modified: trunk/config.h.win32.in
==============================================================================
--- trunk/config.h.win32.in	(original)
+++ trunk/config.h.win32.in	Tue Mar 11 17:14:00 2008
@@ -57,12 +57,6 @@
 /* Define to use XKB extension */
 /* #undef HAVE_XKB */
 
-/* Define to use shadowfb in the linux-fb port */
-/* #undef ENABLE_SHADOW_FB */
-
-/* Define to use a fb manager in the linux-fb port */
-/* #undef ENABLE_FB_MANAGER */
-
 /* #undef XINPUT_NONE */
 /* #undef XINPUT_GXI */
 /* #undef XINPUT_XFREE */

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Tue Mar 11 17:14:00 2008
@@ -847,19 +847,16 @@
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
 libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources)
-libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
 
 libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
-libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts)
 libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
 libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
 libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
 
 libgtk_x11_2_0_la_LIBADD = $(libadd)
-libgtk_linux_fb_2_0_la_LIBADD = $(libadd)
 libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
 libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res)
 libgtk_quartz_2_0_la_LIBADD = $(libadd)
@@ -868,7 +865,7 @@
 if USE_WIN32
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
-EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
+EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
 
 install-exec-hook: 
 if DISABLE_EXPLICIT_DEPS

Modified: trunk/gtk/gtkwindow-decorate.c
==============================================================================
--- trunk/gtk/gtkwindow-decorate.c	(original)
+++ trunk/gtk/gtkwindow-decorate.c	Tue Mar 11 17:14:00 2008
@@ -26,15 +26,11 @@
 #include "gtkwindow.h"
 #include "gtkmain.h"
 #include "gtkwindow-decorate.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
-#ifdef GDK_WINDOWING_FB
-#define DECORATE_WINDOWS
-#endif
-
 #ifdef DECORATE_WINDOWS
-#include "linux-fb/gdkfb.h"
 
 typedef enum
 {
@@ -283,7 +279,11 @@
   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,
@@ -292,6 +292,7 @@
   /* 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
 }