;;; gnus-xmas.el --- Gnus functions for XEmacs
-;; Copyright (C) 1995,96 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
;; Keywords: news
;;; Code:
(require 'text-props)
-(eval-when-compile (require 'cl))
-(defvar menu-bar-mode t)
-(require 'message-xmas)
+(defvar menu-bar-mode (featurep 'menubar))
+(require 'messagexmas)
(defvar gnus-xmas-glyph-directory nil
"*Directory where Gnus logos and icons are located.
If this variable is nil, Gnus will try to locate the directory
automatically.")
-;;; Internal variables.
+(defvar gnus-xmas-logo-color-alist
+ '((flame "#cc3300" "#ff2200")
+ (pine "#c0cc93" "#f8ffb8")
+ (moss "#a1cc93" "#d2ffb8")
+ (irish "#04cc90" "#05ff97")
+ (sky "#049acc" "#05deff")
+ (tin "#6886cc" "#82b6ff")
+ (velvet "#7c68cc" "#8c82ff")
+ (grape "#b264cc" "#cf7df")
+ (labia "#cc64c2" "#fd7dff")
+ (berry "#cc6485" "#ff7db5")
+ (neutral "#b4b4b4" "#878787")
+ (september "#bf9900" "#ffcc00"))
+ "Color alist used for the Gnus logo.")
+
+(defvar gnus-xmas-logo-color-style 'flame
+ "Color styles used for the Gnus logo.")
+
+(defvar gnus-xmas-logo-colors
+ (cdr (assq gnus-xmas-logo-color-style gnus-xmas-logo-color-alist))
+ "Colors used for the Gnus logo.")
+
+(defvar gnus-article-x-face-command
+ (if (featurep 'xface)
+ '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.
+If it is a string, the command will be executed in a sub-shell
+asynchronously. The compressed face will be piped to this command.")
-(defvar gnus-xmas-logo (make-glyph (make-specifier 'image)))
+;;; Internal variables.
;; Don't warn about these undefined variables.
(defvar gnus-article-treatment-menu)
(defvar gnus-mouse-2)
(defvar standard-display-table)
+(defvar gnus-tree-minimize-window)
(defun gnus-xmas-set-text-properties (start end props &optional buffer)
"You should NEVER use this function. It is ideologically blasphemous.
It is provided only to ease porting of broken FSF Emacs programs."
- (if (stringp buffer)
+ (if (stringp buffer)
nil
(map-extents (lambda (extent ignored)
- (remove-text-properties
+ (remove-text-properties
start end
(list (extent-property extent 'text-prop) nil)
buffer))
buffer start end nil nil 'text-prop)
- (add-text-properties start end props buffer)))
+ (gnus-add-text-properties start end props buffer)))
(defun gnus-xmas-highlight-selected-summary ()
;; Highlight selected article in summary buffer
- (if gnus-summary-selected-face
- (progn
- (if gnus-newsgroup-selected-overlay
- (delete-extent gnus-newsgroup-selected-overlay))
- (setq gnus-newsgroup-selected-overlay
- (make-extent (gnus-point-at-bol) (gnus-point-at-eol)))
- (set-extent-face gnus-newsgroup-selected-overlay
- gnus-summary-selected-face))))
+ (when gnus-summary-selected-face
+ (when gnus-newsgroup-selected-overlay
+ (delete-extent gnus-newsgroup-selected-overlay))
+ (setq gnus-newsgroup-selected-overlay
+ (make-extent (gnus-point-at-bol) (gnus-point-at-eol)))
+ (set-extent-face gnus-newsgroup-selected-overlay
+ gnus-summary-selected-face)))
+
+(defvar gnus-xmas-force-redisplay nil
+ "If non-nil, force a redisplay before recentering the summary buffer.
+This is ugly, but it works around a bug in `window-displayed-height'.")
+
+(defun gnus-xmas-switch-horizontal-scrollbar-off ()
+ (set-specifier scrollbar-height (cons (current-buffer) 0)))
(defun gnus-xmas-summary-recenter ()
- "Center point in the summary window.
+ "\"Center\" point in the summary window.
If `gnus-auto-center-summary' is nil, or the article buffer isn't
displayed, no centering will be performed."
;; Suggested by earle@mahendo.JPL.NASA.GOV (Greg Earle).
;; Recenter only when requested. Suggested by popovich@park.cs.columbia.edu.
- (let* ((top (cond ((< (window-height) 4) 0)
- ((< (window-height) 7) 1)
- (t 2)))
- (height (- (window-height) 3))
- (bottom (save-excursion (goto-char (point-max))
- (forward-line (- height))
- (point)))
- (window (get-buffer-window (current-buffer))))
- ;; The user has to want it.
- (when gnus-auto-center-summary
+ ;; Force redisplay to get properly computed window height.
+ (when gnus-xmas-force-redisplay
+ (sit-for 0))
+ (when gnus-auto-center-summary
+ (let* ((height (if (fboundp 'window-displayed-height)
+ (window-displayed-height)
+ (- (window-height) 2)))
+ (top (cond ((< height 4) 0)
+ ((< height 7) 1)
+ (t 2)))
+ (bottom (save-excursion (goto-char (point-max))
+ (forward-line (- height))
+ (point)))
+ (window (get-buffer-window (current-buffer))))
(when (get-buffer-window gnus-article-buffer)
- ;; Only do recentering when the article buffer is displayed,
- ;; Set the window start to either `bottom', which is the biggest
- ;; possible valid number, or the second line from the top,
- ;; whichever is the least.
- (set-window-start
- window (min bottom (save-excursion
- (forward-line (- top)) (point)))))
+ ;; Only do recentering when the article buffer is displayed,
+ ;; Set the window start to either `bottom', which is the biggest
+ ;; possible valid number, or the second line from the top,
+ ;; whichever is the least.
+ (set-window-start
+ window (min bottom (save-excursion (forward-line (- top)) (point)))))
;; Do horizontal recentering while we're at it.
(when (and (get-buffer-window (current-buffer) t)
(not (eq gnus-auto-center-summary 'vertical)))
(gnus-horizontal-recenter)
(select-window selected))))))
-(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)))
-
-(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))
- (goto-char end)))
+(defun gnus-xmas-add-hook (hook function &optional append local)
+ (add-hook hook function))
+
+(defun gnus-xmas-add-text-properties (start end props &optional object)
+ (add-text-properties start end props object)
+ (put-text-property start end 'start-closed nil object))
+
+(defun gnus-xmas-put-text-property (start end prop value &optional object)
+ (put-text-property start end prop value object)
+ (put-text-property start end 'start-closed nil object))
(defun gnus-xmas-extent-start-open (point)
(map-extents (lambda (extent arg)
(set-extent-property extent 'start-open t))
nil point (min (1+ (point)) (point-max))))
-
-(defun gnus-xmas-copy-article-buffer (&optional article-buffer)
- (setq gnus-article-copy (get-buffer-create " *gnus article copy*"))
- (buffer-disable-undo gnus-article-copy)
- (or (memq gnus-article-copy gnus-buffer-list)
- (setq gnus-buffer-list (cons gnus-article-copy gnus-buffer-list)))
- (let ((article-buffer (or article-buffer gnus-article-buffer))
- buf)
- (if (and (get-buffer article-buffer)
- (buffer-name (get-buffer article-buffer)))
- (save-excursion
- (set-buffer article-buffer)
- (widen)
- (setq buf (buffer-substring (point-min) (point-max)))
- (set-buffer gnus-article-copy)
- (erase-buffer)
- (insert (format "%s" buf))))
- gnus-article-copy))
(defun gnus-xmas-article-push-button (event)
"Check text under the mouse pointer for a callback function.
(let* ((pos (event-closest-point event))
(data (get-text-property pos 'gnus-data))
(fun (get-text-property pos 'gnus-callback)))
- (if fun (funcall fun data))))
+ (when fun
+ (funcall fun data))))
(defun gnus-xmas-move-overlay (extent start end &optional buffer)
(set-extent-endpoints extent start end))
;; Fixed by Christopher Davis <ckd@loiosh.kei.com>.
(defun gnus-xmas-article-add-button (from to fun &optional data)
"Create a button between FROM and TO with callback FUN and data DATA."
- (and gnus-article-button-face
- (gnus-overlay-put (gnus-make-overlay from to)
- 'face gnus-article-button-face))
- (add-text-properties
+ (when gnus-article-button-face
+ (gnus-overlay-put (gnus-make-overlay from to)
+ 'face gnus-article-button-face))
+ (gnus-add-text-properties
from to
(nconc
(and gnus-article-mouse-face
(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)))))))
- (if (< bottom-edge next-bottom-edge)
- (progn
- (setq bottom-edge next-bottom-edge)
- (setq lowest-window this-window)))
+ (when (< bottom-edge next-bottom-edge)
+ (setq bottom-edge next-bottom-edge)
+ (setq lowest-window this-window))
(select-window this-window)
- (if (eq last-window this-window)
- (progn
- (select-window lowest-window)
- (setq window-search nil)))))))
+ (when (eq last-window this-window)
+ (select-window lowest-window)
+ (setq window-search nil))))))
(defmacro gnus-xmas-menu-add (type &rest menus)
`(gnus-xmas-menu-add-1 ',type ',menus))
(put 'gnus-xmas-menu-add 'lisp-indent-function 1)
-(put 'gnus-xmas-menu-add 'lisp-indent-hook 1)
(defun gnus-xmas-menu-add-1 (type menus)
(when (and menu-bar-mode
(defun gnus-xmas-summary-menu-add ()
(gnus-xmas-menu-add summary
+ gnus-summary-misc-menu gnus-summary-kill-menu
gnus-summary-article-menu gnus-summary-thread-menu
- gnus-summary-misc-menu gnus-summary-post-menu gnus-summary-kill-menu))
+ gnus-summary-post-menu ))
(defun gnus-xmas-article-menu-add ()
(gnus-xmas-menu-add article
gnus-article-article-menu gnus-article-treatment-menu))
+(defun gnus-xmas-score-menu-add ()
+ (gnus-xmas-menu-add score
+ gnus-score-menu))
+
(defun gnus-xmas-pick-menu-add ()
(gnus-xmas-menu-add pick
gnus-pick-menu))
+(defun gnus-xmas-topic-menu-add ()
+ (gnus-xmas-menu-add topic
+ gnus-topic-menu))
+
(defun gnus-xmas-binary-menu-add ()
(gnus-xmas-menu-add binary
gnus-binary-menu))
(gnus-xmas-menu-add tree
gnus-tree-menu))
+(defun gnus-xmas-server-menu-add ()
+ (gnus-xmas-menu-add menu
+ gnus-server-server-menu gnus-server-connections-menu))
+
+(defun gnus-xmas-browse-menu-add ()
+ (gnus-xmas-menu-add browse
+ gnus-browse-menu))
+
(defun gnus-xmas-grouplens-menu-add ()
(gnus-xmas-menu-add grouplens
gnus-grouplens-menu))
(defun gnus-xmas-read-event-char ()
"Get the next event."
- (let ((event (next-event)))
+ (let ((event (next-command-event)))
+ (sit-for 0)
;; We junk all non-key events. Is this naughty?
- (while (not (key-press-event-p event))
- (setq event (next-event)))
- (cons (and (key-press-event-p event)
- ; (numberp (event-key event))
- (event-to-character event))
+ (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)))
+(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)))
(aref (timezone-parse-date date) 3))))
(edate (mapcar (lambda (ti) (and ti (string-to-int ti)))
(timezone-parse-date "Jan 1 12:00:00 1970")))
- (tday (- (timezone-absolute-from-gregorian
+ (tday (- (timezone-absolute-from-gregorian
(nth 1 tdate) (nth 2 tdate) (nth 0 tdate))
- (timezone-absolute-from-gregorian
+ (timezone-absolute-from-gregorian
(nth 1 edate) (nth 2 edate) (nth 0 edate)))))
(+ (nth 2 ttime)
(* (nth 1 ttime) 60)
(defun gnus-xmas-define ()
(setq gnus-mouse-2 [button2])
- (or (memq 'underline (list-faces))
- (and (fboundp 'make-face)
- (funcall (intern "make-face") 'underline)))
+ (unless (memq 'underline (face-list))
+ (and (fboundp 'make-face)
+ (funcall (intern "make-face") 'underline)))
;; Must avoid calling set-face-underline-p directly, because it
;; is a defsubst in emacs19, and will make the .elc files non
;; portable!
- (or (face-differs-from-default-p 'underline)
- (funcall (intern "set-face-underline-p") 'underline t))
+ (unless (face-differs-from-default-p 'underline)
+ (funcall (intern "set-face-underline-p") 'underline t))
+
+ (cond
+ ((fboundp 'char-or-char-int-p)
+ ;; Handle both types of marks for XEmacs-20.x.
+ (fset 'gnus-characterp 'char-or-char-int-p))
+ ;; V19 of XEmacs, probably.
+ (t
+ (fset 'gnus-characterp 'characterp)))
(fset 'gnus-make-overlay 'make-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-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)
+
(require 'text-props)
- (if (< emacs-minor-version 14)
+ (if (and (<= emacs-major-version 19)
+ (< emacs-minor-version 14))
(fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
- (fset 'nnheader-find-file-noselect 'gnus-xmas-find-file-noselect)
+ (when (fboundp 'turn-off-scroll-in-place)
+ (add-hook 'gnus-article-mode-hook 'turn-off-scroll-in-place))
- (or (boundp 'standard-display-table) (setq standard-display-table nil))
+ (unless (boundp 'standard-display-table)
+ (setq standard-display-table nil))
(defvar gnus-mouse-face-prop 'highlight)
(defun encode-time (sec minute hour day month year &optional zone)
(let ((seconds
(gnus-xmas-seconds-since-epoch
- (timezone-make-arpa-date
+ (timezone-make-arpa-date
year month day (timezone-make-time-string hour minute sec)
zone))))
(list (floor (/ seconds (expt 2 16)))
(round (mod seconds (expt 2 16)))))))
-
+
(defun gnus-byte-code (func)
"Return a form that can be `eval'ed based on FUNC."
(let ((fval (symbol-function func)))
- (if (byte-code-function-p fval)
+ (if (compiled-function-p fval)
(list 'funcall fval)
(cons 'progn (cdr (cdr fval))))))
-
- ;; Fix by "jeff (j.d.) sparkes" <jsparkes@bnr.ca>.
- (defvar gnus-display-type (device-class)
- "A symbol indicating the display Emacs is running under.
-The symbol should be one of `color', `grayscale' or `mono'. If Emacs
-guesses this display attribute wrongly, either set this variable in
-your `~/.emacs' or set the resource `Emacs.displayType' in your
-`~/.Xdefaults'. See also `gnus-background-mode'.
-This is a meta-variable that will affect what default values other
-variables get. You would normally not change this variable, but
-pounce directly on the real variables themselves.")
-
-
- (fset 'gnus-x-color-values
+ (fset 'gnus-x-color-values
(if (fboundp 'x-color-values)
'x-color-values
(lambda (color)
(color-instance-rgb-components
- (make-color-instance color)))))
-
- (defvar gnus-background-mode
- (let* ((bg-resource
- (condition-case ()
- (x-get-resource ".backgroundMode" "BackgroundMode" 'string)
- (error nil)))
- (params (frame-parameters))
- (color (condition-case ()
- (or (assq 'background-color params)
- (color-instance-name
- (specifier-instance
- (face-background 'default))))
- (error nil))))
- (cond (bg-resource (intern (downcase bg-resource)))
- ((and color
- (< (apply '+ (gnus-x-color-values color))
- (/ (apply '+ (gnus-x-color-values "white")) 3)))
- 'dark)
- (t 'light)))
- "A symbol indicating the Emacs background brightness.
-The symbol should be one of `light' or `dark'.
-If Emacs guesses this frame attribute wrongly, either set this variable in
-your `~/.emacs' or set the resource `Emacs.backgroundMode' in your
-`~/.Xdefaults'.
-See also `gnus-display-type'.
-
-This is a meta-variable that will affect what default values other
-variables get. You would normally not change this variable, but
-pounce directly on the real variables themselves.")
- )
-
-
+ (make-color-instance color))))))
(defun gnus-xmas-redefine ()
"Redefine lots of Gnus functions for XEmacs."
(fset 'gnus-summary-make-display-table 'ignore)
(fset 'gnus-visual-turn-off-edit-menu 'identity)
- (fset 'gnus-highlight-selected-summary
- 'gnus-xmas-highlight-selected-summary)
(fset 'gnus-summary-recenter 'gnus-xmas-summary-recenter)
- (fset 'gnus-group-remove-excess-properties
- 'gnus-xmas-group-remove-excess-properties)
- (fset 'gnus-topic-remove-excess-properties
- 'gnus-xmas-topic-remove-excess-properties)
(fset 'gnus-extent-start-open 'gnus-xmas-extent-start-open)
- (fset 'gnus-copy-article-buffer 'gnus-xmas-copy-article-buffer)
(fset 'gnus-article-push-button 'gnus-xmas-article-push-button)
(fset 'gnus-article-add-button 'gnus-xmas-article-add-button)
(fset 'gnus-window-top-edge 'gnus-xmas-window-top-edge)
(fset 'gnus-read-event-char 'gnus-xmas-read-event-char)
(fset 'gnus-group-startup-message 'gnus-xmas-group-startup-message)
(fset 'gnus-tree-minimize 'gnus-xmas-tree-minimize)
- (fset 'gnus-appt-select-lowest-window
+ (fset 'gnus-appt-select-lowest-window
'gnus-xmas-appt-select-lowest-window)
(fset 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names)
- (fset 'gnus-make-local-hook 'make-local-variable)
+ (fset 'gnus-add-hook 'gnus-xmas-add-hook)
(fset 'gnus-character-to-event 'character-to-event)
+ (fset 'gnus-mode-line-buffer-identification
+ 'gnus-xmas-mode-line-buffer-identification)
+ (fset 'gnus-key-press-event-p 'key-press-event-p)
+ (fset 'gnus-region-active-p 'region-active-p)
(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)
+ (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-summary-mode-hook 'gnus-xmas-setup-summary-toolbar)
+
+ (add-hook 'gnus-summary-mode-hook 'gnus-xmas-switch-horizontal-scrollbar-off)
+
+ (when (and (<= emacs-major-version 19)
+ (<= emacs-minor-version 13))
+ (setq gnus-article-x-face-too-ugly (when (eq (device-type) 'tty)
+ "."))
+ (fset 'gnus-highlight-selected-summary
+ 'gnus-xmas-highlight-selected-summary)
+ (fset 'gnus-group-remove-excess-properties
+ 'gnus-xmas-group-remove-excess-properties)
+ (fset 'gnus-topic-remove-excess-properties
+ 'gnus-xmas-topic-remove-excess-properties)
+ (fset 'gnus-mode-line-buffer-identification 'identity)
+ (unless (boundp 'shell-command-switch)
+ (setq shell-command-switch "-c"))))
;;; XEmacs logo and toolbar.
;; Insert the message.
(setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
(erase-buffer)
- (let ((file (and gnus-xmas-glyph-directory
- (concat
+ (let ((logo (and gnus-xmas-glyph-directory
+ (concat
(file-name-as-directory gnus-xmas-glyph-directory)
- "gnus.xpm"))))
+ "gnus."
+ (if (featurep 'xpm) "xpm" "xbm"))))
+ (xpm-color-symbols
+ (and (featurep 'xpm)
+ (append `(("thing" ,(car gnus-xmas-logo-colors))
+ ("shadow" ,(cadr gnus-xmas-logo-colors)))
+ xpm-color-symbols))))
(if (and (featurep 'xpm)
(not (equal (device-type) 'tty))
- file (file-exists-p file))
+ logo
+ (file-exists-p logo))
(progn
- (set-glyph-property gnus-xmas-logo 'image file)
- (set-glyph-image gnus-xmas-logo file 'global 'x)
-
+ (setq logo (make-glyph logo))
(insert " ")
- (set-extent-begin-glyph (make-extent (point) (point)) gnus-xmas-logo)
+ (set-extent-begin-glyph (make-extent (point) (point)) logo)
(goto-char (point-min))
(while (not (eobp))
(insert (make-string (/ (max (- (window-width) (or x 35)) 0) 2)
(insert
(format " %s
- _ ___ _ _
- _ ___ __ ___ __ _ ___
- __ _ ___ __ ___
- _ ___ _
- _ _ __ _
- ___ __ _
- __ _
- _ _ _
- _ _ _
- _ _ _
- __ ___
- _ _ _ _
- _ _
- _ _
- _ _
- _
- __
-
-"
+ _ ___ _ _
+ _ ___ __ ___ __ _ ___
+ __ _ ___ __ ___
+ _ ___ _
+ _ _ __ _
+ ___ __ _
+ __ _
+ _ _ _
+ _ _ _
+ _ _ _
+ __ ___
+ _ _ _ _
+ _ _
+ _ _
+ _ _
+ _
+ __
+
+"
""))
;; And then hack it.
- (gnus-indent-rigidly (point-min) (point-max)
+ (gnus-indent-rigidly (point-min) (point-max)
(/ (max (- (window-width) (or x 46)) 0) 2))
(goto-char (point-min))
(forward-line 1)
(insert (make-string (max 0 (* 2 (/ rest 3))) ?\n))))
;; Fontify some.
(goto-char (point-min))
- (and (search-forward "Praxis" nil t)
- (put-text-property (match-beginning 0) (match-end 0) 'face 'bold))
+ (put-text-property (point-min) (point-max) 'face 'gnus-splash-face)
(goto-char (point-min))
- (let* ((mode-string (gnus-group-set-mode-line)))
- (setq mode-line-buffer-identification
- (list (concat gnus-version (substring (car mode-string) 4))))
- (set-buffer-modified-p t))))
+ (setq modeline-buffer-identification
+ (list (concat gnus-version ": *Group*")))
+ (set-buffer-modified-p t)))
;;; The toolbar.
-(defvar gnus-use-toolbar 'default-toolbar
+(defvar gnus-use-toolbar (if (featurep 'toolbar)
+ 'default-toolbar
+ nil)
"*If nil, do not use a toolbar.
If it is non-nil, it must be a toolbar. The five legal values are
`default-toolbar', `top-toolbar', `bottom-toolbar',
`right-toolbar', and `left-toolbar'.")
-(defvar gnus-group-toolbar
- '([gnus-group-exit-icon gnus-group-exit t "Exit Gnus"]
- [gnus-group-kill-group-icon gnus-group-kill-group t "Kill group"]
- [gnus-group-get-new-news-icon gnus-group-get-new-news t "Get new news"]
- [gnus-group-get-new-news-this-group-icon
+(defvar gnus-group-toolbar
+ '([gnus-group-get-new-news gnus-group-get-new-news t "Get new news"]
+ [gnus-group-get-new-news-this-group
gnus-group-get-new-news-this-group t "Get new news in this group"]
- [gnus-group-catchup-current-icon
+ [gnus-group-catchup-current
gnus-group-catchup-current t "Catchup group"]
- [gnus-group-describe-group-icon
- gnus-group-describe-group t "Describe group"])
+ [gnus-group-describe-group
+ gnus-group-describe-group t "Describe group"]
+ [gnus-group-unsubscribe gnus-group-unsubscribe t "Unsubscribe group"]
+ [gnus-group-subscribe gnus-group-subscribe t "Subscribe group"]
+ [gnus-group-kill-group gnus-group-kill-group t "Kill group"]
+ [gnus-group-exit gnus-group-exit t "Exit Gnus"]
+ )
"The group buffer toolbar.")
-(defvar gnus-summary-toolbar
- '([gnus-summary-post-news-icon
+(defvar gnus-summary-toolbar
+ '([gnus-summary-prev-unread
+ gnus-summary-prev-unread-article t "Prev unread article"]
+ [gnus-summary-next-unread
+ gnus-summary-next-unread-article t "Next unread article"]
+ [gnus-summary-post-news
gnus-summary-post-news t "Post an article"]
- [gnus-summary-save-article-file-icon
- gnus-summary-save-article-file t "Save article in file"]
- [gnus-summary-save-article-icon
- gnus-summary-save-article t "Save article"]
- [gnus-summary-reply-icon
- gnus-summary-reply t "Mail a reply"]
- [gnus-summary-reply-with-original-icon
- gnus-summary-reply-with-original t "Mail a reply and yank the original"]
- [gnus-summary-followup-icon
- gnus-summary-followup t "Post a followup"]
- [gnus-summary-followup-with-original-icon
- gnus-summary-followup-with-original t
+ [gnus-summary-followup-with-original
+ gnus-summary-followup-with-original t
"Post a followup and yank the original"]
- [gnus-uu-decode-uu-icon
+ [gnus-summary-followup
+ gnus-summary-followup t "Post a followup"]
+ [gnus-summary-reply-with-original
+ gnus-summary-reply-with-original t "Mail a reply and yank the original"]
+ [gnus-summary-reply
+ gnus-summary-reply t "Mail a reply"]
+ [gnus-summary-caesar-message
+ gnus-summary-caesar-message t "Rot 13"]
+ [gnus-uu-decode-uu
gnus-uu-decode-uu t "Decode uuencoded articles"]
- [gnus-uu-post-news-icon
+ [gnus-summary-save-article-file
+ gnus-summary-save-article-file t "Save article in file"]
+ [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-summary-caesar-message-icon
- gnus-summary-caesar-message t "Rot 13"]
- [gnus-summary-cancel-article-icon
- gnus-summary-cancel-article t "Cancel article"])
+ [gnus-summary-cancel-article
+ gnus-summary-cancel-article t "Cancel article"]
+ [gnus-summary-catchup
+ gnus-summary-catchup t "Catchup"]
+ [gnus-summary-catchup-and-exit
+ gnus-summary-catchup-and-exit t "Catchup and exit"]
+ [gnus-summary-exit gnus-summary-exit t "Exit this summary"]
+ )
"The summary buffer toolbar.")
+(defvar gnus-summary-mail-toolbar
+ '(
+ [gnus-summary-prev-unread
+ gnus-summary-prev-unread-article t "Prev unread article"]
+ [gnus-summary-next-unread
+ gnus-summary-next-unread-article t "Next unread article"]
+ [gnus-summary-mail-reply gnus-summary-reply t "Reply"]
+; [gnus-summary-mail-get gnus-mail-get t "Message get"]
+ [gnus-summary-mail-originate gnus-summary-post-news t "Originate"]
+ [gnus-summary-mail-save gnus-summary-save-article t "Save"]
+ [gnus-summary-mail-copy gnus-summary-copy-article t "Copy message"]
+; [gnus-summary-mail-delete gnus-summary-delete-article t "Delete message"]
+ [gnus-summary-mail-forward gnus-summary-mail-forward t "Forward message"]
+; [gnus-summary-mail-spell gnus-mail-spell t "Spell"]
+; [gnus-summary-mail-help gnus-mail-help t "Message help"]
+ [gnus-summary-caesar-message
+ gnus-summary-caesar-message t "Rot 13"]
+ [gnus-uu-decode-uu
+ gnus-uu-decode-uu t "Decode uuencoded articles"]
+ [gnus-summary-save-article-file
+ gnus-summary-save-article-file t "Save article in file"]
+ [gnus-summary-save-article
+ gnus-summary-save-article t "Save article"]
+ [gnus-summary-catchup
+ gnus-summary-catchup t "Catchup"]
+ [gnus-summary-catchup-and-exit
+ gnus-summary-catchup-and-exit t "Catchup and exit"]
+ [gnus-summary-exit gnus-summary-exit t "Exit this summary"]
+ )
+ "The summary buffer mail toolbar.")
+
(defun gnus-xmas-setup-group-toolbar ()
(and gnus-use-toolbar
(message-xmas-setup-toolbar gnus-group-toolbar nil "gnus")
(cons (current-buffer) gnus-group-toolbar))))
(defun gnus-xmas-setup-summary-toolbar ()
- (and gnus-use-toolbar
- (message-xmas-setup-toolbar gnus-summary-toolbar nil "gnus")
- (set-specifier (symbol-value gnus-use-toolbar)
- (cons (current-buffer) gnus-summary-toolbar))))
-
-;; Written by Erik Naggum <erik@naggum.no>.
-;; Saved by Steve Baur <steve@miranova.com>.
-(or (fboundp 'insert-file-contents-literally)
-(defun insert-file-contents-literally (filename &optional visit beg end replace)
- "Like `insert-file-contents', q.v., but only reads in the file.
-A buffer may be modified in several ways after reading into the buffer due
-to advanced Emacs features, such as file-name-handlers, format decoding,
-find-file-hooks, etc.
- This function ensures that none of these modifications will take place."
- (let ( ; (file-name-handler-alist nil)
- (format-alist nil)
- (after-insert-file-functions nil)
- (find-buffer-file-type-function
- (if (fboundp 'find-buffer-file-type)
- (symbol-function 'find-buffer-file-type)
- nil)))
- (unwind-protect
- (progn
- (fset 'find-buffer-file-type (lambda (filename) t))
- (insert-file-contents filename visit beg end replace))
- (if find-buffer-file-type-function
- (fset 'find-buffer-file-type find-buffer-file-type-function)
- (fmakunbound 'find-buffer-file-type))))))
-
-(defun gnus-xmas-find-file-noselect (filename &optional nowarn rawfile)
- "Read file FILENAME into a buffer and return the buffer.
-If a buffer exists visiting FILENAME, return that one, but
-verify that the file has not changed since visited or saved.
-The buffer is not selected, just returned to the caller."
- (setq filename
- (abbreviate-file-name
- (expand-file-name filename)))
- (if (file-directory-p filename)
- (if find-file-run-dired
- (dired-noselect filename)
- (error "%s is a directory." filename))
- (let* ((buf (get-file-buffer filename))
- (truename (abbreviate-file-name (file-truename filename)))
- (number (nthcdr 10 (file-attributes truename)))
- ;; Find any buffer for a file which has same truename.
- (other (and (not buf)
- (if (fboundp 'find-buffer-visiting)
- (find-buffer-visiting filename)
- (get-file-buffer filename))))
- error)
- ;; Let user know if there is a buffer with the same truename.
- (if other
- (progn
- (or nowarn
- (string-equal filename (buffer-file-name other))
- (message "%s and %s are the same file"
- filename (buffer-file-name other)))
- ;; Optionally also find that buffer.
- (if (or (and (boundp 'find-file-existing-other-name)
- find-file-existing-other-name)
- find-file-visit-truename)
- (setq buf other))))
- (if buf
- (or nowarn
- (verify-visited-file-modtime buf)
- (cond ((not (file-exists-p filename))
- (error "File %s no longer exists!" filename))
- ((yes-or-no-p
- (if (string= (file-name-nondirectory filename)
- (buffer-name buf))
- (format
- (if (buffer-modified-p buf)
- "File %s changed on disk. Discard your edits? "
- "File %s changed on disk. Reread from disk? ")
- (file-name-nondirectory filename))
- (format
- (if (buffer-modified-p buf)
- "File %s changed on disk. Discard your edits in %s? "
- "File %s changed on disk. Reread from disk into %s? ")
- (file-name-nondirectory filename)
- (buffer-name buf))))
- (save-excursion
- (set-buffer buf)
- (revert-buffer t t)))))
- (save-excursion
-;;; The truename stuff makes this obsolete.
-;;; (let* ((link-name (car (file-attributes filename)))
-;;; (linked-buf (and (stringp link-name)
-;;; (get-file-buffer link-name))))
-;;; (if (bufferp linked-buf)
-;;; (message "Symbolic link to file in buffer %s"
-;;; (buffer-name linked-buf))))
- (setq buf (create-file-buffer filename))
- ;; (set-buffer-major-mode buf)
- (set-buffer buf)
- (erase-buffer)
- (if rawfile
- (condition-case ()
- (insert-file-contents-literally filename t)
- (file-error
- ;; Unconditionally set error
- (setq error t)))
- (condition-case ()
- (insert-file-contents filename t)
- (file-error
- ;; Run find-file-not-found-hooks until one returns non-nil.
- (or t ; (run-hook-with-args-until-success 'find-file-not-found-hooks)
- ;; If they fail too, set error.
- (setq error t)))))
- ;; Find the file's truename, and maybe use that as visited name.
- (setq buffer-file-truename truename)
- (setq buffer-file-number number)
- ;; On VMS, we may want to remember which directory in a search list
- ;; the file was found in.
- (and (eq system-type 'vax-vms)
- (let (logical)
- (if (string-match ":" (file-name-directory filename))
- (setq logical (substring (file-name-directory filename)
- 0 (match-beginning 0))))
- (not (member logical find-file-not-true-dirname-list)))
- (setq buffer-file-name buffer-file-truename))
- (if find-file-visit-truename
- (setq buffer-file-name
- (setq filename
- (expand-file-name buffer-file-truename))))
- ;; Set buffer's default directory to that of the file.
- (setq default-directory (file-name-directory filename))
- ;; Turn off backup files for certain file names. Since
- ;; this is a permanent local, the major mode won't eliminate it.
- (and (not (funcall backup-enable-predicate buffer-file-name))
- (progn
- (make-local-variable 'backup-inhibited)
- (setq backup-inhibited t)))
- (if rawfile
- nil
- (after-find-file error (not nowarn)))))
- buf)))
+ (let ((bar (if (gnus-news-group-p gnus-newsgroup-name)
+ gnus-summary-toolbar gnus-summary-mail-toolbar)))
+ (and gnus-use-toolbar
+ (message-xmas-setup-toolbar bar nil "gnus")
+ (set-specifier (symbol-value gnus-use-toolbar)
+ (cons (current-buffer) bar)))))
(defun gnus-xmas-mail-strip-quoted-names (address)
"Protect mail-strip-quoted-names from NIL input.
nil
(mail-strip-quoted-names address)))
+(defun gnus-xmas-call-region (command &rest args)
+ (apply
+ 'call-process-region (point-min) (point-max) command t '(t nil) nil
+ args))
+
+(unless (find-face 'gnus-x-face)
+ (copy-face 'default 'gnus-x-face)
+ (set-face-foreground 'gnus-x-face "black")
+ (set-face-background 'gnus-x-face "white"))
+
+(defun gnus-xmas-article-display-xface (beg end)
+ "Display any XFace headers in the current article."
+ (save-excursion
+ (let (xface-glyph)
+ (if (featurep 'xface)
+ (setq xface-glyph
+ (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")
+ (setq xface-glyph
+ (make-glyph
+ (vector 'xpm :data (buffer-string )))))))
+ (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))))
+
+(defvar gnus-xmas-pointer-glyph
+ (progn
+ (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
+ (make-pointer-glyph (concat gnus-xmas-glyph-directory "gnus-pointer."
+ (if (featurep 'xpm) "xpm" "xbm")))))
+
+(defvar gnus-xmas-modeline-left-extent
+ (let ((ext (copy-extent modeline-buffer-id-left-extent)))
+ ;(set-extent-property ext 'pointer gnus-xmas-pointer-glyph)
+ ext))
+
+(defvar gnus-xmas-modeline-right-extent
+ (let ((ext (copy-extent modeline-buffer-id-right-extent)))
+ ;(set-extent-property ext 'pointer gnus-xmas-pointer-glyph)
+ ext))
+
+(defvar gnus-xmas-modeline-glyph
+ (progn
+ (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
+ (let* ((file (concat gnus-xmas-glyph-directory "gnus-pointer."
+ (if (featurep 'xpm) "xpm" "xbm")))
+ (glyph (make-glyph file)))
+ (when (and (featurep 'x)
+ (file-exists-p file))
+ (set-glyph-face glyph 'modeline-buffer-id)
+ (set-glyph-property glyph 'image (cons 'tty "Gnus:"))
+ glyph))))
+
+(defun gnus-xmas-mode-line-buffer-identification (line)
+ (let ((line (car line))
+ chop)
+ (cond
+ ;; This is some weird type of id.
+ ((not (stringp line))
+ (list line))
+ ;; This is non-standard, so we just pass it through.
+ ((not (string-match "^Gnus:" line))
+ (list line))
+ ;; We have a standard line, so we colorize and glyphize it a bit.
+ (t
+ (setq chop (match-end 0))
+ (list
+ (if gnus-xmas-modeline-glyph
+ (cons gnus-xmas-modeline-left-extent gnus-xmas-modeline-glyph)
+ (cons gnus-xmas-modeline-left-extent (substring line 0 chop)))
+ (cons gnus-xmas-modeline-right-extent (substring line chop)))))))
+
+(defun gnus-xmas-splash ()
+ (when (eq (device-type) 'x)
+ (gnus-splash)))
+
+(provide 'gnus-xmas)
+
;;; gnus-xmas.el ends here
projects / gnus / blobdiff