term_header=gtkutil.h
fi
+
+HAVE_XWIDGETS=no
+HAVE_WEBKIT=no
+HAVE_GIR=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
+# - 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
+
+ GIR_REQUIRED=1.32.1
+ GIR_MODULES="gobject-introspection-1.0 >= $GIR_REQUIRED"
+ PKG_CHECK_MODULES(GIR, $GIR_MODULES, HAVE_GIR=yes, HAVE_GIR=no)
+ if test $HAVE_GIR = yes; then
+ AC_DEFINE(HAVE_GIR, 1, [Define to 1 if you have GIR support.])
+ fi
+
+
+fi
+
+ CFLAGS=$OLD_CFLAGS
+ LIBS=$OLD_LIBS
dnl D-Bus has been tested under GNU/Linux only. Must be adapted for
dnl other platforms.
(let ((key "--no-desktop"))
(when (member key command-line-args)
(setq command-line-args (delete key command-line-args))
- (setq desktop-save-mode nil)))
+ (desktop-save-mode 0)))
(when desktop-save-mode
(desktop-read)
- (desktop-auto-save-set-timer)
(setq inhibit-startup-screen t))))
-;; So we can restore vc-dir buffers.
-(autoload 'vc-dir-mode "vc-dir" nil t)
-
(provide 'desktop)
;;; desktop.el ends here
(interactive (browse-url-interactive-arg "URL: "))
(unless (called-interactively-p 'interactive)
(setq args (or args (list browse-url-new-window-flag))))
+ (setq url (url-tidy url))
+ (when (and url-handler-mode (not (file-name-absolute-p url)))
+ (setq url (expand-file-name url)))
(let ((process-environment (copy-sequence process-environment))
(function (or (and (string-match "\\`mailto:" url)
browse-url-mailto-function)
##
## FIXME? MYCPPFLAGS only referenced in etc/DEBUG.
ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \
- -I$(lib) -I$(srcdir)/../lib \
+ -I$(lib) -I$(srcdir)/../lib $(C_HEAP_SWITCH) \
$(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
$(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
- $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) \
+ $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
+ $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \
+ $(WEBKIT_CFLAGS) $(CLUTTER_CFLAGS) $(GIR_CFLAGS) \
$(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
$(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
$(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) \
LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
$(LIBX_OTHER) $(LIBSOUND) \
$(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \
+ $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \
$(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
- $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) \
+ $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) $(XFIXES_LIBS) \
$(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
$(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
$(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
#include "keymap.h"
#include "frame.h"
+#ifdef HAVE_XWIDGETS
+#include "xwidget.h"
+#endif /* HAVE_XWIDGETS */
+ #ifdef WINDOWSNT
+ #include "w32heap.h" /* for mmap_* */
+ #endif
struct buffer *current_buffer; /* The current buffer. */
struct {
Lisp_Object object;
} stretch;
+#ifdef HAVE_XWIDGETS
+ /* method == GET_FROM_XWIDGET */
+ struct {
+ Lisp_Object object;
+ struct xwidget* xwidget;
+ } xwidget;
+#endif
} u;
- /* current text and display positions. */
+ /* Current text and display positions. */
struct text_pos position;
struct display_pos current;
Lisp_Object from_overlay;
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
#include <config.h>
- #define DISPEXTERN_INLINE EXTERN_INLINE
-
#include "sysstdio.h"
#include <unistd.h>
break;
}
+#ifdef HAVE_XWIDGETS
+ //currently this is needed to detect xwidget movement reliably. or probably not.
+ //printf("scrolling_window\n");
+ return 0;
+#endif
+
/* Give up if some rows in the desired matrix are not enabled. */
- if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
+ if (! MATRIX_ROW_ENABLED_P (desired_matrix, i))
return -1;
first_old = first_new = i;
strout (XSUBR (obj)->symbol_name, -1, -1, printcharfun);
PRINTCHAR ('>');
}
+#ifdef HAVE_XWIDGETS
+ else if (XWIDGETP (obj))
+ {
+ strout ("#<xwidget ", -1, -1, printcharfun);
+ PRINTCHAR ('>');
+ }
+ else if (XWIDGET_VIEW_P (obj))
+ {
+ strout ("#<xwidget-view ", -1, -1, printcharfun);
+ PRINTCHAR ('>');
+ }
+#endif
else if (WINDOWP (obj))
{
- void *ptr = XWINDOW (obj);
- int len = sprintf (buf, "#<window %p", ptr);
+ int len;
+ strout ("#<window ", -1, -1, printcharfun);
+ len = sprintf (buf, "%d", XWINDOW (obj)->sequence_number);
strout (buf, len, len, printcharfun);
if (BUFFERP (XWINDOW (obj)->contents))
{
/* Block input. */
block_input ();
+#ifdef HAVE_XWIDGETS
+ xwidget_view_delete_all_in_window(w);
+#endif
window_resize_apply (p, horflag);
-
/* If this window is referred to by the dpyinfo's mouse
highlight, invalidate that slot to be safe (Bug#9904). */
if (!FRAME_INITIAL_P (f))
+++ /dev/null
--This is a bare-bones readme file for the multi-file package.
+++ /dev/null
--(1
-- (simple-single .
-- [(1 4)
-- nil "A single-file package with no dependencies" single])
-- (simple-depend .
-- [(1 0)
-- ((simple-single (1 3))) "A single-file package with a dependency." single])
-- (new-pkg .
-- [(1 0)
-- nil "A package only seen after "updating" archive-contents" single])
-- (multi-file .
-- [(0 2 3)
-- nil "Example of a multi-file tar package" tar]))
+++ /dev/null
--;;; new-pkg.el --- A package only seen after "updating" archive-contents
--
--;; Author: J. R. Hacker <jrh@example.com>
--;; Version: 1.0
--
--;;; Commentary:
--
--;; This will only show up after updating "archive-contents".
--
--;;; Code:
--
--(defun new-pkg-frob ()
-- "Ignore me."
-- (ignore))
--
--(provide 'new-pkg)
--
--;;; new-pkg.el ends here
+++ /dev/null
--;;; simple-single.el --- A single-file package with no dependencies
--
--;; Author: J. R. Hacker <jrh@example.com>
--;; Version: 1.4
--;; Keywords: frobnicate
--
--;;; Commentary:
--
--;; This package provides a minor mode to frobnicate and/or bifurcate
--;; any flanges you desire. To activate it, type "C-M-r M-3 butterfly"
--;; and all your dreams will come true.
--;;
--;; This is a new, updated version.
--
--;;; Code:
--
--(defgroup simple-single nil "Simply a file"
-- :group 'lisp)
--
--(defcustom simple-single-super-sunday nil
-- "How great is this?
--Default changed to `nil'."
-- :type 'boolean
-- :group 'simple-single
-- :package-version "1.4")
--
--(defvar simple-single-sudo-sandwich nil
-- "Make a sandwich?")
--
--;;;###autoload
--(define-minor-mode simple-single-mode
-- "It does good things to stuff")
--
--(provide 'simple-single)
--
--;;; simple-single.el ends here
+++ /dev/null
--;;; simple-depend.el --- A single-file package with a dependency.
--
--;; Author: J. R. Hacker <jrh@example.com>
--;; Version: 1.0
--;; Keywords: frobnicate
--;; Package-Requires: ((simple-single "1.3"))
--
--;;; Commentary:
--
--;; Depends on another package.
--
--;;; Code:
--
--(defvar simple-depend "Value"
-- "Some trivial code")
--
--;;; simple-depend.el ends here
+++ /dev/null
--This package provides a minor mode to frobnicate and/or bifurcate
--any flanges you desire. To activate it, type "C-M-r M-3 butterfly"
--and all your dreams will come true.
projects / emacs.git / commitdiff