;;; gnus-xmas.el --- Gnus functions for XEmacs
-;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; This file is part of GNU Emacs.
:group 'gnus)
(defcustom gnus-xmas-glyph-directory nil
- "*Directory where Gnus logos and icons are located.
+ "Directory where Gnus logos and icons are located.
If this variable is nil, Gnus will try to locate the directory
automatically."
:type '(choice (const :tag "autodetect" nil)
(september "#bf9900" "#ffcc00"))
"Color alist used for the Gnus logo.")
-(defcustom gnus-xmas-logo-color-style 'flame
- "Color styles used for the Gnus logo."
+(defcustom gnus-xmas-logo-color-style 'moss
+ "*Color styles used for the Gnus logo."
:type '(choice (const flame) (const pine) (const moss)
(const irish) (const sky) (const tin)
(const velvet) (const grape) (const labia)
"Colors used for the Gnus logo.")
(defcustom gnus-article-x-face-command
- (if (featurep 'xface)
+ (if (or (featurep 'xface)
+ (featurep 'xpm))
'gnus-xmas-article-display-xface
"{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | xv -quit -")
- "String or function to be executed to display an X-Face header.
+ "*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))
(if (stringp buffer)
nil
(map-extents (lambda (extent ignored)
- (remove-text-properties
- start end
- (list (extent-property extent 'text-prop) nil)
- buffer))
- buffer start end nil nil 'text-prop)
+ (remove-text-properties
+ start end
+ (list (extent-property extent 'text-prop) nil)
+ buffer)
+ nil)
+ buffer start end nil nil 'text-prop)
(gnus-add-text-properties start end props buffer)))
(defun gnus-xmas-highlight-selected-summary ()
gnus-summary-selected-face)))
(defcustom gnus-xmas-force-redisplay nil
- "If non-nil, force a redisplay before recentering the summary buffer.
+ "*If non-nil, force a redisplay before recentering the summary buffer.
This is ugly, but it works around a bug in `window-displayed-height'."
:type 'boolean
:group 'gnus-xmas)
;; selective display).
(aset table ?\n nil)
(aset table ?\r nil)
+ ;; We keep TAB as well.
+ (aset table ?\t nil)
;; We nix out any glyphs over 126 below ctl-arrow.
(let ((i (if (integerp ctl-arrow) ctl-arrow 160)))
(while (>= (setq i (1- i)) 127)
- (aset table i [??])))
+ (unless (aref table i)
+ (aset table i [??]))))
;; Can't use `set-specifier' because of a bug in 19.14 and earlier
(add-spec-to-specifier current-display-table table (current-buffer) nil)))
(funcall fun data))))
(defun gnus-xmas-move-overlay (extent start end &optional buffer)
- (set-extent-endpoints extent start end))
+ (set-extent-endpoints extent start end buffer))
+
+(defun gnus-xmas-kill-all-overlays ()
+ "Delete all extents in the current buffer."
+ (map-extents (lambda (extent ignore)
+ (delete-extent extent)
+ nil)))
;; Fixed by Christopher Davis <ckd@loiosh.kei.com>.
(defun gnus-xmas-article-add-button (from to fun &optional data)
(gnus-xmas-menu-add binary
gnus-binary-menu))
+(defun gnus-xmas-agent-summary-menu-add ()
+ (gnus-xmas-menu-add agent-summary
+ gnus-agent-summary-menu))
+
+(defun gnus-xmas-agent-group-menu-add ()
+ (gnus-xmas-menu-add agent-group
+ gnus-agent-group-menu))
+
+(defun gnus-xmas-agent-server-menu-add ()
+ (gnus-xmas-menu-add agent-server
+ gnus-agent-server-menu))
+
(defun gnus-xmas-tree-menu-add ()
(gnus-xmas-menu-add tree
gnus-tree-menu))
+(defun gnus-xmas-draft-menu-add ()
+ (gnus-xmas-menu-add draft
+ gnus-draft-menu))
+
(defun gnus-xmas-server-menu-add ()
(gnus-xmas-menu-add menu
gnus-server-server-menu gnus-server-connections-menu))
(event-to-character event))
event)))
-(defun gnus-xmas-group-remove-excess-properties ()
- (let ((end (point))
- (beg (progn (forward-line -1) (point))))
- (remove-text-properties (1+ beg) end '(gnus-group nil))
- (remove-text-properties
- beg end
- '(gnus-topic nil gnus-topic-level nil gnus-topic-visible nil))
- (goto-char end)
- (map-extents
- (lambda (e ma)
- (set-extent-property e 'start-closed t))
- (current-buffer) beg end)))
-
-(defun gnus-xmas-topic-remove-excess-properties ()
- (let ((end (point))
- (beg (progn (forward-line -1) (point))))
- (remove-text-properties beg end '(gnus-group nil gnus-unread nil))
- (remove-text-properties (1+ beg) end '(gnus-topic nil))
- (goto-char end)))
-
(defun gnus-xmas-seconds-since-epoch (date)
"Return a floating point number that says how many seconds have lapsed between Jan 1 12:00:00 1970 and DATE."
(let* ((tdate (mapcar (lambda (ti) (and ti (string-to-int ti)))
(fset 'gnus-characterp 'characterp)))
(fset 'gnus-make-overlay 'make-extent)
+ (fset 'gnus-delete-overlay 'delete-extent)
(fset 'gnus-overlay-put 'set-extent-property)
(fset 'gnus-move-overlay 'gnus-xmas-move-overlay)
(fset 'gnus-overlay-end 'extent-end-position)
+ (fset 'gnus-kill-all-overlays 'gnus-xmas-kill-all-overlays)
(fset 'gnus-extent-detached-p 'extent-detached-p)
(fset 'gnus-add-text-properties 'gnus-xmas-add-text-properties)
(fset 'gnus-put-text-property 'gnus-xmas-put-text-property)
+ (fset 'gnus-deactivate-mark 'ignore)
+ (fset 'gnus-window-edges 'window-pixel-edges)
- (require 'text-props)
(if (and (<= emacs-major-version 19)
(< emacs-minor-version 14))
(fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
(defun gnus-byte-code (func)
"Return a form that can be `eval'ed based on FUNC."
- (let ((fval (symbol-function func)))
+ (let ((fval (indirect-function func)))
(if (compiled-function-p fval)
(list 'funcall fval)
(cons 'progn (cdr (cdr fval))))))
(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))
+ 'gnus-xmas-switch-horizontal-scrollbar-off)
+ (add-hook 'gnus-tree-mode-hook 'gnus-xmas-switch-horizontal-scrollbar-off))
;;; XEmacs logo and toolbar.
(let* ((logo-xpm (expand-file-name "gnus.xpm" gnus-xmas-glyph-directory))
(logo-xbm (expand-file-name "gnus.xbm" gnus-xmas-glyph-directory))
(glyph (make-glyph
- (list
- (vector 'xpm
- ':file logo-xpm
- ':color-symbols
- `(("thing" . ,(car gnus-xmas-logo-colors))
- ("shadow" . ,(cadr gnus-xmas-logo-colors))
- ("background" . ,(face-background 'default))))
- (vector 'xbm :file logo-xbm)
- (vector 'nothing)))))
+ (cond ((featurep 'xpm)
+ `[xpm
+ :file ,logo-xpm
+ :color-symbols
+ (("thing" . ,(car gnus-xmas-logo-colors))
+ ("shadow" . ,(cadr gnus-xmas-logo-colors))
+ ("background" . ,(face-background 'default)))])
+ ((featurep 'xbm)
+ `[xbm :file ,logo-xbm])
+ (t [nothing])))))
(insert " ")
(set-extent-begin-glyph (make-extent (point) (point)) glyph)
(goto-char (point-min))
(while (not (eobp))
(insert (make-string (/ (max (- (window-width) (or x 35)) 0) 2)
?\ ))
- (forward-line 1)))
+ (forward-line 1))
+ (setq gnus-simple-splash nil))
(goto-char (point-min))
(let* ((pheight (+ 20 (count-lines (point-min) (point-max))))
(wheight (window-height))
[gnus-summary-save-article
gnus-summary-save-article t "Save article"]
[gnus-uu-post-news
- gnus-uu-post-news t "Post an uuencoded article"]
+ gnus-uu-post-news t "Post a uuencoded article"]
[gnus-summary-cancel-article
gnus-summary-cancel-article t "Cancel article"]
[gnus-summary-catchup
"Display any XFace headers in the current article."
(save-excursion
(let ((xface-glyph
- (if (featurep 'xface)
- (make-glyph (vector 'xface :data
- (concat "X-Face: "
- (buffer-substring beg end))))
- (let ((cur (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))))))))
+ (cond ((featurep 'xface)
+ (make-glyph (vector 'xface :data
+ (concat "X-Face: "
+ (buffer-substring beg end)))))
+ ((featurep 'xpm)
+ (let ((cur (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))))))
+ (t
+ (make-glyph [nothing]))))
+ (ext (make-extent (progn
+ (goto-char (point-min))
+ (re-search-forward "^From:" nil t)
+ (point))
+ (1+ (point)))))
(set-glyph-face xface-glyph 'gnus-x-face)
- (goto-char (point-min))
- (re-search-forward "^From:" nil t)
- (set-extent-begin-glyph
- (make-extent (point) (1+ (point))) xface-glyph))))
+ (set-extent-begin-glyph ext xface-glyph)
+ (set-extent-property ext 'duplicable t))))
;;(defvar gnus-xmas-pointer-glyph
;; (progn
(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))
+ gnus-xmas-glyph-directory))
(file-xbm (expand-file-name "gnus-pointer.xbm"
- gnus-xmas-glyph-directory))
+ gnus-xmas-glyph-directory))
(glyph (make-glyph
- (list
- ;; Let's try a nifty XPM
- (vector 'xpm ':file file-xpm)
- ;; Then a not-so-nifty XBM
- (vector 'xbm ':file file-xbm)
- ;; Then the simple string
- (vector 'string ':data "Gnus:")))))
+ ;; Gag gag gag.
+ (cond ((featurep 'xpm)
+ ;; Let's try a nifty XPM
+ `[xpm :file ,file-xpm])
+ ((featurep 'xbm)
+ ;; Then a not-so-nifty XBM
+ [xbm :file ,file-xbm])
+ ;; Then the simple string
+ (t [string :data "Gnus:"])))))
(set-glyph-face glyph 'modeline-buffer-id)
glyph)))
projects / gnus / blobdiff