Mercurial > hg > xemacs-beta
view lisp/package-ui.el @ 5127:a9c41067dd88 ben-lisp-object
more cleanups, terminology clarification, lots of doc work
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Introduction to Allocation):
* internals/internals.texi (Integers and Characters):
* internals/internals.texi (Allocation from Frob Blocks):
* internals/internals.texi (lrecords):
* internals/internals.texi (Low-level allocation):
Rewrite section on allocation of Lisp objects to reflect the new
reality. Remove references to nonexistent XSETINT and XSETCHAR.
modules/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (allocate_pgconn):
* postgresql/postgresql.c (allocate_pgresult):
* postgresql/postgresql.h (struct Lisp_PGconn):
* postgresql/postgresql.h (struct Lisp_PGresult):
* ldap/eldap.c (allocate_ldap):
* ldap/eldap.h (struct Lisp_LDAP):
Same changes as in src/ dir. See large log there in ChangeLog,
but basically:
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
../hlo/src/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (very_old_free_lcrecord):
* alloc.c (copy_lisp_object):
* alloc.c (zero_sized_lisp_object):
* alloc.c (zero_nonsized_lisp_object):
* alloc.c (lisp_object_storage_size):
* alloc.c (free_normal_lisp_object):
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (Fcons):
* alloc.c (noseeum_cons):
* alloc.c (make_float):
* alloc.c (make_bignum):
* alloc.c (make_bignum_bg):
* alloc.c (make_ratio):
* alloc.c (make_ratio_bg):
* alloc.c (make_ratio_rt):
* alloc.c (make_bigfloat):
* alloc.c (make_bigfloat_bf):
* alloc.c (size_vector):
* alloc.c (make_compiled_function):
* alloc.c (Fmake_symbol):
* alloc.c (allocate_extent):
* alloc.c (allocate_event):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (Fmake_marker):
* alloc.c (noseeum_make_marker):
* alloc.c (size_string_direct_data):
* alloc.c (make_uninit_string):
* alloc.c (make_string_nocopy):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* alloc.c (malloced_storage_size):
* buffer.c (allocate_buffer):
* buffer.c (compute_buffer_usage):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* buffer.c (nuke_all_buffer_slots):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.h (struct buffer_text):
* buffer.h (struct buffer):
* bytecode.c:
* bytecode.c (make_compiled_function_args):
* bytecode.c (size_compiled_function_args):
* bytecode.h (struct compiled_function_args):
* casetab.c (allocate_case_table):
* casetab.h (struct Lisp_Case_Table):
* charset.h (struct Lisp_Charset):
* chartab.c (fill_char_table):
* chartab.c (Fmake_char_table):
* chartab.c (make_char_table_entry):
* chartab.c (copy_char_table_entry):
* chartab.c (Fcopy_char_table):
* chartab.c (put_char_table):
* chartab.h (struct Lisp_Char_Table_Entry):
* chartab.h (struct Lisp_Char_Table):
* console-gtk-impl.h (struct gtk_device):
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h (struct console):
* console-msw-impl.h (struct Lisp_Devmode):
* console-msw-impl.h (struct mswindows_device):
* console-msw-impl.h (struct msprinter_device):
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (struct mswindows_dialog_id):
* console-stream-impl.h (struct stream_console):
* console-stream.c (stream_init_console):
* console-tty-impl.h (struct tty_console):
* console-tty-impl.h (struct tty_device):
* console-tty.c (allocate_tty_console_struct):
* console-x-impl.h (struct x_device):
* console-x-impl.h (struct x_frame):
* console.c (allocate_console):
* console.c (nuke_all_console_slots):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* console.c (common_init_complex_vars_of_console):
* data.c (make_weak_list):
* data.c (make_weak_box):
* data.c (make_ephemeron):
* database.c:
* database.c (struct Lisp_Database):
* database.c (allocate_database):
* database.c (finalize_database):
* device-gtk.c (allocate_gtk_device_struct):
* device-impl.h (struct device):
* device-msw.c:
* device-msw.c (mswindows_init_device):
* device-msw.c (msprinter_init_device):
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device-tty.c (allocate_tty_device_struct):
* device-x.c (allocate_x_device_struct):
* device.c:
* device.c (nuke_all_device_slots):
* device.c (allocate_device):
* dialog-msw.c (handle_question_dialog_box):
* elhash.c:
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (finalize_hash_table):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (Fcopy_hash_table):
* elhash.h (htentry):
* emacs.c (main_1):
* eval.c:
* eval.c (size_multiple_value):
* event-stream.c (finalize_command_builder):
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (event_stream_resignal_wakeup):
* event-stream.c (event_stream_disable_wakeup):
* event-stream.c (event_stream_wakeup_pending_p):
* events.h (struct Lisp_Timeout):
* events.h (struct command_builder):
* extents-impl.h:
* extents-impl.h (struct extent_auxiliary):
* extents-impl.h (struct extent_info):
* extents-impl.h (set_extent_no_chase_aux_field):
* extents-impl.h (set_extent_no_chase_normal_field):
* extents.c:
* extents.c (gap_array_marker):
* extents.c (gap_array):
* extents.c (extent_list_marker):
* extents.c (extent_list):
* extents.c (stack_of_extents):
* extents.c (gap_array_make_marker):
* extents.c (extent_list_make_marker):
* extents.c (allocate_extent_list):
* extents.c (SLOT):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (attach_extent_auxiliary):
* extents.c (size_gap_array):
* extents.c (finalize_extent_info):
* extents.c (allocate_extent_info):
* extents.c (uninit_buffer_extents):
* extents.c (allocate_soe):
* extents.c (copy_extent):
* extents.c (vars_of_extents):
* extents.h:
* faces.c (allocate_face):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.c (sizeof_coding_system):
* file-coding.c (Fcopy_coding_system):
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (MARKED_SLOT):
* fns.c (size_bit_vector):
* font-mgr.c:
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (print_fc_pattern):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (size):
* font-mgr.c (Ffc_config_substitute):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (finalize_fc_config):
* font-mgr.c (print_fc_config):
* font-mgr.h:
* font-mgr.h (struct fc_pattern):
* font-mgr.h (XFC_PATTERN):
* font-mgr.h (struct fc_config):
* font-mgr.h (XFC_CONFIG):
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-impl.h (struct frame):
* frame-msw.c (mswindows_init_frame_1):
* frame-x.c (allocate_x_frame_struct):
* frame.c (nuke_all_frame_slots):
* frame.c (allocate_frame_core):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c (finalize_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (Fcolorize_image_instance):
* glyphs.c (allocate_glyph):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* glyphs.c (register_ignored_expose):
* glyphs.h (struct Lisp_Image_Instance):
* glyphs.h (struct Lisp_Glyph):
* glyphs.h (struct glyph_cachel):
* glyphs.h (struct expose_ignore):
* gui.c (allocate_gui_item):
* gui.h (struct Lisp_Gui_Item):
* keymap.c (struct Lisp_Keymap):
* keymap.c (make_keymap):
* lisp.h:
* lisp.h (struct Lisp_String_Direct_Data):
* lisp.h (struct Lisp_String_Indirect_Data):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (DECLARE_INLINE_LISP_BIT_VECTOR):
* lisp.h (struct weak_box):
* lisp.h (struct ephemeron):
* lisp.h (struct weak_list):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (struct lcrecord_list):
* lstream.c (finalize_lstream):
* lstream.c (sizeof_lstream):
* lstream.c (Lstream_new):
* lstream.c (Lstream_delete):
* lstream.h (struct lstream):
* marker.c:
* marker.c (finalize_marker):
* marker.c (compute_buffer_marker_usage):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (compute_charset_usage):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty-impl.h (struct tty_color_instance_data):
* objects-tty-impl.h (struct tty_font_instance_data):
* objects-tty.c (tty_initialize_color_instance):
* objects-tty.c (tty_initialize_font_instance):
* objects.c (finalize_color_instance):
* objects.c (Fmake_color_instance):
* objects.c (finalize_font_instance):
* objects.c (Fmake_font_instance):
* objects.c (reinit_vars_of_objects):
* opaque.c:
* opaque.c (sizeof_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (free_opaque_ptr):
* opaque.h:
* opaque.h (Lisp_Opaque):
* opaque.h (Lisp_Opaque_Ptr):
* print.c (printing_unreadable_lcrecord):
* print.c (external_object_printer):
* print.c (debug_p4):
* process.c (finalize_process):
* process.c (make_process_internal):
* procimpl.h (struct Lisp_Process):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.h (struct Lisp_Range_Table):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h (struct scrollbar_instance):
* specifier.c (finalize_specifier):
* specifier.c (sizeof_specifier):
* specifier.c (set_specifier_caching):
* specifier.h (struct Lisp_Specifier):
* specifier.h (struct specifier_caching):
* symeval.h:
* symeval.h (SYMBOL_VALUE_MAGIC_P):
* symeval.h (DEFVAR_SYMVAL_FWD):
* symsinit.h:
* syntax.c (init_buffer_syntax_cache):
* syntax.h (struct syntax_cache):
* toolbar.c:
* toolbar.c (allocate_toolbar_button):
* toolbar.c (update_toolbar_button):
* toolbar.h (struct toolbar_button):
* tooltalk.c (struct Lisp_Tooltalk_Message):
* tooltalk.c (make_tooltalk_message):
* tooltalk.c (struct Lisp_Tooltalk_Pattern):
* tooltalk.c (make_tooltalk_pattern):
* ui-gtk.c:
* ui-gtk.c (allocate_ffi_data):
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_object_data):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* ui-gtk.h:
* window-impl.h (struct window):
* window-impl.h (struct window_mirror):
* window.c (finalize_window):
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (mark_window_as_deleted):
* window.c (make_dummy_parent):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
Overall point of this change and previous ones in this repository:
(1) Introduce new, clearer terminology: everything other than int
or char is a "record" object, which comes in two types: "normal
objects" and "frob-block objects". Fix up all places that
referred to frob-block objects as "simple", "basic", etc.
(2) Provide an advertised interface for doing operations on Lisp
objects, including creating new types, that is clean and
consistent in its naming, uses the above-referenced terms and
avoids referencing "lrecords", "old lcrecords", etc., which should
hide under the surface.
(3) Make the size_in_bytes and finalizer methods take a
Lisp_Object rather than a void * for consistency with other methods.
(4) Separate finalizer method into finalizer and disksaver, so
that normal finalize methods don't have to worry about disksaving.
Other specifics:
(1) Renaming:
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
implementation->basic_p -> implementation->frob_block_p
ALLOCATE_FIXED_TYPE_AND_SET_IMPL -> ALLOC_FROB_BLOCK_LISP_OBJECT
*FCCONFIG*, wrap_fcconfig -> *FC_CONFIG*, wrap_fc_config
*FCPATTERN*, wrap_fcpattern -> *FC_PATTERN*, wrap_fc_pattern
(the last two changes make the naming of these macros consistent
with the naming of all other macros, since the objects are named
fc-config and fc-pattern with a hyphen)
(2) Lots of documentation fixes in lrecord.h.
(3) Eliminate macros for copying, freeing, zeroing objects, getting
their storage size. Instead, new functions:
zero_sized_lisp_object()
zero_nonsized_lisp_object()
lisp_object_storage_size()
free_normal_lisp_object()
(copy_lisp_object() already exists)
LISP_OBJECT_FROB_BLOCK_P() (actually a macro)
Eliminated:
free_lrecord()
zero_lrecord()
copy_lrecord()
copy_sized_lrecord()
old_copy_lcrecord()
old_copy_sized_lcrecord()
old_zero_lcrecord()
old_zero_sized_lcrecord()
LISP_OBJECT_STORAGE_SIZE()
COPY_SIZED_LISP_OBJECT()
COPY_SIZED_LCRECORD()
COPY_LISP_OBJECT()
ZERO_LISP_OBJECT()
FREE_LISP_OBJECT()
(4) Catch the remaining places where lrecord stuff was used directly
and use the advertised interface, e.g. alloc_sized_lrecord() ->
ALLOC_SIZED_LISP_OBJECT().
(5) Make certain statically-declared pseudo-objects
(buffer_local_flags, console_local_flags) have their lheader
initialized correctly, so things like copy_lisp_object() can work
on them. Make extent_auxiliary_defaults a proper heap object
Vextent_auxiliary_defaults, and make extent auxiliaries dumpable
so that this object can be dumped. allocate_extent_auxiliary()
now just creates the object, and attach_extent_auxiliary()
creates an extent auxiliary and attaches to an extent, like the
old allocate_extent_auxiliary().
(6) Create EXTENT_AUXILIARY_SLOTS macro, similar to the foo-slots.h
files but in a macro instead of a file. The purpose is to avoid
duplication when iterating over all the slots in an extent auxiliary.
Use it.
(7) In lstream.c, don't zero out object after allocation because
allocation routines take care of this.
(8) In marker.c, fix a mistake in computing marker overhead.
(9) In print.c, clean up printing_unreadable_lcrecord(),
external_object_printer() to avoid lots of ifdef NEW_GC's.
(10) Separate toolbar-button allocation into a separate
allocate_toolbar_button() function for use in the example code
in lrecord.h.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Mar 2010 04:08:17 -0600 |
| parents | e29fcfd8df5f |
| children | 2e528066e2fc |
line wrap: on
line source
;;; package-ui.el --- ;; Copyright (C) 1998 by Darryl Okahata ;; Author: Darryl Okahata <darrylo@sr.hp.com> ;; Keywords: 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, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Not in FSF (require 'package-get) ;; which, in turn, requires 'package-admin ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; User-changeable variables: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defgroup pui nil "Convenient interface to the package system." :group 'package-tools :tag "Package User interface" :prefix "pui-") (defcustom pui-package-install-dest-dir nil "*If non-nil (Automatic) path to package tree to install packages in. Otherwise, use old path for installed packages and make a guess for new ones." :group 'pui :tag "Install Location" :type '(choice (const :tag "Automatic" nil) (directory))) (defcustom pui-list-verbose t "*If non-nil, display verbose info in the package list buffer." :group 'pui :tag "Verbose Listing" :type 'boolean) (defcustom pui-up-to-date-package-face nil "*The face to use for packages that are up-to-date." :group 'pui :type 'face) (defcustom pui-selected-package-face 'bold "*The face to use for selected packages. Set this to `nil' to use the `default' face." :group 'pui :type 'face) (defcustom pui-deleted-package-face 'blue "*The face to use for packages marked for removal. Set this to `nil' to use the `default' face." :group 'pui :type 'face) (defcustom pui-outdated-package-face 'red "*The face to use for outdated packages. Set this to `nil' to use the `default' face." :group 'pui :type 'face) (defcustom pui-uninstalled-package-face 'italic "*The face to use for uninstalled packages. Set this to `nil' to use the `default' face." :group 'pui :type 'face) (defcustom pui-info-buffer "*Packages*" "*Buffer to use for displaying package information." :group 'pui :type 'string) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; End of user-changeable variables. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defvar pui-selected-packages nil "The list of user-selected packages to install.") (defvar pui-deleted-packages nil "The list of user-selected packages to remove.") (defvar pui-actual-package "") (defvar pui-display-keymap (let ((m (make-keymap))) (suppress-keymap m) (set-keymap-name m 'pui-display-keymap) (define-key m "q" 'pui-quit) (define-key m "g" 'pui-list-packages) (define-key m "i" 'pui-display-info) (define-key m "m" 'pui-display-maintainer) (define-key m "?" 'describe-mode) (define-key m "v" 'pui-toggle-verbosity-redisplay) (define-key m "d" 'pui-toggle-package-delete-key) (define-key m "D" 'pui-toggle-package-delete-key) (define-key m [return] 'pui-toggle-package-key) (define-key m "x" 'pui-install-selected-packages) (define-key m "I" 'pui-install-selected-packages) (define-key m "r" 'pui-add-required-packages) (define-key m "n" 'next-line) (define-key m "+" 'pui-toggle-package-key) (define-key m "p" 'previous-line) (define-key m " " 'scroll-up-command) (define-key m [delete] 'scroll-down-command) m) "Keymap to use in the `pui-info-buffer' buffer") (defvar pui-package-keymap (let ((m (make-sparse-keymap))) (set-keymap-name m 'pui-package-keymap) (define-key m 'button2 'pui-toggle-package-event) ;; We use a popup menu (define-key m 'button3 'pui-popup-context-sensitive) m) "Keymap to use over package names/descriptions.") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; End of variables ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Configuration routines ;;;###autoload (defun package-ui-add-site (site) "Add site to package-get-remote and possibly offer to update package list." (let ((had-none (null package-get-remote))) (setq package-get-remote site) (when (and had-none package-get-was-current (y-or-n-p "Update Package list?")) (setq package-get-was-current nil) (package-get-require-base t) (if (get-buffer pui-info-buffer) (save-window-excursion (pui-list-packages)))) (set-menubar-dirty-flag))) ;;;###autoload (defun package-ui-download-menu () "Build the `Add Download Site' menu." (mapcar (lambda (site) (vector (car site) `(if (equal package-get-remote (quote ,(cdr site))) (setq package-get-remote nil) (package-ui-add-site (quote ,(cdr site)))) ;; I've used radio buttons so that only a single ;; site can be selected, but they are in fact ;; toggles. SY. :style 'radio :selected `(equal package-get-remote (quote ,(cdr site))))) package-get-download-sites)) ;;;###autoload (defun package-ui-pre-release-download-menu () "Build the 'Pre-Release Download Sites' menu." (mapcar (lambda (site) (vector (car site) `(if (equal package-get-remote (quote ,(cdr site))) (setq package-get-remote nil) (package-ui-add-site (quote ,(cdr site)))) ;; I've used radio buttons so that only a single ;; site can be selected, but they are in fact ;; toggles. SY. :style 'radio :selected `(equal package-get-remote (quote ,(cdr site))))) package-get-pre-release-download-sites)) ;;;###autoload (defun package-ui-site-release-download-menu () "Build the 'Site Release Download Sites' menu." (mapcar (lambda (site) (vector (car site) `(if (equal package-get-remote (quote ,(cdr site))) (setq package-get-remote nil) (package-ui-add-site (quote ,(cdr site)))) ;; I've used radio buttons so that only a single ;; site can be selected, but they are in fact ;; toggles. SY. :style 'radio :selected `(equal package-get-remote (quote ,(cdr site))))) package-get-site-release-download-sites)) ;;;###autoload (defun pui-set-local-package-get-directory () "Set a new package binary directory in `package-get-remote'. Note that no provision is made for saving any changes made by this function. It exists mainly as a convenience for one-time package installations from disk." (interactive) (let ((dir (read-directory-name "New package binary directory to add? " nil nil t))) (setq package-get-remote (list nil dir)) (message "Package directory \"%s\" added." dir))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Package list/installer routines (defun pui-quit () (interactive) (kill-buffer nil)) (defun pui-package-symbol-char (pkg-sym version) (progn (if (package-get-info-find-package packages-package-list pkg-sym) (let ((installed (package-get-key pkg-sym :version))) (if (>= (if (stringp installed) (string-to-number installed) installed) (if (stringp version) (string-to-number version) version)) (list " " pui-up-to-date-package-face) (list "*" pui-outdated-package-face))) (list "-" pui-uninstalled-package-face)))) (defun pui-update-package-display (extent &optional pkg-sym version) "Update the package status for EXTENT. If PKG-SYM or VERSION are not given, they are read from the extent. These are used to determine whether or not the package is installed, and whether or not it is up-to-date." (let (buffer-read-only disp sym-char) (if (not pkg-sym) (setq pkg-sym (extent-property extent 'pui-package))) (if (not version) (setq version (package-get-info-prop (extent-property extent 'pui-info) 'version))) (cond ((member pkg-sym pui-selected-packages) (if pui-selected-package-face (set-extent-face extent (get-face pui-selected-package-face)) (set-extent-face extent (get-face 'default))) (setq sym-char "+")) ((member pkg-sym pui-deleted-packages) (if pui-deleted-package-face (set-extent-face extent (get-face pui-deleted-package-face)) (set-extent-face extent (get-face 'default))) (setq sym-char "D")) (t (setq disp (pui-package-symbol-char pkg-sym version)) (setq sym-char (car disp)) (if (car (cdr disp)) (set-extent-face extent (get-face (car (cdr disp)))) (set-extent-face extent (get-face 'default))))) (save-excursion (goto-char (extent-start-position extent)) (delete-char 1) (insert sym-char) (set-buffer-modified-p nil)))) (defun pui-toggle-package (extent) (let (pkg-sym) (setq pkg-sym (extent-property extent 'pui-package)) (if (member pkg-sym pui-selected-packages) (setq pui-selected-packages (delete pkg-sym pui-selected-packages)) (setq pui-selected-packages (cons pkg-sym pui-selected-packages)) (setq pui-deleted-packages (delete pkg-sym pui-deleted-packages))) (pui-update-package-display extent pkg-sym))) (defun pui-toggle-package-key () "Select/unselect package for installation, using the keyboard." (interactive) (let (extent) (if (setq extent (extent-at (point) (current-buffer) 'pui)) (progn (pui-toggle-package extent) (forward-line 1)) (error 'invalid-operation "No package under cursor!")))) (defun pui-toggle-package-delete (extent) (let (pkg-sym) (setq pkg-sym (extent-property extent 'pui-package)) (if (member pkg-sym pui-deleted-packages) (setq pui-deleted-packages (delete pkg-sym pui-deleted-packages)) (setq pui-deleted-packages (cons pkg-sym pui-deleted-packages)) (setq pui-selected-packages (delete pkg-sym pui-selected-packages))) (pui-update-package-display extent pkg-sym))) (defun pui-toggle-package-delete-key () "Select/unselect package for removal, using the keyboard." (interactive) (let (extent) (if (setq extent (extent-at (point) (current-buffer) 'pui)) (progn (pui-toggle-package-delete extent) (forward-line 1)) (error 'invalid-operation "No package under cursor!")))) (defun pui-current-package () (let ((extent (extent-at (point) (current-buffer) 'pui))) (if extent (extent-property extent 'pui-package)))) (defun pui-toggle-package-event (event) "Select/unselect package for installation, using the mouse." (interactive "e") (let* ((ep (event-point event)) (buffer (window-buffer (event-window event))) (extent (extent-at ep buffer 'pui-package))) (pui-toggle-package extent))) (defun pui-toggle-verbosity-redisplay () "Toggle verbose package info." (interactive) (progn (setq pui-list-verbose (not pui-list-verbose)) (pui-list-packages))) (defun pui-install-selected-packages () "Install selected packages." (interactive) (let ((tmpbuf "*Packages-To-Remove*") do-delete) (when pui-deleted-packages (save-window-excursion (with-output-to-temp-buffer tmpbuf (display-completion-list (sort (mapcar #'symbol-name pui-deleted-packages) #'string<) :activate-callback nil :help-string "Packages selected for removal:\n" :completion-string t)) (setq tmpbuf (get-buffer-create tmpbuf)) (display-buffer tmpbuf) (setq do-delete (yes-or-no-p "Remove these packages? ")) (kill-buffer tmpbuf)) (when do-delete (message "Deleting selected packages ...") (sit-for 0) (mapc (lambda (pkg) (package-admin-delete-binary-package pkg (package-admin-get-install-dir pkg))) (nreverse pui-deleted-packages)) (message "Packages deleted")))) (let ((tmpbuf "*Packages-To-Install*") do-install) (if pui-selected-packages (progn ;; Don't change window config when asking the user if he really ;; wants to install the packages. We do this to avoid messing up ;; the window configuration if errors occur (we don't want to ;; display random buffers in addition to the error buffer, if ;; errors occur, which would normally be caused by display-buffer). (save-window-excursion (with-output-to-temp-buffer tmpbuf (display-completion-list (sort (mapcar #'symbol-name pui-selected-packages) #'string<) :activate-callback nil :help-string "Packages selected for installation:\n" :completion-string t)) (setq tmpbuf (get-buffer-create tmpbuf)) (display-buffer tmpbuf) (setq do-install (y-or-n-p "Install these packages? ")) (kill-buffer tmpbuf)) (if do-install (progn (save-excursion ;; Clear old temp buffer history (set-buffer (get-buffer-create package-admin-temp-buffer)) (buffer-disable-undo package-admin-temp-buffer) (erase-buffer package-admin-temp-buffer)) (message "Installing selected packages ...") (sit-for 0) (if (catch 'done (mapc (lambda (pkg) (if (not (package-get pkg nil nil pui-package-install-dest-dir)) (throw 'done nil))) (nreverse pui-selected-packages)) t) (progn (pui-list-packages) (message "Packages installed")))) (clear-message))) (if pui-deleted-packages (pui-list-packages) (error 'invalid-operation "No packages have been selected!"))) ;; sync with windows type systems (package-net-update-installed-db))) (defun pui-add-required-packages () "Select packages required by those already selected for installation." (interactive) (let ((tmpbuf "*Required-Packages*") do-select) (if pui-selected-packages (let ((dependencies (delq nil (mapcar (lambda (pkg) (let ((installed (package-get-key pkg :version)) (current (package-get-info-prop (package-get-info-version (package-get-info-find-package package-get-base pkg) nil) 'version))) (if (or (null installed) (< (if (stringp installed) (string-to-number installed) installed) (if (stringp current) (string-to-number current) current))) pkg nil))) (package-get-dependencies pui-selected-packages))))) ;; Don't change window config when asking the user if he really ;; wants to add the packages. We do this to avoid messing up ;; the window configuration if errors occur (we don't want to ;; display random buffers in addition to the error buffer, if ;; errors occur, which would normally be caused by display-buffer). (save-window-excursion (with-output-to-temp-buffer tmpbuf (display-completion-list (sort (mapcar #'(lambda (pkg) (symbol-name pkg)) dependencies) 'string<) :activate-callback nil :help-string "Required packages:\n" :completion-string t)) (setq tmpbuf (get-buffer-create tmpbuf)) (display-buffer tmpbuf) (setq do-select (y-or-n-p "Select these packages? ")) (kill-buffer tmpbuf)) (if do-select (progn (setq pui-selected-packages (union pui-selected-packages dependencies)) (map-extents #'(lambda (extent maparg) (pui-update-package-display extent)) nil nil nil nil nil 'pui) (message "added dependencies")) (clear-message))) (error 'invalid-operation "No packages have been selected!")))) (defun pui-help-echo (extent &optional force-update) "Display additional package info in the modeline. EXTENT determines the package to display (the package information is attached to the extent as properties)." (let (pkg-sym info inst-ver inst-auth-ver auth-ver date maintainer balloon req) (if (or force-update (not (current-message)) (string-match ".*: .*: " (current-message))) (progn (setq pkg-sym (extent-property extent 'pui-package) info (extent-property extent 'pui-info) inst-ver (package-get-key pkg-sym :version) inst-auth-ver (package-get-key pkg-sym :author-version) auth-ver (package-get-info-prop info 'author-version) date (package-get-info-prop info 'date) maintainer (package-get-info-prop info 'maintainer) req (package-get-info-prop info 'requires)) (if (not inst-ver) (setq inst-ver 0)) (if (featurep 'balloon-help) (progn (setq balloon (format " Package Information: [For package: \"%s\"]\n================ Installed Upstream Ver: %s Available Upstream Ver: %s Maintainer : %s Released : %s Required Packages : %s\n\n" pkg-sym inst-auth-ver auth-ver maintainer date req)) (set-extent-property extent 'balloon-help balloon))) (format "Installed upstream ver: %s Available upstream ver: %s" inst-auth-ver auth-ver))))) (defun pui-display-info (&optional no-error event) "Display additional package info in the modeline. Designed to be called interactively (from a keypress)." (interactive) (let (extent) (save-excursion (beginning-of-line) (if (setq extent (extent-at (point) (current-buffer) 'pui)) (message (pui-help-echo extent t)) (if no-error (clear-message nil) (error 'invalid-operation "No package under cursor!")))))) (defun pui-display-maintainer (&optional no-error event) "Display a package's maintainer in the minibuffer." (interactive) (let (extent ;pkg-sym info maintainer) (save-excursion (beginning-of-line) (if (setq extent (extent-at (point) (current-buffer) 'pui)) (progn (setq ;pkg-sym (extent-property extent 'pui-package) info (extent-property extent 'pui-info) maintainer (package-get-info-prop info 'maintainer)) (message (format "Maintainer: %s" maintainer))) (if no-error (clear-message nil) (error 'invalid-operation "No package under cursor!")))))) (defvar pui-menu '("Packages" ["Toggle install " pui-toggle-package-key :active (pui-current-package) :suffix (format "`%s'" (or (pui-current-package) "..."))] ["Toggle delete " pui-toggle-package-delete-key :active (pui-current-package) :suffix (format "`%s'" (or (pui-current-package) "..."))] ["Info on" pui-display-info :active (pui-current-package) :suffix (format "`%s'" (or (pui-current-package) "..."))] "---" ["Add Required" pui-add-required-packages t] ["Install/Remove Selected" pui-install-selected-packages t] "---" ["Verbose" pui-toggle-verbosity-redisplay :active t :style toggle :selected pui-list-verbose] ["Refresh" pui-list-packages t] ["Help" pui-help t] ["Quit" pui-quit t])) ;;; "Why is there no standard function to do this?" (defun pui-popup-context-sensitive (event) (interactive "e") (save-excursion (set-buffer (event-buffer event)) (goto-char (event-point event)) (popup-menu pui-menu event) ;; I agree with dired.el - this is seriously bogus. (while (popup-up-p) (dispatch-event (next-event))))) (defun list-packages-mode () "Symbols in the leftmost column: + The package is marked for installation. - The package has not been installed. D The package has been marked for deletion. * The currently installed package is old, and a newer version is available. Useful keys: `\\[pui-toggle-package-key]' to select/unselect the current package for installation. `\\[pui-toggle-package-delete-key]' to select/unselect the current package for removal. `\\[pui-add-required-packages]' to add any packages required by those selected. `\\[pui-install-selected-packages]' to install/delete selected packages. `\\[pui-display-info]' to display additional information about the package in the minibuffer. `\\[pui-display-maintainer]' to display the package's maintainer in the minibuffer `\\[pui-list-packages]' to refresh the package list. `\\[pui-toggle-verbosity-redisplay]' to toggle between a verbose and non-verbose display. `\\[pui-quit]' to kill this buffer. " (error 'invalid-operation "You cannot enter this mode directly. Use `pui-list-packages'")) (put 'list-packages-mode 'mode-class 'special) ;;;###autoload (defun pui-list-packages () "List all packages and package information. The package name, version, and description are displayed. From the displayed buffer, the user can see which packages are installed, which are not, and which are out-of-date (a newer version is available). The user can then select packages for installation via the keyboard or mouse." (interactive) (package-get-require-base t) (let ((outbuf (get-buffer-create pui-info-buffer)) (sep-string "===============================================================================\n") start) (message "Creating package list ...") (sit-for 0) (set-buffer outbuf) (setq buffer-read-only nil) (buffer-disable-undo outbuf) (erase-buffer outbuf) (kill-all-local-variables) (use-local-map pui-display-keymap) (setq major-mode 'list-packages-mode) (setq mode-name "Packages") (setq truncate-lines t) (unless package-get-remote (insert " Warning: No download sites specified. Package index may be out of date. If you intend to install packages, specify download sites first. ")) (if pui-list-verbose (insert " Latest Installed Package name Vers. Vers. Description ") (insert " Latest Package name Vers. Description ")) (insert sep-string) (setq start (point)) (mapc #'(lambda (pkg) (let (pkg-sym info version desc b e extent current-vers disp) (setq pkg-sym (car pkg) info (package-get-info-version (cdr pkg) nil)) (setq version (package-get-info-prop info 'version) desc (package-get-info-prop info 'description)) (setq disp (pui-package-symbol-char pkg-sym version)) (setq b (point)) (if pui-list-verbose (progn (setq current-vers (package-get-key pkg-sym :version)) (cond ((not current-vers) (setq current-vers "-----")) ((stringp current-vers) (setq current-vers (format "%.2f" (string-to-number current-vers)))) ((numberp current-vers) (setq current-vers (format "%.2f" current-vers)))) (insert (format "%s %-20s %-5.2f %-5s %s\n" (car disp) pkg-sym (if (stringp version) (string-to-number version) version) current-vers desc))) (insert (format "%s %-20s %-5s %s\n" (car disp) pkg-sym version desc))) (save-excursion (setq e (progn (forward-line -1) (end-of-line) (point)))) (setq extent (make-extent b e)) (if (car (cdr disp)) (set-extent-face extent (get-face (car (cdr disp)))) (set-extent-face extent (get-face 'default))) (set-extent-property extent 'highlight t) (set-extent-property extent 'pui t) (set-extent-property extent 'pui-package pkg-sym) (set-extent-property extent 'pui-info info) (set-extent-property extent 'help-echo 'pui-help-echo) (set-extent-property extent 'keymap pui-package-keymap))) (sort (copy-sequence package-get-base) #'(lambda (a b) (string< (symbol-name (car a)) (symbol-name (car b)))))) (insert sep-string) (insert (documentation 'list-packages-mode)) (set-buffer-modified-p nil) (setq buffer-read-only t) (pop-to-buffer outbuf) (delete-other-windows) (goto-char start) (setq pui-selected-packages nil) ; Reset list (setq pui-deleted-packages nil) ; Reset list (when (featurep 'menubar) (set-buffer-menubar current-menubar) (add-submenu '() pui-menu) (setq mode-popup-menu pui-menu)) (clear-message))) ;;;###autoload (defalias 'list-packages 'pui-list-packages) (provide 'package-ui) ;;; package-ui.el ends here