Mercurial > hg > xemacs-beta
view lisp/gtk-file-dialog.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
;;; gtk-file-dialog.el --- A nicer file selection dialog for XEmacs w/GTK primitives ;; Copyright (C) 2000 Free Software Foundation, Inc. ;; Maintainer: William M. Perry <wmperry@gnu.org> ;; Keywords: extensions, internal ;; 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; The default GTK file selection dialog is not sufficient for our ;; needs. Limitations include: ;; ;; - not derived from GtkDialog ;; - no support for filters based on file types ;; - no support for setting an initial directory ;; - no way to tell it 'file must exist' ;; - no easy way to tell it to look at directories only ;; - ugly as sin ;; ;; This attempts to rectify the situation. (globally-declare-fboundp '(gtk-clist-clear gtk-clist-freeze gtk-clist-append gtk-clist-thaw gtk-combo-set-popdown-strings gtk-dialog-new gtk-dialog-vbox gtk-dialog-action-area gtk-window-set-title gtk-button-new-with-label gtk-container-add gtk-signal-connect gtk-entry-get-text gtk-widget-destroy gtk-combo-new gtk-combo-disable-activate gtk-box-pack-start gtk-combo-entry gtk-hbox-new gtk-clist-new-with-titles gtk-scrolled-window-new gtk-widget-set-usize gtk-clist-get-text gtk-entry-set-text gtk-button-clicked gtk-option-menu-new gtk-menu-new gtk-label-new gtk-menu-item-new-with-label gtk-menu-append gtk-widget-show gtk-option-menu-set-menu gtk-box-pack-end gtk-entry-new gtk-widget-set-sensitive gtk-widget-realize)) (defun gtk-file-dialog-fill-file-list (dialog dir) (if (not dir) (setq dir (get dialog 'x-file-dialog-current-dir nil))) (put dialog 'x-file-dialog-current-dir dir) (let ((list (get dialog 'x-file-dialog-files-list nil)) ;(remotep (file-remote-p dir)) ) (if (not list) nil (gtk-clist-clear list) (gtk-clist-freeze list) ;; NOTE: Current versions of efs / ange-ftp do not honor the ;; files-only flag to directory-files, but actually DOING these ;; checks is hideously expensive. Leave it turned off for now. (mapc #'(lambda (f) (if (or t ; Lets just wait for EFS to ;(not remotep) ; fix itself, shall we? ;(not (file-directory-p (expand-file-name f dir))) ) (gtk-clist-append list (list f)))) (directory-files dir nil (get dialog 'x-file-dialog-active-filter nil) nil t)) (gtk-clist-thaw list)))) (defun gtk-file-dialog-fill-directory-list (dialog dir) (let ((subdirs (directory-files dir nil nil nil 5)) ;(remotep (file-remote-p dir)) ;(selected-dir (get dialog 'x-file-dialog-current-dir "/")) (directory-list (get dialog 'x-file-dialog-directory-list))) (gtk-clist-freeze directory-list) (gtk-clist-clear directory-list) (while subdirs (if (equal "." (car subdirs)) nil ;; NOTE: Current versions of efs / ange-ftp do not honor the ;; files-only flag to directory-files, but actually DOING these ;; checks is hideously expensive. Leave it turned off for now. (if (or t ; Lets just wait for EFS to ;(not remotep) ; fix itself, shall we? ;(file-directory-p (expand-file-name (car subdirs) dir)) ) (gtk-clist-append directory-list (list (car subdirs))))) (pop subdirs)) (gtk-clist-thaw directory-list))) (defun gtk-file-dialog-update-dropdown (dialog dir) (let ((combo-box (get dialog 'x-file-dialog-select-list)) (components (reverse (delete "" (split-string dir (concat "[" (char-to-string directory-sep-char) "]"))))) (entries nil)) (while components (push (concat "/" (mapconcat 'identity (reverse components) (char-to-string directory-sep-char))) entries) (pop components)) (push (expand-file-name "." "~/") entries) (gtk-combo-set-popdown-strings combo-box (nreverse entries)))) (defun gtk-file-dialog-select-directory (dialog dir) (gtk-file-dialog-fill-directory-list dialog dir) (gtk-file-dialog-fill-file-list dialog dir) (gtk-file-dialog-update-dropdown dialog dir)) (defun gtk-file-dialog-new (&rest keywords) "Create a XEmacs file selection dialog. Optional keyword arguments allowed: :title The title of the dialog :initial-directory Initial directory to show :filter-list List of filter descriptions and filters :file-must-exist Whether the file must exist or not :directory Look for a directory instead :callback Function to call with one arg, the selection " (let* ((dialog (gtk-dialog-new)) (vbox (gtk-dialog-vbox dialog)) (dir (plist-get keywords :initial-directory default-directory)) (button-area (gtk-dialog-action-area dialog)) ;(initializing-gtk-file-dialog t) (select-box nil) button hbox) (put dialog 'type 'dialog) (gtk-window-set-title dialog (plist-get keywords :title "Select a file...")) (setq button (gtk-button-new-with-label "OK")) (gtk-container-add button-area button) (gtk-signal-connect button 'clicked (lambda (button dialog) (funcall (get dialog 'x-file-dialog-callback 'ignore) (gtk-entry-get-text (get dialog 'x-file-dialog-entry nil))) (gtk-widget-destroy dialog)) dialog) (put dialog 'x-file-dialog-ok-button button) (setq button (gtk-button-new-with-label "Cancel")) (gtk-container-add button-area button) (gtk-signal-connect button 'clicked (lambda (button dialog) (gtk-widget-destroy dialog)) dialog) (put dialog 'x-file-dialog-cancel-button button) (put dialog 'x-file-dialog-callback (plist-get keywords :callback 'ignore)) (put dialog 'x-file-dialog-construct-args keywords) (put dialog 'x-file-dialog-current-dir dir) ;; Dropdown list of directories... (setq select-box (gtk-combo-new)) (gtk-combo-disable-activate select-box) (gtk-box-pack-start vbox select-box nil nil 5) (put dialog 'x-file-dialog-select-list select-box) ;; Hitting return in the entry will change dirs... (gtk-signal-connect (gtk-combo-entry select-box) 'activate (lambda (entry dialog) (gtk-file-dialog-select-directory dialog (gtk-entry-get-text entry))) dialog) ;; Start laying out horizontally... (setq hbox (gtk-hbox-new nil 0)) (gtk-box-pack-start vbox hbox t t 5) ;; Directory listing (let ((directories (gtk-clist-new-with-titles 1 '("Directories"))) (scrolled (gtk-scrolled-window-new nil nil))) (gtk-container-add scrolled directories) (gtk-widget-set-usize scrolled 200 300) (gtk-box-pack-start hbox scrolled t t 0) (put dialog 'x-file-dialog-directory-list directories) (put dialog 'x-file-dialog-directory-scrolled scrolled) (gtk-signal-connect directories 'select-row (lambda (list row column event dialog) (let ((dir (expand-file-name (gtk-clist-get-text (get dialog 'x-file-dialog-directory-list) row column) (get dialog 'x-file-dialog-current-dir)))) (if (and (misc-user-event-p event) (event-function event)) (gtk-file-dialog-select-directory dialog dir) (gtk-entry-set-text (get dialog 'x-file-dialog-entry) dir)))) dialog) ) (if (plist-get keywords :directory nil) ;; Directory listings only do not need the file or filters buttons. nil ;; File listing (let ((list (gtk-clist-new-with-titles 1 '("Files"))) (scrolled (gtk-scrolled-window-new nil nil))) (gtk-container-add scrolled list) (gtk-widget-set-usize scrolled 200 300) (gtk-box-pack-start hbox scrolled t t 0) (gtk-signal-connect list 'select-row (lambda (list row column event dialog) (gtk-entry-set-text (get dialog 'x-file-dialog-entry nil) (expand-file-name (gtk-clist-get-text list row column) (get dialog 'x-file-dialog-current-dir nil))) (if (and (misc-user-event-p event) (event-function event)) ;; Got a double or triple click event... (gtk-button-clicked (get dialog 'x-file-dialog-ok-button nil)))) dialog) (put dialog 'x-file-dialog-files-list list)) ;; Filters (if (not (plist-get keywords :filter-list nil)) ;; Don't need to bother packing this nil (setq hbox (gtk-hbox-new nil 0)) (gtk-box-pack-start vbox hbox nil nil 0) (let ((label nil) (options (plist-get keywords :filter-list nil)) (omenu nil) (menu nil) (item nil)) (setq omenu (gtk-option-menu-new) menu (gtk-menu-new) label (gtk-label-new "Filter: ")) (put dialog 'x-file-dialog-active-filter (cdr (car options))) (mapc (lambda (o) (setq item (gtk-menu-item-new-with-label (car o))) (gtk-signal-connect item 'activate (lambda (obj data) (put (car data) 'x-file-dialog-active-filter (cdr data)) (gtk-file-dialog-fill-file-list (car data) nil)) (cons dialog (cdr o))) (gtk-menu-append menu item) (gtk-widget-show item)) options) (gtk-option-menu-set-menu omenu menu) (gtk-box-pack-end hbox omenu nil nil 0) (gtk-box-pack-end hbox label nil nil 0)))) ;; Entry (let ((entry (gtk-entry-new))) (if (plist-get keywords :directory nil) nil (gtk-box-pack-start vbox entry nil nil 0)) (if (plist-get keywords :file-must-exist nil) (progn (gtk-widget-set-sensitive (get dialog 'x-file-dialog-ok-button nil) nil) (gtk-signal-connect entry 'changed (lambda (entry dialog) (gtk-widget-set-sensitive (get dialog 'x-file-dialog-ok-button) (file-exists-p (gtk-entry-get-text entry)))) dialog))) (put dialog 'x-file-dialog-entry entry)) (gtk-widget-realize dialog) ;; Populate the file list if necessary (gtk-file-dialog-select-directory dialog dir) dialog)) (provide 'gtk-file-dialog)