]> code.delx.au - gnu-emacs/commitdiff
upstream i think
authorJoakim Verona <joakim@verona.se>
Wed, 28 Dec 2011 03:12:56 +0000 (04:12 +0100)
committerJoakim Verona <joakim@verona.se>
Wed, 28 Dec 2011 03:12:56 +0000 (04:12 +0100)
1  2 
autogen/configure
configure.in
src/dispextern.h
src/dispnew.c
src/keyboard.c
src/lisp.h
src/window.c
src/xdisp.c
src/xterm.c

Simple merge
diff --cc configure.in
index 5b686e017f6251d8ac4ffc6a137b5f938f172b60,20dbf2b509e869431855fb20fed1ece7231244d3..22cec2822029450d4a085b559119198058caa3b7
@@@ -1992,58 -1993,10 +1995,58 @@@ if test "${HAVE_GTK}" = "yes"; the
    AC_CHECK_FUNCS(gtk_widget_get_window gtk_widget_set_has_window \
                   gtk_dialog_get_action_area gtk_widget_get_sensitive \
                   gtk_widget_get_mapped gtk_adjustment_get_page_size \
-                  gtk_orientable_set_orientation)
+                  gtk_orientable_set_orientation \
+                gtk_window_set_has_resize_grip)
  fi
  
 +
 +HAVE_XWIDGETS=no
 +HAVE_WEBKIT=no
 +HAVE_GOOCANVAS=no
 +HAVE_CLUTTER=no
 +if test "${with_xwidgets}" != "no"; then
 +   echo "xwidgets enabled, checking webkit, and others"
 +   HAVE_XWIDGETS=yes
 +   AC_DEFINE(HAVE_XWIDGETS, 1, [Define to 1 if you have xwidgets support.])        
 +#xwidgets
 +#TODO
 +# - enable only if gtk/gtk3 enabled
 +# - webkit, goocanvas, clutter
 +# - only webkit_osr is good so remove plain webkit laterish
 +
 +#webkit version for gtk3. 
 +  WEBKIT_REQUIRED=1.4.0
 +  WEBKIT_MODULES="webkitgtk-3.0 >= $WEBKIT_REQUIRED"
 +
 +  if test "${with_gtk3}" = "yes"; then
 +    PKG_CHECK_MODULES(WEBKIT, $WEBKIT_MODULES, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
 +    if test $HAVE_WEBKIT = yes; then
 +        AC_DEFINE(HAVE_WEBKIT_OSR, 1, [Define to 1 if you have webkit_osr support.])     
 +    fi
 +  fi
 +
 +  if test "${with_xwdemo}"  = "yes"; then
 +#clutter and goocanvas are just proof of concept so disable for now  
 +  CLUTTER_REQUIRED=1.0.0   
 +  CLUTTER_MODULES="clutter-gtk-1.0 >= $CLUTTER_REQUIRED"
 +
 +  PKG_CHECK_MODULES(CLUTTER, $CLUTTER_MODULES, HAVE_CLUTTER=yes, HAVE_CLUTTER=no)
 +  if test $HAVE_CLUTTER = yes;  then
 +     AC_DEFINE(HAVE_CLUTTER, 1, [Define to 1 if you have clutter support.])
 +  fi
 +
 +
 +  GOOCANVAS_REQUIRED=1.4.0
 +  GOOCANVAS_MODULES="goocanvasgtk-3.0 >= $GOOCANVAS_REQUIRED"
 +
 +  PKG_CHECK_MODULES(GOOCANVAS, $GOOCANVAS_MODULES, HAVE_GOOCANVAS=yes, HAVE_GOOCANVAS=no)
 +  if test $HAVE_GOOCANVAS = yes; then
 +     AC_DEFINE(HAVE_GOOCANVAS, 1, [Define to 1 if you have goocanvas support.])
 +  fi
 +  fi
 +fi
 +
 +
  dnl D-Bus has been tested under GNU/Linux only.  Must be adapted for
  dnl other platforms.  Support for higher D-Bus versions than 1.0 is
  dnl also not configured.
Simple merge
diff --cc src/dispnew.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xterm.c
Simple merge