;;; gnus-xmas.el --- Gnus functions for XEmacs
-;; Copyright (C) 1995,96,97,98,99 Free Software Foundation, Inc.
+
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
directory)
:group 'gnus-xmas)
+(unless gnus-xmas-glyph-directory
+ (unless (setq gnus-xmas-glyph-directory
+ (message-xmas-find-glyph-directory "gnus"))
+ (error "Can't find glyph directory. \
+Possibly the `etc' directory has not been installed.")))
+
;;(format "%02x%02x%02x" 114 66 20) "724214"
(defvar gnus-xmas-logo-color-alist
(cdr (assq gnus-xmas-logo-color-style gnus-xmas-logo-color-alist))
"Colors used for the Gnus logo.")
-(defcustom gnus-article-x-face-command
- (if (or (featurep 'xface)
- (featurep 'xpm))
- 'gnus-xmas-article-display-xface
- "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | ee -")
- "*String or function to be executed to display an X-Face header.
-If it is a string, the command will be executed in a sub-shell
-asynchronously. The compressed face will be piped to this command."
- :type '(choice string function))
-
;;; Internal variables.
;; Don't warn about these undefined variables.
-(defvar gnus-group-mode-hook)
-(defvar gnus-summary-mode-hook)
-(defvar gnus-article-mode-hook)
-
;;defined in gnus.el
(defvar gnus-active-hashtb)
(defvar gnus-article-buffer)
(if (stringp buffer)
nil
(map-extents (lambda (extent ignored)
- (remove-text-properties
- start end
- (list (extent-property extent 'text-prop) nil)
- buffer)
+ (remove-text-properties
+ start end
+ (list (extent-property extent 'text-prop) nil)
+ buffer)
nil)
- buffer start end nil nil 'text-prop)
+ buffer start end nil nil 'text-prop)
(gnus-add-text-properties start end props buffer)))
(defun gnus-xmas-highlight-selected-summary ()
;; whichever is the least.
;; NOFORCE parameter suggested by Daniel Pittman <daniel@danann.net>.
(set-window-start
- window (min bottom (save-excursion (forward-line (- top)) (point)))
+ window (min bottom (save-excursion (forward-line (- top)) (point)))
t))
;; Do horizontal recentering while we're at it.
(when (and (get-buffer-window (current-buffer) t)
(defun gnus-xmas-appt-select-lowest-window ()
(let* ((lowest-window (selected-window))
(bottom-edge (car (cdr (cdr (cdr (window-pixel-edges))))))
- (last-window (previous-window))
- (window-search t))
+ (last-window (previous-window))
+ (window-search t))
(while window-search
(let* ((this-window (next-window))
- (next-bottom-edge (car (cdr (cdr (cdr
- (window-pixel-edges
+ (next-bottom-edge (car (cdr (cdr (cdr
+ (window-pixel-edges
this-window)))))))
- (when (< bottom-edge next-bottom-edge)
+ (when (< bottom-edge next-bottom-edge)
(setq bottom-edge next-bottom-edge)
(setq lowest-window this-window))
- (select-window this-window)
- (when (eq last-window this-window)
+ (select-window this-window)
+ (when (eq last-window this-window)
(select-window lowest-window)
(setq window-search nil))))))
(defun gnus-xmas-article-menu-add ()
(gnus-xmas-menu-add article
- gnus-article-article-menu gnus-article-treatment-menu))
+ gnus-article-article-menu gnus-article-treatment-menu
+ gnus-article-post-menu gnus-article-commands-menu))
(defun gnus-xmas-score-menu-add ()
(gnus-xmas-menu-add score
(defalias 'gnus-put-text-property 'gnus-xmas-put-text-property)
(defalias 'gnus-deactivate-mark 'ignore)
(defalias 'gnus-window-edges 'window-pixel-edges)
-
+
(if (and (<= emacs-major-version 19)
(< emacs-minor-version 14))
(defalias 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
- (when (fboundp 'turn-off-scroll-in-place)
- (add-hook 'gnus-article-mode-hook 'turn-off-scroll-in-place))
-
(unless (boundp 'standard-display-table)
(setq standard-display-table nil))
(defalias 'gnus-region-active-p 'region-active-p)
(defalias 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p)
(defalias 'gnus-mime-button-menu 'gnus-xmas-mime-button-menu)
-
- (add-hook 'gnus-group-mode-hook 'gnus-xmas-group-menu-add)
- (add-hook 'gnus-summary-mode-hook 'gnus-xmas-summary-menu-add)
- (add-hook 'gnus-article-mode-hook 'gnus-xmas-article-menu-add)
+ (defalias 'gnus-image-type-available-p 'gnus-xmas-image-type-available-p)
+ (defalias 'gnus-put-image 'gnus-xmas-put-image)
+ (defalias 'gnus-create-image 'gnus-xmas-create-image)
+
+ ;; These ones are not defcutom'ed, sometimes not even defvar'ed. They
+ ;; probably should. If that is done, the code below should then be moved
+ ;; where each variable is defined, in order not to mess with user settings.
+ ;; -- didier
(add-hook 'gnus-score-mode-hook 'gnus-xmas-score-menu-add)
-
- (add-hook 'gnus-pick-mode-hook 'gnus-xmas-pick-menu-add)
- (add-hook 'gnus-topic-mode-hook 'gnus-xmas-topic-menu-add)
- (add-hook 'gnus-tree-mode-hook 'gnus-xmas-tree-menu-add)
(add-hook 'gnus-binary-mode-hook 'gnus-xmas-binary-menu-add)
(add-hook 'gnus-grouplens-mode-hook 'gnus-xmas-grouplens-menu-add)
(add-hook 'gnus-server-mode-hook 'gnus-xmas-server-menu-add)
(add-hook 'gnus-browse-mode-hook 'gnus-xmas-browse-menu-add)
-
- (add-hook 'gnus-group-mode-hook 'gnus-xmas-setup-group-toolbar)
- (add-hook 'gnus-summary-mode-hook 'gnus-xmas-setup-summary-toolbar)
-
- (add-hook 'gnus-agent-summary-mode-hook 'gnus-xmas-agent-summary-menu-add)
- (add-hook 'gnus-agent-group-mode-hook 'gnus-xmas-agent-group-menu-add)
- (add-hook 'gnus-agent-server-mode-hook 'gnus-xmas-agent-server-menu-add)
-
(add-hook 'gnus-draft-mode-hook 'gnus-xmas-draft-menu-add)
- (add-hook 'gnus-summary-mode-hook
- 'gnus-xmas-switch-horizontal-scrollbar-off)
- (add-hook 'gnus-tree-mode-hook 'gnus-xmas-switch-horizontal-scrollbar-off))
+ (add-hook 'gnus-mailing-list-mode-hook 'gnus-xmas-mailing-list-menu-add))
;;; XEmacs logo and toolbar.
(defun gnus-xmas-group-startup-message (&optional x y)
"Insert startup message in current buffer."
;; Insert the message.
- (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
(erase-buffer)
(cond
((and (console-on-window-system-p)
(cons (current-buffer) bar)))))
(defun gnus-xmas-mail-strip-quoted-names (address)
- "Protect mail-strip-quoted-names from NIL input.
+ "Protect mail-strip-quoted-names from nil input.
XEmacs compatibility workaround."
(if (null address)
nil
"Face to show X face"
:group 'gnus-xmas)
-(defun gnus-xmas-article-display-xface (beg end)
- "Display any XFace headers in the current article."
+(defun gnus-xmas-article-display-xface (beg end &optional buffer)
+ "Display any XFace headers in BUFFER."
(save-excursion
(let ((xface-glyph
(cond
((featurep 'xface)
(make-glyph (vector 'xface :data
(concat "X-Face: "
- (buffer-substring beg end)))))
+ (if buffer
+ (with-current-buffer buffer
+ (buffer-substring beg end))
+ (buffer-substring beg end))))))
((featurep 'xpm)
- (let ((cur (current-buffer)))
+ (let ((cur (or buffer (current-buffer))))
(save-excursion
(gnus-set-work-buffer)
- (insert (format "%s" (buffer-substring beg end cur)))
- (gnus-xmas-call-region "uncompface")
- (goto-char (point-min))
- (insert "/* Width=48, Height=48 */\n")
- (gnus-xmas-call-region "icontopbm")
- (gnus-xmas-call-region "ppmtoxpm")
- (make-glyph
- (vector 'xpm :data (buffer-string))))))
+ (insert-buffer-substring cur beg end)
+ (let ((coding-system-for-read 'binary)
+ (coding-system-for-write 'binary))
+ (gnus-xmas-call-region "uncompface")
+ (goto-char (point-min))
+ (insert "/* Width=48, Height=48 */\n")
+ (gnus-xmas-call-region "icontopbm")
+ (gnus-xmas-call-region "ppmtoxpm")
+ (make-glyph
+ (vector 'xpm :data (buffer-string)))))))
(t
(make-glyph [nothing]))))
(ext (make-extent (progn
(defvar gnus-xmas-modeline-glyph
(progn
- (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
(let* ((file-xpm (expand-file-name "gnus-pointer.xpm"
gnus-xmas-glyph-directory))
(file-xbm (expand-file-name "gnus-pointer.xbm"
(gnus-xmas-menu-add mailing-list
gnus-mailing-list-menu))
-(add-hook 'gnus-mailing-list-mode-hook 'gnus-xmas-mailing-list-menu-add)
+(defun gnus-xmas-image-type-available-p (type)
+ (featurep type))
+
+(defun gnus-xmas-create-image (file)
+ (with-temp-buffer
+ (insert-file-contents file)
+ (mm-create-image-xemacs (car (last (split-string file "[.]"))))))
+
+(defun gnus-xmas-put-image (glyph)
+ (let ((annot (make-annotation glyph nil 'text)))
+ (set-extent-property annot 'mm t)
+ (set-extent-property annot 'duplicable t)))
(provide 'gnus-xmas)
projects / gnus / blobdiff