;;; gnus-xmas.el --- Gnus functions for XEmacs
-;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98,99 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.
(require 'text-props)
(defvar menu-bar-mode (featurep 'menubar))
(require 'messagexmas)
+(require 'wid-edit)
(defgroup gnus-xmas nil
"XEmacsoid support for Gnus"
: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)
directory)
:group 'gnus-xmas)
+;;(format "%02x%02x%02x" 114 66 20) "724214"
+
(defvar gnus-xmas-logo-color-alist
'((flame "#cc3300" "#ff2200")
(pine "#c0cc93" "#f8ffb8")
(grape "#b264cc" "#cf7df")
(labia "#cc64c2" "#fd7dff")
(berry "#cc6485" "#ff7db5")
+ (dino "#724214" "#1e3f03")
(neutral "#b4b4b4" "#878787")
(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 'dino
+ "*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))
+ (const berry) (const neutral) (const september)
+ (const dino))
:group 'gnus-xmas)
(defvar gnus-xmas-logo-colors
"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))
(defvar gnus-active-hashtb)
(defvar gnus-article-buffer)
(defvar gnus-auto-center-summary)
-(defvar gnus-buffer-list)
(defvar gnus-current-headers)
(defvar gnus-level-killed)
(defvar gnus-level-zombie)
(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)
(- (window-height) 2)))
(top (cond ((< height 4) 0)
((< height 7) 1)
- (t 2)))
+ (t (if (numberp gnus-auto-center-summary)
+ gnus-auto-center-summary
+ 2))))
(bottom (save-excursion (goto-char (point-max))
(forward-line (- height))
(point)))
;; 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)))
(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))))
(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."
- (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))))
+ (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)))
(defun gnus-xmas-window-top-edge (&optional window)
(nth 1 (window-pixel-edges window)))
(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)))
- (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)
(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))
(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 (symbol-function func)))
+ (let ((fval (indirect-function func)))
(if (compiled-function-p fval)
(list 'funcall fval)
(cons 'progn (cdr (cdr fval))))))
(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)
'gnus-xmas-mode-line-buffer-identification)
(fset 'gnus-key-press-event-p 'key-press-event-p)
(fset 'gnus-region-active-p 'region-active-p)
+ (fset 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p)
+ (fset '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-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-switch-horizontal-scrollbar-off)
+ (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)
- (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"))))
+ (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))
;;; XEmacs logo and toolbar.
;; Insert the message.
(setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
(erase-buffer)
- (let ((logo (and gnus-xmas-glyph-directory
- (concat
- (file-name-as-directory gnus-xmas-glyph-directory)
- "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))
- logo
- (file-exists-p logo))
- (progn
- (setq logo (make-glyph logo))
- (insert " ")
- (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)
- ? ))
- (forward-line 1))
- (goto-char (point-min))
- (let* ((pheight (+ 20 (count-lines (point-min) (point-max))))
- (wheight (window-height))
- (rest (- wheight pheight)))
- (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n))))
-
- (insert
- (format " %s
+ (cond
+ ((and (console-on-window-system-p)
+ (or (featurep 'xpm)
+ (featurep 'xbm)))
+ (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
+ (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))
+ (setq gnus-simple-splash nil))
+ (goto-char (point-min))
+ (let* ((pheight (+ 20 (count-lines (point-min) (point-max))))
+ (wheight (window-height))
+ (rest (- wheight pheight)))
+ (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n))))
+ (t
+ (insert
+ (format " %s
_ ___ _ _
_ ___ __ ___ __ _ ___
__ _ ___ __ ___
__
"
- ""))
- ;; And then hack it.
- (gnus-indent-rigidly (point-min) (point-max)
- (/ (max (- (window-width) (or x 46)) 0) 2))
- (goto-char (point-min))
- (forward-line 1)
- (let* ((pheight (count-lines (point-min) (point-max)))
- (wheight (window-height))
- (rest (- wheight pheight)))
- (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n))))
- ;; Fontify some.
- (goto-char (point-min))
- (put-text-property (point-min) (point-max) 'face 'gnus-splash-face)
+ ""))
+ ;; And then hack it.
+ (gnus-indent-rigidly (point-min) (point-max)
+ (/ (max (- (window-width) (or x 46)) 0) 2))
(goto-char (point-min))
- (setq modeline-buffer-identification
- (list (concat gnus-version ": *Group*")))
- (set-buffer-modified-p t)))
+ (forward-line 1)
+ (let* ((pheight (count-lines (point-min) (point-max)))
+ (wheight (window-height))
+ (rest (- wheight pheight)))
+ (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n)))
+ ;; Paint it.
+ (put-text-property (point-min) (point-max) 'face 'gnus-splash-face)))
+ (setq modeline-buffer-identification
+ (list (concat gnus-version ": *Group*")))
+ (set-buffer-modified-p t))
;;; The toolbar.
[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))))
+ (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)
(gnus-xmas-call-region "icontopbm")
(gnus-xmas-call-region "ppmtoxpm")
(make-glyph
- (vector 'xpm :data (buffer-string))))))))
+ (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))))
-
-(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")))))
+ (set-extent-begin-glyph ext xface-glyph)
+ (set-extent-property ext 'duplicable t))))
(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))))
+ (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))
+ (glyph (make-glyph
+ ;; 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)))
(defun gnus-xmas-mode-line-buffer-identification (line)
(let ((line (car line))
(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))))
+
(provide 'gnus-xmas)
;;; gnus-xmas.el ends here
projects / gnus / blobdiff