;;; gnus-xmas.el --- Gnus functions for XEmacs
-
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
(require 'text-props)
(defvar menu-bar-mode (featurep 'menubar))
(require 'messagexmas)
-(require 'wid-edit)
(defgroup gnus-xmas nil
"XEmacsoid support for Gnus"
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.")))
+(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.")
+
+(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)
+ (const berry) (const neutral) (const september))
+ :group 'gnus-xmas)
+
+(defvar gnus-xmas-logo-colors
+ (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 | 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."
+ :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 ()
(- (window-height) 2)))
(top (cond ((< height 4) 0)
((< height 7) 1)
- (t (if (numberp gnus-auto-center-summary)
- gnus-auto-center-summary
- 2))))
+ (t 2)))
(bottom (save-excursion (goto-char (point-max))
(forward-line (- height))
(point)))
;; 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.
- ;; NOFORCE parameter suggested by Daniel Pittman <daniel@danann.net>.
(set-window-start
- window (min bottom (save-excursion (forward-line (- top)) (point)))
- t))
+ 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)))
(let* ((pos (event-closest-point event))
(data (get-text-property pos 'gnus-data))
(fun (get-text-property pos 'gnus-callback)))
- (goto-char pos)
(when fun
(funcall fun data))))
(delete-extent extent)
nil)))
+;; 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."
+ (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
+ (list 'mouse-face gnus-article-mouse-face))
+ (list 'gnus-callback fun)
+ (and data (list 'gnus-data data))
+ (list 'highlight t))))
+
(defun gnus-xmas-window-top-edge (&optional window)
(nth 1 (window-pixel-edges window)))
(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-post-menu gnus-article-commands-menu))
+ gnus-article-article-menu gnus-article-treatment-menu))
(defun gnus-xmas-score-menu-add ()
(gnus-xmas-menu-add score
(event-to-character event))
event)))
+(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)))
+ (timezone-parse-date date)))
+ (ttime (mapcar (lambda (ti) (and ti (string-to-int ti)))
+ (timezone-parse-time
+ (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
+ (nth 1 tdate) (nth 2 tdate) (nth 0 tdate))
+ (timezone-absolute-from-gregorian
+ (nth 1 edate) (nth 2 edate) (nth 0 edate)))))
+ (+ (nth 2 ttime)
+ (* (nth 1 ttime) 60)
+ (* (float (nth 0 ttime)) 60 60)
+ (* (float tday) 60 60 24))))
+
(defun gnus-xmas-define ()
(setq gnus-mouse-2 [button2])
- (setq gnus-mouse-3 [button3])
- (setq gnus-widget-button-keymap widget-button-keymap)
(unless (memq 'underline (face-list))
(and (fboundp 'make-face)
(cond
((fboundp 'char-or-char-int-p)
;; Handle both types of marks for XEmacs-20.x.
- (defalias 'gnus-characterp 'char-or-char-int-p))
+ (fset 'gnus-characterp 'char-or-char-int-p))
;; V19 of XEmacs, probably.
(t
- (defalias 'gnus-characterp 'characterp)))
-
- (defalias 'gnus-make-overlay 'make-extent)
- (defalias 'gnus-delete-overlay 'delete-extent)
- (defalias 'gnus-overlay-put 'set-extent-property)
- (defalias 'gnus-move-overlay 'gnus-xmas-move-overlay)
- (defalias 'gnus-overlay-buffer 'extent-object)
- (defalias 'gnus-overlay-start 'extent-start-position)
- (defalias 'gnus-overlay-end 'extent-end-position)
- (defalias 'gnus-kill-all-overlays 'gnus-xmas-kill-all-overlays)
- (defalias 'gnus-extent-detached-p 'extent-detached-p)
- (defalias 'gnus-add-text-properties 'gnus-xmas-add-text-properties)
- (defalias 'gnus-put-text-property 'gnus-xmas-put-text-property)
- (defalias 'gnus-deactivate-mark 'ignore)
- (defalias 'gnus-window-edges 'window-pixel-edges)
-
+ (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)
+
(if (and (<= emacs-major-version 19)
(< emacs-minor-version 14))
- (defalias 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
+ (fset '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))
(defvar gnus-mouse-face-prop 'highlight)
+ (unless (fboundp 'encode-time)
+ (defun encode-time (sec minute hour day month year &optional zone)
+ (let ((seconds
+ (gnus-xmas-seconds-since-epoch
+ (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 (indirect-function func)))
(list 'funcall fval)
(cons 'progn (cdr (cdr fval))))))
- (unless (fboundp 'match-string-no-properties)
- (defalias 'match-string-no-properties 'match-string))
-
- (defalias '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))))))
+ (make-color-instance color)))))
+
+ (when (featurep 'mule)
+ (defun gnus-tilde-pad-form (el pad-width)
+ "Return a form that pads EL to PAD-WIDTH."
+ (let ((pad (abs pad-width)))
+ (if (symbolp el)
+ (if (< pad-width 0)
+ `(let ((val (format "%s" ,el)))
+ (concat val (make-string
+ (max 0 (- ,pad (string-width val))) ?\ )))
+ `(let ((val (format "%s" ,el)))
+ (concat (make-string
+ (max 0 (- ,pad (string-width val))) ?\ )
+ val)))
+ (if (< pad-width 0)
+ `(let ((val (eval ,el)))
+ (concat val (make-string
+ (max 0 (- ,pad (string-width val))) ?\ )))
+ `(let ((val (eval ,el)))
+ (concat (make-string
+ (max 0 (- ,pad (string-width val))) ?\ )
+ val))))))
+ ))
(defun gnus-xmas-redefine ()
"Redefine lots of Gnus functions for XEmacs."
- (defalias 'gnus-summary-set-display-table 'gnus-xmas-summary-set-display-table)
- (defalias 'gnus-visual-turn-off-edit-menu 'identity)
- (defalias 'gnus-summary-recenter 'gnus-xmas-summary-recenter)
- (defalias 'gnus-extent-start-open 'gnus-xmas-extent-start-open)
- (defalias 'gnus-article-push-button 'gnus-xmas-article-push-button)
- (defalias 'gnus-window-top-edge 'gnus-xmas-window-top-edge)
- (defalias 'gnus-read-event-char 'gnus-xmas-read-event-char)
- (defalias 'gnus-group-startup-message 'gnus-xmas-group-startup-message)
- (defalias 'gnus-tree-minimize 'gnus-xmas-tree-minimize)
- (defalias 'gnus-appt-select-lowest-window
+ (fset 'gnus-summary-set-display-table 'gnus-xmas-summary-set-display-table)
+ (fset 'gnus-visual-turn-off-edit-menu 'identity)
+ (fset 'gnus-summary-recenter 'gnus-xmas-summary-recenter)
+ (fset 'gnus-extent-start-open 'gnus-xmas-extent-start-open)
+ (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
'gnus-xmas-appt-select-lowest-window)
- (defalias 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names)
- (defalias 'gnus-character-to-event 'character-to-event)
- (defalias 'gnus-mode-line-buffer-identification
+ (fset 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names)
+ (fset 'gnus-character-to-event 'character-to-event)
+ (fset 'gnus-mode-line-buffer-identification
'gnus-xmas-mode-line-buffer-identification)
- (defalias 'gnus-key-press-event-p 'key-press-event-p)
- (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)
- (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)
- (defalias 'gnus-remove-image 'gnus-xmas-remove-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
+ (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-draft-mode-hook 'gnus-xmas-draft-menu-add)
- (add-hook 'gnus-mailing-list-mode-hook 'gnus-xmas-mailing-list-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)
+
+ (when (featurep 'mule)
+ (defun gnus-truncate-string (str end-column &optional start-column padding)
+ "Truncate string STR to end at column END-COLUMN.
+The optional 2nd arg START-COLUMN, if non-nil, specifies
+the starting column; that means to return the characters occupying
+columns START-COLUMN ... END-COLUMN of STR.
+
+The optional 3rd arg PADDING, if non-nil, specifies a padding character
+to add at the end of the result if STR doesn't reach column END-COLUMN,
+or if END-COLUMN comes in the middle of a character in STR.
+PADDING is also added at the beginning of the result
+if column START-COLUMN appears in the middle of a character in STR.
+
+If PADDING is nil, no padding is added in these cases, so
+the resulting string may be narrower than END-COLUMN.
+\[Emacs 20.3 emulating function]"
+ (or start-column
+ (setq start-column 0))
+ (let ((len (length str))
+ (idx 0)
+ (column 0)
+ (head-padding "") (tail-padding "")
+ ch last-column last-idx from-idx)
+ (condition-case nil
+ (while (< column start-column)
+ (setq ch (aref str idx)
+ column (+ column (char-width ch))
+ idx (1+ idx)))
+ (args-out-of-range (setq idx len)))
+ (if (< column start-column)
+ (if padding (make-string end-column padding) "")
+ (if (and padding (> column start-column))
+ (setq head-padding
+ (make-string (- column start-column) padding)))
+ (setq from-idx idx)
+ (if (< end-column column)
+ (setq idx from-idx)
+ (condition-case nil
+ (while (< column end-column)
+ (setq last-column column
+ last-idx idx
+ ch (aref str idx)
+ column (+ column (char-width ch))
+ idx (1+ idx)))
+ (args-out-of-range (setq idx len)))
+ (if (> column end-column)
+ (setq column last-column idx last-idx))
+ (if (and padding (< column end-column))
+ (setq tail-padding
+ (make-string (- end-column column) padding))))
+ (setq str (substring str from-idx idx))
+ (if padding
+ (concat head-padding str tail-padding)
+ str))))
+
+ (defun gnus-tilde-max-form (el max-width)
+ "Return a form that limits EL to MAX-WIDTH."
+ (let ((max (abs max-width)))
+ (if (symbolp el)
+ (if (< max-width 0)
+ `(let ((width (string-width ,el)))
+ (gnus-truncate-string ,el width (- width ,max)))
+ `(gnus-truncate-string ,el ,max))
+ (if (< max-width 0)
+ `(let* ((val (eval ,el))
+ (width (string-width val)))
+ (gnus-truncate-string val width (- width ,max)))
+ `(let ((val (eval ,el)))
+ (gnus-truncate-string val ,max))))))
+
+ (defun gnus-tilde-cut-form (el cut-width)
+ "Return a form that cuts CUT-WIDTH off of EL."
+ (let ((cut (abs cut-width)))
+ (if (symbolp el)
+ (if (< cut-width 0)
+ `(gnus-truncate-string ,el (- (string-width ,el) ,cut))
+ `(gnus-truncate-string ,el (string-width ,el) ,cut))
+ (if (< cut-width 0)
+ `(let ((val (eval ,el)))
+ (gnus-truncate-string val (- (string-width val) ,cut)))
+ `(let ((val (eval ,el)))
+ (gnus-truncate-string val (string-width val) ,cut))))))
+ ))
;;; 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)
`[xpm
:file ,logo-xpm
:color-symbols
- (("thing" . ,(car gnus-logo-colors))
- ("shadow" . ,(cadr gnus-logo-colors))
+ (("thing" . ,(car gnus-xmas-logo-colors))
+ ("shadow" . ,(cadr gnus-xmas-logo-colors))
("background" . ,(face-background 'default)))])
((featurep 'xbm)
`[xbm :file ,logo-xbm])
'default-toolbar
nil)
"*If nil, do not use a toolbar.
-If it is non-nil, it must be a toolbar. The five valid values are
+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'."
:type '(choice (const default-toolbar)
[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"])
+ [gnus-group-exit gnus-group-exit t "Exit Gnus"]
+ )
"The group buffer toolbar.")
(defvar gnus-summary-toolbar
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"])
+ [gnus-summary-exit gnus-summary-exit t "Exit this summary"]
+ )
"The summary buffer toolbar.")
(defvar gnus-summary-mail-toolbar
[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-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"])
+ [gnus-summary-exit gnus-summary-exit t "Exit this summary"]
+ )
"The summary buffer mail toolbar.")
(defun gnus-xmas-setup-group-toolbar ()
(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 (data)
- "Display the XFace in DATA."
+(defun gnus-xmas-article-display-xface (beg end)
+ "Display any XFace headers in the current article."
(save-excursion
(let ((xface-glyph
- (cond
- ((featurep 'xface)
- (make-glyph (vector 'xface :data
- (concat "X-Face: " data))))
- ((featurep 'xpm)
- (let ((cur (current-buffer)))
- (save-excursion
- (gnus-set-work-buffer)
- (insert data)
- (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])))))
- ;;(set-glyph-face xface-glyph 'gnus-x-face)
-
- (gnus-article-goto-header "from")
- (gnus-put-image xface-glyph " ")
- (gnus-add-wash-type 'xface)
- (gnus-add-image 'xface xface-glyph))))
+ (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)
+ (set-extent-begin-glyph ext xface-glyph)
+ (set-extent-property ext 'duplicable t))))
+
+;;(defvar gnus-xmas-pointer-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-glyph-directory)))
+;; (make-pointer-glyph
+;; (list (vector 'xpm ':file file-xpm)
+;; (vector 'xbm ':file file-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-xpm (expand-file-name "gnus-pointer.xpm"
gnus-xmas-glyph-directory))
(file-xbm (expand-file-name "gnus-pointer.xbm"
`[xpm :file ,file-xpm])
((featurep 'xbm)
;; Then a not-so-nifty XBM
- `[xbm :file ,file-xbm])
+ [xbm :file ,file-xbm])
;; Then the simple string
(t [string :data "Gnus:"])))))
(set-glyph-face glyph 'modeline-buffer-id)
(when (eq (device-type) 'x)
(gnus-splash)))
-(defun gnus-xmas-annotation-in-region-p (b e)
- (or (map-extents (lambda (e u) t) nil b e nil nil 'mm t)
- (if (= b e)
- (eq (cadr (memq 'gnus-undeletable (text-properties-at b))) t)
- (text-property-any b e 'gnus-undeletable t))))
-
-(defun gnus-xmas-mime-button-menu (event)
- "Construct a context-sensitive menu of MIME commands."
- (interactive "e")
- (let ((response (get-popup-menu-response
- `("MIME Part"
- ,@(mapcar (lambda (c) `[,(caddr c) ,(car c) t])
- gnus-mime-button-commands)))))
- (set-buffer (event-buffer event))
- (goto-char (event-point event))
- (funcall (event-function response) (event-object response))))
-
-(defun gnus-group-add-icon ()
- "Add an icon to the current line according to `gnus-group-icon-list'."
- (let* ((p (point))
- (end (progn (end-of-line) (point)))
- ;; now find out where the line starts and leave point there.
- (beg (progn (beginning-of-line) (point))))
- (save-restriction
- (narrow-to-region beg end)
- (goto-char beg)
- (when (search-forward "==&&==" nil t)
- (let* ((group (gnus-group-group-name))
- (entry (gnus-group-entry group))
- (unread (if (numberp (car entry)) (car entry) 0))
- (active (gnus-active group))
- (total (if active (1+ (- (cdr active) (car active))) 0))
- (info (nth 2 entry))
- (method (gnus-server-get-method group (gnus-info-method info)))
- (marked (gnus-info-marks info))
- (mailp (memq 'mail (assoc (symbol-name
- (car (or method gnus-select-method)))
- gnus-valid-select-methods)))
- (level (or (gnus-info-level info) gnus-level-killed))
- (score (or (gnus-info-score info) 0))
- (ticked (gnus-range-length (cdr (assq 'tick marked))))
- (group-age (gnus-group-timestamp-delta group))
- (inhibit-read-only t)
- (list gnus-group-icon-list)
- (mystart (match-beginning 0))
- (myend (match-end 0)))
- (goto-char (point-min))
- (while (and list
- (not (eval (caar list))))
- (setq list (cdr list)))
- (if list
- (let* ((file (cdar list))
- (glyph (gnus-group-icon-create-glyph
- (buffer-substring mystart myend)
- file)))
- (if glyph
- (progn
- (mapcar 'delete-annotation (annotations-at myend))
- (let ((ext (make-extent mystart myend))
- (ant (make-annotation glyph myend 'text)))
- ;; set text extent params
- (set-extent-property ext 'end-open t)
- (set-extent-property ext 'start-open t)
- (set-extent-property ext 'invisible t)))
- (delete-region mystart myend)))
- (delete-region mystart myend))))
- (widen))
- (goto-char p)))
-
-(defun gnus-group-icon-create-glyph (substring pixmap)
- "Create a glyph for insertion into a group line."
- (or
- (cdr-safe (assoc pixmap gnus-group-icon-cache))
- (let* ((glyph (make-glyph
- (list
- (cons 'x
- (expand-file-name pixmap gnus-xmas-glyph-directory))
- (cons 'mswindows
- (expand-file-name pixmap gnus-xmas-glyph-directory))
- (cons 'tty substring)))))
- (setq gnus-group-icon-cache
- (cons (cons pixmap glyph) gnus-group-icon-cache))
- (set-glyph-face glyph 'default)
- glyph)))
-
-(defun gnus-xmas-mailing-list-menu-add ()
- (gnus-xmas-menu-add mailing-list
- gnus-mailing-list-menu))
-
-(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 &optional string)
- (let ((begin (point))
- extent)
- (insert string)
- (setq extent (make-extent begin (point)))
- (set-extent-property extent 'gnus-image t)
- (set-extent-property extent 'duplicable t)
- (set-extent-property extent 'begin-glyph glyph)))
-
-(defun gnus-xmas-remove-image (image)
- (map-extents
- (lambda (ext unused)
- (when (equal (extent-begin-glyph ext) image)
- (set-extent-property ext 'begin-glyph nil))
- nil)
- nil nil nil nil nil 'gnus-image))
-
(provide 'gnus-xmas)
;;; gnus-xmas.el ends here
projects / elisp / gnus.git- / blobdiff