X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-xmas.el;h=b60ba74fc77d00363d72353cab49b2712427bd7a;hb=9e39553b80115a949a7f04ddced4459a7797f8bd;hp=f4977a7b0070a322a7b8f23de720bf0456797321;hpb=a10e1abfc9834048bc0569ca2f61df3dd048669f;p=elisp%2Fwanderlust.git diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el index f4977a7..b60ba74 100644 --- a/wl/wl-xmas.el +++ b/wl/wl-xmas.el @@ -1,8 +1,10 @@ -;;; wl-xmas.el -- Wanderlust modules for XEmacsen. +;;; wl-xmas.el --- Wanderlust modules for XEmacsen. -;; Copyright 1998,1999,2000 Yuuichi Teranishi +;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi +;; Copyright (C) 2000 Katsumi Yamaoka ;; Author: Yuuichi Teranishi +;; Katsumi Yamaoka ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). @@ -41,11 +43,13 @@ (add-hook 'wl-folder-mode-hook 'wl-setup-folder) (add-hook 'wl-folder-mode-hook 'wl-folder-init-icons) -(add-hook 'wl-make-plugged-hook 'wl-biff-init-icons) -(add-hook 'wl-make-plugged-hook 'wl-plugged-init-icons) +(add-hook 'wl-init-hook 'wl-biff-init-icons) +(add-hook 'wl-init-hook 'wl-plugged-init-icons) (add-hook 'wl-summary-mode-hook 'wl-setup-summary) +(add-hook 'wl-message-display-internal-hook 'wl-setup-message) + (defvar wl-use-toolbar (if (featurep 'toolbar) 'default-toolbar nil)) (defvar wl-plugged-glyph nil) (defvar wl-unplugged-glyph nil) @@ -133,7 +137,7 @@ "The Draft buffer toolbar.") (defun wl-xmas-setup-toolbar (bar) - (let ((dir wl-icon-dir) + (let ((dir wl-icon-directory) icon up down disabled name) (when dir (while bar @@ -158,7 +162,7 @@ (when wl-highlight-folder-with-icon (set-glyph-image glyph (vector 'xpm :file (expand-file-name - icon-file wl-icon-dir)) + icon-file wl-icon-directory)) locale tag-set 'prepend)) glyph)) @@ -175,18 +179,18 @@ (set-specifier (symbol-value wl-use-toolbar) (cons (current-buffer) wl-summary-toolbar)))) - (defsubst wl-xmas-setup-message-toolbar () - (and wl-use-toolbar - (wl-xmas-setup-toolbar wl-message-toolbar) - (set-specifier (symbol-value wl-use-toolbar) - (cons (current-buffer) wl-message-toolbar)))) - (defsubst wl-xmas-setup-draft-toolbar () (and wl-use-toolbar (wl-xmas-setup-toolbar wl-draft-toolbar) (set-specifier (symbol-value wl-use-toolbar) (cons (current-buffer) wl-draft-toolbar))))) +(defun wl-xmas-setup-message-toolbar () + (and wl-use-toolbar + (wl-xmas-setup-toolbar wl-message-toolbar) + (set-specifier (symbol-value wl-use-toolbar) + (cons (current-buffer) wl-message-toolbar)))) + (defvar wl-folder-toggle-icon-list '((wl-folder-opened-glyph . wl-opened-group-folder-icon) (wl-folder-closed-glyph . wl-closed-group-folder-icon))) @@ -282,13 +286,13 @@ ((string= fld-name wl-queue-folder);; queue folder (get 'wl-folder-queue-glyph 'glyph)) (;; and one of many other folders - (setq type (elmo-folder-get-type fld-name)) + (setq type (elmo-folder-type fld-name)) (get (intern (format "wl-folder-%s-glyph" type)) 'glyph)))))) (let ((end (point-at-eol))) (when wl-use-highlight-mouse-line (put-text-property start end 'mouse-face 'highlight)) (let ((text-face - (if (looking-at (format "^[ \t]*\\(%s\\|%s\\)" + (if (looking-at (format "^[ \t]*\\(?:%s\\|%s\\)" wl-folder-unsubscribe-mark wl-folder-removed-mark)) 'wl-highlight-folder-killed-face @@ -348,7 +352,7 @@ (put-text-property 0 len 'begin-glyph (get 'wl-folder-queue-glyph 'glyph) string) - (if (setq type (elmo-folder-get-type folder)) + (if (setq type (elmo-folder-type folder)) (put-text-property 0 len 'begin-glyph (get (intern (format "wl-folder-%s-glyph" type)) @@ -358,21 +362,23 @@ (defvar wl-folder-internal-icon-list ;; alist of (glyph . icon-file) - '((wl-folder-nntp-glyph . wl-nntp-folder-icon) - (wl-folder-imap4-glyph . wl-imap-folder-icon) - (wl-folder-pop3-glyph . wl-pop-folder-icon) - (wl-folder-localdir-glyph . wl-localdir-folder-icon) - (wl-folder-localnews-glyph . wl-localnews-folder-icon) - (wl-folder-internal-glyph . wl-internal-folder-icon) - (wl-folder-multi-glyph . wl-multi-folder-icon) - (wl-folder-filter-glyph . wl-filter-folder-icon) - (wl-folder-archive-glyph . wl-archive-folder-icon) - (wl-folder-pipe-glyph . wl-pipe-folder-icon) - (wl-folder-maildir-glyph . wl-maildir-folder-icon) - (wl-folder-trash-empty-glyph . wl-empty-trash-folder-icon) - (wl-folder-draft-glyph . wl-draft-folder-icon) - (wl-folder-queue-glyph . wl-queue-folder-icon) - (wl-folder-trash-glyph . wl-trash-folder-icon))) + '((wl-folder-nntp-glyph . wl-nntp-folder-icon) + (wl-folder-imap4-glyph . wl-imap-folder-icon) + (wl-folder-pop3-glyph . wl-pop-folder-icon) + (wl-folder-localdir-glyph . wl-localdir-folder-icon) + (wl-folder-localnews-glyph . wl-localnews-folder-icon) + (wl-folder-internal-glyph . wl-internal-folder-icon) + (wl-folder-multi-glyph . wl-multi-folder-icon) + (wl-folder-filter-glyph . wl-filter-folder-icon) + (wl-folder-archive-glyph . wl-archive-folder-icon) + (wl-folder-pipe-glyph . wl-pipe-folder-icon) + (wl-folder-maildir-glyph . wl-maildir-folder-icon) + (wl-folder-nmz-glyph . wl-nmz-folder-icon) + (wl-folder-shimbun-glyph . wl-shimbun-folder-icon) + (wl-folder-trash-empty-glyph . wl-empty-trash-folder-icon) + (wl-folder-draft-glyph . wl-draft-folder-icon) + (wl-folder-queue-glyph . wl-queue-folder-icon) + (wl-folder-trash-glyph . wl-trash-folder-icon))) (defun wl-folder-init-icons () (dolist (icon wl-folder-internal-icon-list) @@ -434,17 +440,19 @@ (set-specifier scrollbar-height (cons (current-buffer) 0))) (wl-xmas-setup-summary-toolbar)) -(defun wl-message-overload-functions () - (wl-xmas-setup-message-toolbar) - (local-set-key "l" 'wl-message-toggle-disp-summary) - (local-set-key 'button2 'wl-message-refer-article-or-url) - (local-set-key 'button4 'wl-message-wheel-down) - (local-set-key 'button5 'wl-message-wheel-up) - (local-set-key [(shift button4)] 'wl-message-wheel-down) - (local-set-key [(shift button5)] 'wl-message-wheel-up) - (set-keymap-parent wl-message-button-map (current-local-map)) - (define-key wl-message-button-map 'button2 - 'wl-message-button-dispatcher)) +(defalias 'wl-setup-message 'wl-xmas-setup-message-toolbar) + +(defun wl-message-define-keymap () + (let ((keymap (make-sparse-keymap))) + (define-key keymap "l" 'wl-message-toggle-disp-summary) + (define-key keymap 'button4 'wl-message-wheel-down) + (define-key keymap 'button5 'wl-message-wheel-up) + (define-key keymap [(shift button4)] 'wl-message-wheel-down) + (define-key keymap [(shift button5)] 'wl-message-wheel-up) + (set-keymap-parent wl-message-button-map keymap) + (define-key wl-message-button-map 'button2 + 'wl-message-button-dispatcher) + keymap)) (defun wl-message-wheel-up (event) (interactive "e") @@ -493,7 +501,6 @@ Special commands: (defun wl-draft-key-setup () (define-key wl-draft-mode-map "\C-c\C-y" 'wl-draft-yank-original) (define-key wl-draft-mode-map "\C-c\C-s" 'wl-draft-send) - (define-key wl-draft-mode-map "\C-c\C-a" 'wl-draft-insert-x-face-field) (define-key wl-draft-mode-map "\C-c\C-c" 'wl-draft-send-and-exit) (define-key wl-draft-mode-map "\C-c\C-z" 'wl-draft-save-and-exit) (define-key wl-draft-mode-map "\C-c\C-k" 'wl-draft-kill) @@ -506,16 +513,30 @@ Special commands: (define-key wl-draft-mode-map "\C-c\C-j" 'wl-template-select) (define-key wl-draft-mode-map "\C-c\C-p" 'wl-draft-preview-message) (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save) + (define-key wl-draft-mode-map "\C-c\C-a" 'wl-addrmgr) (define-key wl-draft-mode-map "\C-xk" 'wl-draft-mimic-kill-buffer)) (defun wl-draft-overload-functions () (wl-mode-line-buffer-identification) - (local-set-key "\C-c\C-s" 'wl-draft-send);; override + ;; (local-set-key "\C-c\C-s" 'wl-draft-send);; override (wl-xmas-setup-draft-toolbar) (wl-draft-overload-menubar)) (defalias 'wl-defface 'defface) +(defun wl-read-event-char () + "Get the next event." + (let ((event (next-command-event))) + (sit-for 0) + ;; We junk all non-key events. Is this naughty? + (while (not (or (key-press-event-p event) + (button-press-event-p event))) + (dispatch-event event) + (setq event (next-command-event))) + (cons (and (key-press-event-p event) + (event-to-character event)) + event))) + (require 'product) (product-provide (provide 'wl-xmas) (require 'wl-version))