Mercurial > hg > xemacs-beta

view lisp/gtk-file-dialog.el @ 5157:1fae11d56ad2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
redo memory-usage mechanism, add way of dynamically initializing Lisp objects -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-18 Ben Wing <ben@xemacs.org> * diagnose.el (show-memory-usage): Rewrite to take into account API changes in memory-usage functions. src/ChangeLog addition: 2010-03-18 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (disksave_object_finalization_1): * alloc.c (lisp_object_storage_size): * alloc.c (listu): * alloc.c (listn): * alloc.c (Fobject_memory_usage_stats): * alloc.c (compute_memusage_stats_length): * alloc.c (Fobject_memory_usage): * alloc.c (Ftotal_object_memory_usage): * alloc.c (malloced_storage_size): * alloc.c (common_init_alloc_early): * alloc.c (reinit_alloc_objects_early): * alloc.c (reinit_alloc_early): * alloc.c (init_alloc_once_early): * alloc.c (syms_of_alloc): * alloc.c (reinit_vars_of_alloc): * buffer.c: * buffer.c (struct buffer_stats): * buffer.c (compute_buffer_text_usage): * buffer.c (compute_buffer_usage): * buffer.c (buffer_memory_usage): * buffer.c (buffer_objects_create): * buffer.c (syms_of_buffer): * buffer.c (vars_of_buffer): * console-impl.h (struct console_methods): * dynarr.c (Dynarr_memory_usage): * emacs.c (main_1): * events.c (clear_event_resource): * extents.c: * extents.c (compute_buffer_extent_usage): * extents.c (extent_objects_create): * extents.h: * faces.c: * faces.c (compute_face_cachel_usage): * faces.c (face_objects_create): * faces.h: * general-slots.h: * glyphs.c: * glyphs.c (compute_glyph_cachel_usage): * glyphs.c (glyph_objects_create): * glyphs.h: * lisp.h: * lisp.h (struct usage_stats): * lrecord.h: * lrecord.h (enum lrecord_type): * lrecord.h (struct lrecord_implementation): * lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): * lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (MAKE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (MAKE_MODULE_LISP_OBJECT): * lrecord.h (INIT_LISP_OBJECT): * lrecord.h (INIT_MODULE_LISP_OBJECT): * lrecord.h (UNDEF_LISP_OBJECT): * lrecord.h (UNDEF_MODULE_LISP_OBJECT): * lrecord.h (DECLARE_LISP_OBJECT): * lrecord.h (DECLARE_MODULE_API_LISP_OBJECT): * lrecord.h (DECLARE_MODULE_LISP_OBJECT): * lstream.c: * lstream.c (syms_of_lstream): * lstream.c (vars_of_lstream): * marker.c: * marker.c (compute_buffer_marker_usage): * mc-alloc.c (mc_alloced_storage_size): * mc-alloc.h: * mule-charset.c: * mule-charset.c (struct charset_stats): * mule-charset.c (compute_charset_usage): * mule-charset.c (charset_memory_usage): * mule-charset.c (mule_charset_objects_create): * mule-charset.c (syms_of_mule_charset): * mule-charset.c (vars_of_mule_charset): * redisplay.c: * redisplay.c (compute_rune_dynarr_usage): * redisplay.c (compute_display_block_dynarr_usage): * redisplay.c (compute_glyph_block_dynarr_usage): * redisplay.c (compute_display_line_dynarr_usage): * redisplay.c (compute_line_start_cache_dynarr_usage): * redisplay.h: * scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): * scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage): * scrollbar-x.c (x_compute_scrollbar_instance_usage): * scrollbar.c (compute_scrollbar_instance_usage): * scrollbar.h: * symbols.c: * symbols.c (reinit_symbol_objects_early): * symbols.c (init_symbols_once_early): * symbols.c (reinit_symbols_early): * symbols.c (defsymbol_massage_name_1): * symsinit.h: * ui-gtk.c: * ui-gtk.c (emacs_gtk_object_getprop): * ui-gtk.c (emacs_gtk_object_putprop): * ui-gtk.c (ui_gtk_objects_create): * unicode.c (compute_from_unicode_table_size_1): * unicode.c (compute_to_unicode_table_size_1): * unicode.c (compute_from_unicode_table_size): * unicode.c (compute_to_unicode_table_size): * window.c: * window.c (struct window_stats): * window.c (compute_window_mirror_usage): * window.c (compute_window_usage): * window.c (window_memory_usage): * window.c (window_objects_create): * window.c (syms_of_window): * window.c (vars_of_window): * window.h: Redo memory-usage mechanism, make it general; add way of dynamically initializing Lisp object types -- OBJECT_HAS_METHOD(), similar to CONSOLE_HAS_METHOD(). (1) Create OBJECT_HAS_METHOD(), OBJECT_HAS_PROPERTY() etc. for specifying that a Lisp object type has a particular method or property. Call such methods with OBJECT_METH, MAYBE_OBJECT_METH, OBJECT_METH_OR_GIVEN; retrieve properties with OBJECT_PROPERTY. Methods that formerly required a DEFINE_*GENERAL_LISP_OBJECT() to specify them (getprop, putprop, remprop, plist, disksave) now instead use the dynamic-method mechanism. The main benefit of this is that new methods or properties can be added without requiring that the declaration statements of all existing methods be modified. We have to make the `struct lrecord_implementation' non-const, but I don't think this should have any effect on speed -- the only possible method that's really speed-critical is the mark method, and we already extract those out into a separate (non-const) array for increased cache locality. Object methods need to be reinitialized after pdump, so we put them in separate functions such as face_objects_create(), extent_objects_create() and call them appropriately from emacs.c The only current object property (`memusage_stats_list') that objects can specify is a Lisp object and gets staticpro()ed so it only needs to be set during dump time, but because it references symbols that might not exist in a syms_of_() function, we initialize it in vars_of_(). There is also an object property (`num_extra_memusage_stats') that is automatically initialized based on `memusage_stats_list'; we do that in reinit_vars_of_alloc(), which is called after all vars_of_() functions are called. `disksaver' method was renamed `disksave' to correspond with the name normally given to the function (e.g. disksave_lstream()). (2) Generalize the memory-usage mechanism in `buffer-memory-usage', `window-memory-usage', `charset-memory-usage' into an object-type- specific mechanism called by a single function `object-memory-usage'. (Former function `object-memory-usage' renamed to `total-object-memory-usage'). Generalize the mechanism of different "slices" so that we can have different "classes" of memory described and different "slices" onto each class; `t' separates classes, `nil' separates slices. Currently we have three classes defined: the memory of an object itself, non-Lisp-object memory associated with the object (e.g. arrays or dynarrs stored as fields in the object), and Lisp-object memory associated with the object (other internal Lisp objects stored in the object). This isn't completely finished yet and we might need to further separate the "other internal Lisp objects" class into two classes. The memory-usage mechanism uses a `struct usage_stats' (renamed from `struct overhead_stats') to describe a malloc-view onto a set of allocated memory (listing how much was requested and various types of overhead) and a more general `struct generic_usage_stats' (with a `struct usage_stats' in it) to hold all statistics about object memory. `struct generic_usage_stats' contains an array of 32 Bytecounts, which are statistics of unspecified semantics. The intention is that individual types declare a corresponding struct (e.g. `struct window_stats') with the same structure but with specific fields in place of the array, corresponding to specific statistics. The number of such statistics is an object property computed from the list of tags (Lisp symbols describing the statistics) stored in `memusage_stats_list'. The idea here is to allow particular object types to customize the number and semantics of the statistics where completely avoiding consing. This doesn't matter so much yet, but the intention is to have the memory usage of all objects computed at the end of GC, at the same time as other statistics are currently computed. The values for all statistics for a single type would be added up to compute aggregate values for all objects of a specific type. To make this efficient, we can't allow any memory allocation at all. (3) Create some additional functions for creating lists that specify the elements directly as args rather than indirectly through an array: listn() (number of args given), listu() (list terminated by Qunbound). (4) Delete a bit of remaining unused C window_config stuff, also unused lrecord_type_popup_data.
author Ben Wing <ben@xemacs.org>
date Thu, 18 Mar 2010 10:50:06 -0500
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)