view lisp/gdk.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 7039e6323819
children 308d34e9f07d
line wrap: on
line source

;;; gdk.el --- Import GDK functions into XEmacs

;; 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.

(eval-and-compile
  (require 'gtk-ffi))

(globally-declare-fboundp
 '(gtk-import-function-internal gtk-call-function))

(gtk-import-function nil gdk_set_show_events (gboolean . show_events))
(gtk-import-function nil gdk_set_use_xshm (gboolean . use_xshm))
(gtk-import-function GtkString gdk_get_display)
(gtk-import-function nil gdk_flush)
(gtk-import-function nil gdk_beep)

(gtk-import-function nil gdk_key_repeat_disable)
(gtk-import-function nil gdk_key_repeat_restore)

(gtk-import-function gint gdk_visual_get_best_depth)
(gtk-import-function GdkVisualType gdk_visual_get_best_type)
(gtk-import-function GdkVisual gdk_visual_get_system)
(gtk-import-function GdkVisual gdk_visual_get_best)
(gtk-import-function GdkVisual gdk_visual_get_best_with_depth (gint . depth))
(gtk-import-function GdkVisual gdk_visual_get_best_with_type (GdkVisualType . visual_type))
(gtk-import-function GdkVisual gdk_visual_get_best_with_both
		     (gint . depth)
		     (GdkVisualType . visual_type))

(gtk-import-function gboolean gdk_window_is_visible (GdkWindow . window))
(gtk-import-function gboolean gdk_window_is_viewable (GdkWindow . window))

(gtk-import-function gboolean gdk_window_set_static_gravities
		     (GdkWindow . window)
		     (gboolean  . use_static))

(gtk-import-function nil gdk_window_set_cursor
		     (GdkWindow	. window)
		     (GdkCursor . cursor))

(gtk-import-function GdkVisual gdk_window_get_visual (GdkWindow . window))
(gtk-import-function GdkWindowType gdk_window_get_type (GdkWindow . window))
(gtk-import-function GdkWindow gdk_window_get_parent (GdkWindow . window))
(gtk-import-function GdkWindow gdk_window_get_toplevel (GdkWindow . window))
(gtk-import-function GdkEventMask gdk_window_get_events (GdkWindow . window))
(gtk-import-function none gdk_window_set_events (GdkWindow . window) (GdkEventMask . events))
(gtk-import-function none gdk_window_set_icon
		     (GdkWindow . window)
		     (GdkWindow . icon_window)
		     (GdkPixmap . pixmap)
		     (GdkBitmap . mask))
(gtk-import-function none gdk_window_set_icon_name (GdkWindow . window) (GtkString . name))
(gtk-import-function none gdk_window_set_group (GdkWindow . window) (GdkWindow . leader))
(gtk-import-function none gdk_window_set_decorations
		     (GdkWindow . window)
		     (GdkWMDecoration . decorations))
(gtk-import-function none gdk_window_set_functions
		     (GdkWindow . window)
		     (GdkWMFunction . functions))

;; Cursors are handled by glyphs in XEmacs
;; GCs are handled by faces in XEmacs
;; Pixmaps are handled by glyphs in XEmacs
;; Images are handled by glyphs in XEmacs
;; Colors are handled natively by XEmacs
;; Fonts are handled natively by XEmacs

(gtk-import-function none gdk_draw_point
		     (GdkDrawable . drawable)
		     (GdkGC . gc)
		     (gint . x)
		     (gint . y))
(gtk-import-function none gdk_draw_line
		     (GdkDrawable . drawable)
		     (GdkGC . gc)
		     (gint . x1)
		     (gint . y1)
		     (gint . x2)
		     (gint . y2))
(gtk-import-function none gdk_draw_rectangle
		     (GdkDrawable . drawable)
		     (GdkGC . gc)
		     (gboolean . filled)
		     (gint . x)
		     (gint . y)
		     (gint . width)
		     (gint . height))
(gtk-import-function none gdk_draw_arc
		     (GdkDrawable . drawable)
		     (GdkGC . gc)
		     (gboolean . filled)
		     (gint . x)
		     (gint . y)
		     (gint . width)
		     (gint . height)
		     (gint . angle1)
		     (gint . angle2))
(gtk-import-function none gdk_draw_string
		     (GdkDrawable . drawable)
		     (GdkFont     . font)
		     (GdkGC       . gc)
		     (gint        . x)
		     (gint        . y)
		     (GtkString   . string))
(gtk-import-function none gdk_draw_text
		     (GdkDrawable . drawable)
		     (GdkFont     . font)
		     (GdkGC       . gc)
		     (gint        . x)
		     (gint        . y)
		     (GtkString   . string)
		     (gint        . text_length))
(gtk-import-function none gdk_draw_pixmap
		     (GdkDrawable . drawable)
		     (GdkGC       . gc)
		     (GdkImage    . image)
		     (gint        . xsrc)
		     (gint        . ysrc)
		     (gint        . xdest)
		     (gint        . ydest)
		     (gint        . width)
		     (gint        . height))

;; Selections are handled natively by XEmacs

(provide 'gdk)