Mercurial > hg > xemacs-beta
view lisp/gtk-ffi.el @ 4916:a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* configure:
* configure.ac (TAB):
USE_XFT* -> HAVE_XFT*.
lwlib/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* lwlib-colors.c:
* lwlib-colors.h:
* lwlib-fonts.c:
* lwlib-fonts.h:
* xlwmenu.c:
* xlwmenu.c (xlwMenuResources):
* xlwmenu.c (x_xft_text_width):
* xlwmenu.c (label_button_draw):
* xlwmenu.c (push_button_size):
* xlwmenu.c (push_button_draw):
* xlwmenu.c (make_drawing_gcs):
* xlwmenu.c (extract_font_extents):
* xlwmenu.c (default_font_of_font_list):
* xlwmenu.c (XlwMenuInitialize):
* xlwmenu.c (XlwMenuDestroy):
* xlwmenu.c (XlwMenuSetValues):
* xlwmenuP.h:
* xlwmenuP.h (_XlwMenu_part):
* xlwtabs.c:
* xlwtabs.c (TabsInit):
* xlwtabs.c (TabsDestroy):
* xlwtabs.c (TabsSetValues):
* xlwtabs.c (DrawTab):
* xlwtabs.c (TabWidth):
* xlwtabs.c (TabsAllocFgGC):
* xlwtabs.c (TabsAllocGreyGC):
* xlwtabsP.h:
USE_XFT* -> HAVE_XFT*.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* Makefile.in.in:
* compiler.h:
* config.h.in:
* console-x-impl.h:
* console-x-impl.h (struct x_frame):
* console-x-impl.h (FRAME_X_TOTALLY_VISIBLE_P):
* console-x.h:
* console-xlike-inc.h:
* emacs.c (main_1):
* faces.c (complex_vars_of_faces):
* font-mgr.h:
* frame-x.c (x_delete_frame):
* frame-x.c (x_update_frame_external_traits):
* glyphs-x.c (update_widget_face):
* inline.c:
* objects-x-impl.h:
* objects-x-impl.h (struct x_color_instance_data):
* objects-x-impl.h (struct x_font_instance_data):
* objects-x.c:
* objects-x.c (x_initialize_color_instance):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_print_font_instance):
* objects-x.c (x_finalize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (vars_of_objects_x):
* objects-x.h:
USE_XFT* -> HAVE_XFT*. But in objects-xlike-inc.c and
redisplay-xlike-inc.c, continue to use USE_XFT, and define
it appropriately in console-xlike-inc.h when both HAVE_XFT
and THIS_IS_X -- even if HAVE_XFT, we don't want to enable
XFT code when included in a *-gtk.c file.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 22:00:29 -0600 |
parents | 0784d089fdc9 |
children | 3889ef128488 308d34e9f07d |
line wrap: on
line source
;;; gtk-ffi.el --- Foreign function interface for the GTK object system ;; Copyright (C) 2000 Free Software Foundation ;; Maintainer: William Perry <wmperry@gnu.org> ;; Keywords: extensions, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Not in FSF ;;; Commentary: ;; This file is dumped with XEmacs. (defvar gtk-type-aliases '((GtkType . guint) (GdkAtom . gulong) (GdkBitmap . GdkWindow) (time_t . guint) (none . void) (GdkDrawable . GdkWindow) (GdkBitmap . GdkWindow) (GdkPixmap . GdkWindow)) "An assoc list of aliases for commonly used GTK types that are not really part of the object system.") (defvar gtk-ffi-debug nil "If non-nil, all functions defined wiht `gtk-import-function' will be checked for missing marshallers.") (defun gtk-ffi-check-function (func) ;; We don't call gtk-main or gtk-main-quit because it thoroughly ;; hoses us (locks up xemacs handling events, but no lisp). (if (not (memq func '(gtk-main gtk-main-quit))) (condition-case err (funcall func) (error (case (car err) (wrong-number-of-arguments nil) (error (if (string= "Could not locate marshaller function" (nth 1 err)) (progn (set-buffer (get-buffer-create "needed marshallers")) (display-buffer (current-buffer)) (goto-char (point-max)) (insert (format "%S\n" (split-string (substring (nth 2 err) (length "emacs_gtk_marshal_")) "_+"))))))))))) (defmacro gtk-import-function (retval name &rest args) (if (symbolp name) (setq name (symbol-name name))) (let ((lisp-name (intern (replace-in-string name "_" "-"))) (doc-string nil)) (setq retval (or (cdr-safe (assoc retval gtk-type-aliases)) retval) doc-string (concat "The lisp version of " name ".\n" (if args (concat "Prototype: " (prin1-to-string args))))) ;; Drop off any naming of arguments, etc. (if (and args (consp (car args))) (setq args (mapcar 'car args))) ;; Get rid of any type aliases. (setq args (mapcar (lambda (x) (or (cdr-safe (assoc x gtk-type-aliases)) x)) args)) `(progn (defun ,lisp-name (&rest args) ,doc-string (if (not (get (quote ,lisp-name) 'gtk-ffi nil)) (put (quote ,lisp-name) 'gtk-ffi (gtk-import-function-internal (quote ,retval) ,name (quote ,args)))) (gtk-call-function (get (quote ,lisp-name) 'gtk-ffi 'ignore) args)) (and gtk-ffi-debug (gtk-ffi-check-function (quote ,lisp-name)))))) (defmacro gtk-import-variable (type name) (if (symbolp name) (setq name (symbol-name name))) (let ((lisp-name (intern (replace-in-string name "_" "-"))) (doc-string nil)) (setq type (or (cdr-safe (assoc type gtk-type-aliases)) type) doc-string (concat "Retrieve the variable " name " (type: " (symbol-name type) ").\n")) `(defun ,lisp-name () ,doc-string (gtk-import-variable-internal (quote ,type) ,name)))) (provide 'gtk-ffi)