Mercurial > hg > xemacs-beta
view lisp/gtk-widget-accessors.el @ 4932:8b63e21b0436
fix compile issues with gcc 4
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* aclocal.m4 (XE_SHLIB_STUFF):
Use -export-all-symbols instead of -export-dynamic on PE targets
(Cygwin and MinGW).
* configure.ac (XE_EXPAND_VARIABLE):
* configure.ac (TAB):
Create variable XEMACS_CC_GPP to check whether we're running g++.
Don't just check for an executable called `g++' -- it might be
called g++-4 or whatever. Instead, check for either named `g++*'
or claiming to be g++ when called with --version. Rewrite code do
use the variable.
Add -fno-strict-aliasing to optimization flags when GCC and
optimized, and in all cases with g++, since under these circumstances
strict aliasing is otherwise assumed, and XEmacs can't easily be
made to respect its restrictions.
* configure: Regenerate.
lib-src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* fakemail.c (args_size):
* fakemail.c (parse_header):
* ootags.c (C_entries):
Fix warnings about possible use of uninitialized vars.
lwlib/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* xlwgauge.c (GaugeResize):
* xlwgauge.c (GaugeSize):
Fix warnings about possible use of uninitialized vars.
modules/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_exec):
* postgresql/postgresql.c (Fpq_get_result):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* chartab.c (decode_char_table_range):
* extents.c (extent_fragment_update):
* objects-msw.c (initialize_font_instance):
* process.c (Fgetenv):
* redisplay-output.c (get_next_display_block):
Fix warnings about possible use of uninitialized vars.
* compiler.h:
* compiler.h (REGISTER):
* event-stream.c (is_scrollbar_event):
* window.c (window_scrollbar_width):
* window.c (window_scrollbar_height):
* window.c (window_left_window_gutter_width):
* window.c (window_right_window_gutter_width):
Add USED_IF_SCROLLBARS. Use it to fix warnings about unused
vars when --with-scrollbars=no.
* config.h.in:
Change comment to explain better why DECLARE_INLINE_HEADER
is needed.
* dialog-msw.c:
* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
* emacs.c (main_1):
* event-msw.c (struct mswin_message_debug):
* event-msw.c (debug_output_mswin_message):
* font-mgr.c:
* font-mgr.c (Ffc_config_filename):
* glyphs-msw.c (struct):
* glyphs-msw.c (bitmap_table):
* glyphs-x.c (update_widget_face):
* intl-win32.c (struct lang_to_string):
* intl-win32.c (lang_to_string_table):
* nas.c:
* objects-xlike-inc.c:
* objects-xlike-inc.c (xft_find_charset_font):
* syswindows.h:
* win32.c (mswindows_output_last_error):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
* lisp.h:
G++ 4.3 needs #include <limits> to avoid errors about min/max.
* lisp.h (disabled_assert_with_message):
Use disabled_assert* whenever asserts are disabled. Rewrite
disabled_assert* to avoid complaints about unused vars by
pretending to use the vars but casting them to (void).
Remove code that defined assert() weirdly if DEBUG_XEMACS but
not USE_ASSERTIONS -- configure sets USE_ASSERTIONS automatically
when DEBUG_XEMACS, and if the user has forced it off, then
so be it.
* lisp.h (SYMBOL_KEYWORD):
Put some of the combined `extern Lisp_Object's back under
the file they are declared in. Cosmetic fix.
* number.h:
Remove `extern Lisp_Object' decls that duplicate lisp.h,
since they have different C vs. C++ linkage.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sun, 24 Jan 2010 22:04:58 -0600 |
parents | db7068430402 |
children | ba07c880114a |
line wrap: on
line source
;; 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., 51 Franklin Street - Fifth Floor, ;; Boston, MA 02111-1301, USA. */ (globally-declare-fboundp '(gtk-fundamental-type)) (require 'gtk-ffi) (defconst GTK_TYPE_INVALID 0) (defconst GTK_TYPE_NONE 1) (defconst GTK_TYPE_CHAR 2) (defconst GTK_TYPE_UCHAR 3) (defconst GTK_TYPE_BOOL 4) (defconst GTK_TYPE_INT 5) (defconst GTK_TYPE_UINT 6) (defconst GTK_TYPE_LONG 7) (defconst GTK_TYPE_ULONG 8) (defconst GTK_TYPE_FLOAT 9) (defconst GTK_TYPE_DOUBLE 10) (defconst GTK_TYPE_STRING 11) (defconst GTK_TYPE_ENUM 12) (defconst GTK_TYPE_FLAGS 13) (defconst GTK_TYPE_BOXED 14) (defconst GTK_TYPE_POINTER 15) (defconst GTK_TYPE_SIGNAL 16) (defconst GTK_TYPE_ARGS 17) (defconst GTK_TYPE_CALLBACK 18) (defconst GTK_TYPE_C_CALLBACK 19) (defconst GTK_TYPE_FOREIGN 20) (defconst GTK_TYPE_OBJECT 21) (defconst gtk-value-accessor-names '("INVALID" "NONE" "CHAR" "UCHAR" "BOOL" "INT" "UINT" "LONG" "ULONG" "FLOAT" "DOUBLE" "STRING" "ENUM" "FLAGS" "BOXED" "POINTER" "SIGNAL" "ARGS" "CALLBACK" "C_CALLBACK" "FOREIGN" "OBJECT")) (defun define-widget-accessors (gtk-class wrapper prefix args) "Output stub C code to access parts of a widget from lisp. GTK-CLASS is the GTK class to grant access to. WRAPPER is a fragment to construct GTK C macros for typechecking/etc. (ie: WIDGET) ARGS is a list of (type . name) cons cells. Defines a whole slew of functions to access & set the slots in the structure." (set-buffer (get-buffer-create "emacs-widget-accessors.c")) (goto-char (point-max)) (let ((arg) (base-arg-type nil) (lisp-func-name nil) (c-func-name nil) (func-names nil)) (setq gtk-class (symbol-name gtk-class) wrapper (upcase wrapper)) (while (setq arg (pop args)) (setq lisp-func-name (format "gtk-%s-%s" prefix (cdr arg)) lisp-func-name (replace-in-string lisp-func-name "_" "-") c-func-name (concat "F" (replace-in-string lisp-func-name "-" "_"))) (insert "DEFUN (\"" lisp-func-name "\", " c-func-name ", 1, 1, 0, /*\n" "Access the `" (symbol-name (cdr arg)) "' slot of OBJ, a " gtk-class " object.\n" "*/\n" "\t(obj))\n" "{\n" (format "\t%s *the_obj = NULL;\n" gtk-class) "\tGtkArg arg;\n" "\n" "\tCHECK_GTK_OBJECT (obj);\n" "\n" (format "\tif (!GTK_IS_%s (XGTK_OBJECT (obj)->object))\n" wrapper) "\t{\n" (format "\t\twtaerror (\"Object is not a %s\", obj);\n" gtk-class) "\t};\n" "\n" (format "\tthe_obj = GTK_%s (XGTK_OBJECT (obj)->object);\n" wrapper) (format "\targ.type = gtk_type_from_name (\"%s\");\n" (symbol-name (car arg)))) ; (format "\targ.type = GTK_TYPE_%s;\n" (or ; (nth (gtk-fundamental-type (car arg)) ; gtk-value-accessor-names) ; (case (car arg) ; (GtkListOfString "STRING_LIST") ; (GtkListOfObject "OBJECT_LIST") ; (otherwise ; "POINTER"))))) (setq base-arg-type (gtk-fundamental-type (car arg))) (cond ((= base-arg-type GTK_TYPE_OBJECT) (insert (format "\tGTK_VALUE_OBJECT (arg) = GTK_OBJECT (the_obj->%s);" (cdr arg)))) ((or (= base-arg-type GTK_TYPE_POINTER) (= base-arg-type GTK_TYPE_BOXED)) (insert (format "\tGTK_VALUE_%s (arg) = (void *)the_obj->%s;" (nth (gtk-fundamental-type (car arg)) gtk-value-accessor-names) (cdr arg)))) (t (insert (format "\tGTK_VALUE_%s (arg) = the_obj->%s;" (or (nth (gtk-fundamental-type (car arg)) gtk-value-accessor-names) "POINTER") (cdr arg))))) (insert "\n" "\treturn (gtk_type_to_lisp (&arg));\n" "}\n\n") (push c-func-name func-names)) func-names)) (defun import-widget-accessors (file syms-function-name &rest description) "Import multiple widgets, and emit a suitable vars_of_foo() function for them.\n" (declare (special c-mode-common-hook c-mode-hook)) (let ((c-mode-common-hook nil) (c-mode-hook nil)) (find-file file)) (erase-buffer) (insert "/* This file was automatically generated by ../lisp/gtk-widget-accessors.el */\n" "/* DO NOT EDIT BY HAND!!! */\n") (let ((c-funcs nil)) (while description (setq c-funcs (nconc (define-widget-accessors (pop description) (pop description) (pop description) (pop description)) c-funcs))) (goto-char (point-max)) (insert "void " syms-function-name " (void)\n" "{\n\t" (mapconcat (lambda (x) (concat "DEFSUBR (" x ");")) c-funcs "\n\t") "\n}")) (save-buffer)) ;; Because the new FFI layer imports GTK types lazily, we need to load ;; up all of the gtk types we know about, or we get errors about ;; unknown GTK types later on. (mapatoms (lambda (sym) (if (string-match "gtk-[^-]+-get-type" (symbol-name sym)) (funcall sym)))) (import-widget-accessors "../src/emacs-widget-accessors.c" "syms_of_widget_accessors " 'GtkAdjustment "ADJUSTMENT" "adjustment" '((gfloat . lower) (gfloat . upper) (gfloat . value) (gfloat . step_increment) (gfloat . page_increment) (gfloat . page_size)) 'GtkWidget "WIDGET" "widget" '((GtkStyle . style) (GdkWindow . window) (GtkStateType . state) (GtkString . name) (GtkWidget . parent)) 'GtkButton "BUTTON" "button" '((GtkWidget . child) (gboolean . in_button) (gboolean . button_down)) 'GtkCombo "COMBO" "combo" '((GtkWidget . entry) (GtkWidget . button) (GtkWidget . popup) (GtkWidget . popwin) (GtkWidget . list)) 'GtkGammaCurve "GAMMA_CURVE" "gamma-curve" '((GtkWidget . table) (GtkWidget . curve) (gfloat . gamma) (GtkWidget . gamma_dialog) (GtkWidget . gamma_text)) 'GtkCheckMenuItem "CHECK_MENU_ITEM" "check-menu-item" '((gboolean . active)) 'GtkNotebook "NOTEBOOK" "notebook" '((GtkPositionType . tab_pos)) 'GtkText "TEXT" "text" '((GtkAdjustment . hadj) (GtkAdjustment . vadj)) 'GtkFileSelection "FILE_SELECTION" "file-selection" '((GtkWidget . dir_list) (GtkWidget . file_list) (GtkWidget . selection_entry) (GtkWidget . selection_text) (GtkWidget . main_vbox) (GtkWidget . ok_button) (GtkWidget . cancel_button) (GtkWidget . help_button) (GtkWidget . action_area)) 'GtkFontSelectionDialog "FONT_SELECTION_DIALOG" "font-selection-dialog" '((GtkWidget . fontsel) (GtkWidget . main_vbox) (GtkWidget . action_area) (GtkWidget . ok_button) (GtkWidget . apply_button) (GtkWidget . cancel_button)) 'GtkColorSelectionDialog "COLOR_SELECTION_DIALOG" "color-selection-dialog" '((GtkWidget . colorsel) (GtkWidget . main_vbox) (GtkWidget . ok_button) (GtkWidget . reset_button) (GtkWidget . cancel_button) (GtkWidget . help_button)) 'GtkDialog "DIALOG" "dialog" '((GtkWidget . vbox) (GtkWidget . action_area)) 'GtkInputDialog "INPUT_DIALOG" "input-dialog" '((GtkWidget . close_button) (GtkWidget . save_button)) 'GtkPlug "PLUG" "plug" '((GdkWindow . socket_window) (gint . same_app)) 'GtkObject "OBJECT" "object" '((guint . flags) (guint . ref_count)) 'GtkPaned "PANED" "paned" '((GtkWidget . child1) (GtkWidget . child2) (gboolean . child1_resize) (gboolean . child2_resize) (gboolean . child1_shrink) (gboolean . child2_shrink)) 'GtkCList "CLIST" "clist" '((gint . rows) (gint . columns) (GtkAdjustment . hadjustment) (GtkAdjustment . vadjustment) (GtkSortType . sort_type) (gint . focus_row) (gint . sort_column)) 'GtkList "LIST" "list" '((GtkListOfObject . children) (GtkListOfObject . selection)) 'GtkTree "TREE" "tree" '((GtkListOfObject . children) (GtkTree . root_tree) (GtkWidget . tree_owner) (GtkListOfObject . selection)) 'GtkTreeItem "TREE_ITEM" "tree-item" '((GtkWidget . subtree)) 'GtkScrolledWindow "SCROLLED_WINDOW" "scrolled-window" '((GtkWidget . hscrollbar) (GtkWidget . vscrollbar) (gboolean . hscrollbar_visible) (gboolean . vscrollbar_visible)) )