Mercurial > hg > xemacs-beta
annotate lisp/gtk-ffi.el @ 4967:0d4c9d0f6a8d
rewrite dynarr code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_get_resource_prefix):
* device-x.c (Fx_put_resource):
* dialog-msw.c:
* dialog-msw.c (handle_question_dialog_box):
* dired-msw.c (mswindows_sort_files):
* dired-msw.c (mswindows_get_files):
* extents.c (extent_fragment_sort_by_priority):
* extents.c (Fset_extent_parent):
* file-coding.c (coding_reader):
* file-coding.c (coding_writer):
* file-coding.c (gzip_convert):
* frame.c (generate_title_string):
* gutter.c (calculate_gutter_size_from_display_lines):
* indent.c (vmotion_1):
* lread.c (read_bit_vector):
* mule-coding.c (iso2022_decode):
* rangetab.c:
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (unified_range_table_copy_data):
* redisplay-msw.c (mswindows_output_string):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_move_cursor):
* redisplay-output.c (redisplay_clear_bottom_of_window):
* redisplay-tty.c (tty_output_ichar_dynarr):
* redisplay-tty.c (set_foreground_to):
* redisplay-tty.c (set_background_to):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_string):
* redisplay.c (redisplay_text_width_string):
* redisplay.c (create_text_block):
* redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE):
* redisplay.c (generate_fstring_runes):
* redisplay.c (regenerate_modeline):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (real_current_modeline_height):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (point_visible):
* redisplay.c (redisplay_window):
* redisplay.c (mark_glyph_block_dynarr):
* redisplay.c (line_start_cache_start):
* redisplay.c (start_with_line_at_pixpos):
* redisplay.c (update_line_start_cache):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* sysdep.c (qxe_readdir):
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* toolbar-common.c (common_output_toolbar_button):
* window.c (window_modeline_height):
* window.c (Fwindow_last_line_visible_height):
* window.c (window_displayed_height):
* window.c (window_scroll):
* window.c (get_current_pixel_pos):
Use Dynarr_begin() in place of Dynarr_atp (foo, 0).
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_malloc):
* dynarr.c (stack_like_free):
* lisp.h:
* lisp.h (DECLARE_DYNARR_LISP_IMP):
* lisp.h (XD_DYNARR_DESC):
* lisp.h (Dynarr_pop):
* gutter.c (output_gutter):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (redisplay_output_window):
Redo the dynarr code, add greater checks.
Rename the `len', `largest' and `max' members to `len_',
`largest_' and `max_' to try and catch existing places that might
directly modify these values. Make new accessors Dynarr_largest()
and Dynarr_max() and make them and existing Dynarr_length() be
non-lvalues by adding '+ 0' to them; fix a couple of places in the
redisplay code that tried to modify the length directly by setting
Dynarr_length(). Use the accessors whenever possible even in the
dynarr code itself. The accessors also verify that 0 <= len <=
largest <= max. Rename settor function Dynarr_set_size() to
Dynarr_set_length() and use it more consistently; also create
lower-level Dynarr_set_length_1(). This latter function should be
the only function that directly modifies the `len_' member of a
Dynarr, and in the process makes sure that the `largest' value is
kept correct.
Consistently use ERROR_CHECK_STRUCTURES instead of
ERROR_CHECK_TYPES for error-checking code. Reintroduce the
temporarily disabled verification code on the positions of
Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end().
Also create Dynarr_resize_if() in place of a repeated
code fragment. Clean up all the functions that modify Dynarrs to
use the new macros and functions and verify the correctness of the
Dynarr both before and after the change.
Note that there are two kinds of verification -- one for accessing
and one for modifying. The difference is that the modify
verification additionally checks to make sure that the Dynarr
isn't locked. (This is used in redisplay to check for problems
with reentrancy.)
* lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Feb 2010 20:51:18 -0600 |
parents | 0784d089fdc9 |
children | 3889ef128488 308d34e9f07d |
rev | line source |
---|---|
462 | 1 ;;; gtk-ffi.el --- Foreign function interface for the GTK object system |
2 | |
3 ;; Copyright (C) 2000 Free Software Foundation | |
4 | |
5 ;; Maintainer: William Perry <wmperry@gnu.org> | |
6 ;; Keywords: extensions, dumped | |
7 | |
8 ;; This file is part of XEmacs. | |
9 | |
10 ;; XEmacs is free software; you can redistribute it and/or modify it | |
11 ;; under the terms of the GNU General Public License as published by | |
12 ;; the Free Software Foundation; either version 2, or (at your option) | |
13 ;; any later version. | |
14 | |
15 ;; XEmacs is distributed in the hope that it will be useful, but | |
16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
18 ;; General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
23 ;; 02111-1307, USA. | |
24 | |
25 ;;; Synched up with: Not in FSF | |
26 | |
27 ;;; Commentary: | |
28 | |
29 ;; This file is dumped with XEmacs. | |
30 | |
31 (defvar gtk-type-aliases '((GtkType . guint) | |
32 (GdkAtom . gulong) | |
33 (GdkBitmap . GdkWindow) | |
34 (time_t . guint) | |
35 (none . void) | |
36 (GdkDrawable . GdkWindow) | |
37 (GdkBitmap . GdkWindow) | |
38 (GdkPixmap . GdkWindow)) | |
39 "An assoc list of aliases for commonly used GTK types that are not | |
40 really part of the object system.") | |
41 | |
42 (defvar gtk-ffi-debug nil | |
43 "If non-nil, all functions defined wiht `gtk-import-function' will be checked | |
44 for missing marshallers.") | |
45 | |
46 (defun gtk-ffi-check-function (func) | |
47 ;; We don't call gtk-main or gtk-main-quit because it thoroughly | |
48 ;; hoses us (locks up xemacs handling events, but no lisp). | |
49 (if (not (memq func '(gtk-main gtk-main-quit))) | |
50 (condition-case err | |
51 (funcall func) | |
52 (error | |
53 (case (car err) | |
54 (wrong-number-of-arguments nil) | |
55 (error | |
56 (if (string= "Could not locate marshaller function" (nth 1 err)) | |
57 (progn | |
58 (set-buffer (get-buffer-create "needed marshallers")) | |
59 (display-buffer (current-buffer)) | |
60 (goto-char (point-max)) | |
61 (insert | |
62 (format "%S\n" | |
63 (split-string | |
64 (substring (nth 2 err) (length "emacs_gtk_marshal_")) "_+"))))))))))) | |
65 | |
66 (defmacro gtk-import-function (retval name &rest args) | |
67 (if (symbolp name) | |
68 (setq name (symbol-name name))) | |
69 (let ((lisp-name (intern (replace-in-string name "_" "-"))) | |
70 (doc-string nil)) | |
71 (setq retval (or (cdr-safe (assoc retval gtk-type-aliases)) retval) | |
72 doc-string (concat "The lisp version of " name ".\n" | |
73 (if args | |
74 (concat "Prototype: " (prin1-to-string args))))) | |
75 | |
76 ;; Drop off any naming of arguments, etc. | |
77 (if (and args (consp (car args))) | |
78 (setq args (mapcar 'car args))) | |
79 | |
80 ;; Get rid of any type aliases. | |
81 (setq args (mapcar (lambda (x) | |
82 (or (cdr-safe (assoc x gtk-type-aliases)) x)) args)) | |
83 | |
84 `(progn | |
85 (defun ,lisp-name (&rest args) | |
86 ,doc-string | |
87 (if (not (get (quote ,lisp-name) 'gtk-ffi nil)) | |
88 (put (quote ,lisp-name) 'gtk-ffi | |
89 (gtk-import-function-internal (quote ,retval) ,name | |
90 (quote ,args)))) | |
91 (gtk-call-function (get (quote ,lisp-name) 'gtk-ffi 'ignore) args)) | |
92 (and gtk-ffi-debug (gtk-ffi-check-function (quote ,lisp-name)))))) | |
93 | |
94 (defmacro gtk-import-variable (type name) | |
95 (if (symbolp name) (setq name (symbol-name name))) | |
96 (let ((lisp-name (intern (replace-in-string name "_" "-"))) | |
97 (doc-string nil)) | |
98 (setq type (or (cdr-safe (assoc type gtk-type-aliases)) type) | |
99 doc-string (concat "Retrieve the variable " name " (type: " (symbol-name type) ").\n")) | |
100 `(defun ,lisp-name () | |
101 ,doc-string | |
102 (gtk-import-variable-internal (quote ,type) ,name)))) | |
103 | |
104 (provide 'gtk-ffi) |