;;; 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
(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))
(when gnus-summary-selected-face
(when gnus-newsgroup-selected-overlay
(delete-extent gnus-newsgroup-selected-overlay))
- (setq 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.
If `gnus-auto-center-summary' is nil, or the article buffer isn't
;; Suggested by earle@mahendo.JPL.NASA.GOV (Greg Earle).
;; Recenter only when requested. Suggested by popovich@park.cs.columbia.edu.
;; Force redisplay to get properly computed window height.
- (sit-for 0)
+ (when gnus-xmas-force-redisplay
+ (sit-for 0))
(when gnus-auto-center-summary
(let* ((height (if (fboundp 'window-displayed-height)
(window-displayed-height)
(map-extents (lambda (extent arg)
(set-extent-property extent 'start-open t))
nil point (min (1+ (point)) (point-max))))
-
+
(defun gnus-xmas-article-push-button (event)
"Check text under the mouse pointer for a callback function.
If the text under the mouse pointer has a `gnus-callback' property,
(when gnus-article-button-face
(gnus-overlay-put (gnus-make-overlay from to)
'face gnus-article-button-face))
- (gnus-add-text-properties
+ (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)))))))
(when (< bottom-edge next-bottom-edge)
(setq bottom-edge next-bottom-edge)
(defun gnus-xmas-read-event-char ()
"Get the 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))
+ (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))
+ (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
+ (remove-text-properties
+ beg end
'(gnus-topic nil gnus-topic-level nil gnus-topic-visible nil))
(goto-char end)
- (map-extents
+ (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))))
(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)
(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-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)
- (when (< emacs-minor-version 14)
- (fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
+ (if (and (<= emacs-major-version 19)
+ (< emacs-minor-version 14))
+ (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))
(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)))
(list 'funcall fval)
(cons 'progn (cdr (cdr fval))))))
- (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))))))
-
(defun gnus-xmas-redefine ()
"Redefine lots of Gnus functions for XEmacs."
(fset 'gnus-summary-make-display-table 'ignore)
(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-article-show-hidden-text 'gnus-xmas-article-show-hidden-text)
(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-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)
+
(when (and (<= emacs-major-version 19)
(<= emacs-minor-version 13))
(setq gnus-article-x-face-too-ugly (when (eq (device-type) 'tty)
'gnus-xmas-topic-remove-excess-properties)
(fset 'gnus-mode-line-buffer-identification 'identity)
(unless (boundp 'shell-command-switch)
- (setq shell-command-switch "-c"))
- ))
+ (setq shell-command-switch "-c"))))
;;; XEmacs logo and toolbar.
(setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
(erase-buffer)
(let ((logo (and gnus-xmas-glyph-directory
- (concat
+ (concat
(file-name-as-directory gnus-xmas-glyph-directory)
"gnus."
(if (featurep 'xpm) "xpm" "xbm"))))
- (xpm-color-symbols
+ (xpm-color-symbols
(and (featurep 'xpm)
(append `(("thing" ,(car gnus-xmas-logo-colors))
("shadow" ,(cadr gnus-xmas-logo-colors)))
(insert
(format " %s
- _ ___ _ _
- _ ___ __ ___ __ _ ___
- __ _ ___ __ ___
- _ ___ _
- _ _ __ _
- ___ __ _
- __ _
- _ _ _
- _ _ _
- _ _ _
- __ ___
- _ _ _ _
- _ _
- _ _
- _ _
- _
- __
-
-"
+ _ ___ _ _
+ _ ___ __ ___ __ _ ___
+ __ _ ___ __ ___
+ _ ___ _
+ _ _ __ _
+ ___ __ _
+ __ _
+ _ _ _
+ _ _ _
+ _ _ _
+ __ ___
+ _ _ _ _
+ _ _
+ _ _
+ _ _
+ _
+ __
+
+"
""))
;; And then hack it.
(gnus-indent-rigidly (point-min) (point-max)
(goto-char (point-min))
(put-text-property (point-min) (point-max) 'face 'gnus-splash-face)
(goto-char (point-min))
- (setq modeline-buffer-identification
+ (setq modeline-buffer-identification
(list (concat gnus-version ": *Group*")))
(set-buffer-modified-p t)))
`default-toolbar', `top-toolbar', `bottom-toolbar',
`right-toolbar', and `left-toolbar'.")
-(defvar gnus-group-toolbar
+(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
gnus-group-get-new-news-this-group t "Get new news in this group"]
- [gnus-group-catchup-current
+ [gnus-group-catchup-current
gnus-group-catchup-current t "Catchup group"]
- [gnus-group-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"]
)
"The group buffer toolbar.")
-(defvar gnus-summary-toolbar
- '([gnus-summary-prev-unread
+(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
gnus-summary-next-unread-article t "Next unread article"]
- [gnus-summary-post-news
+ [gnus-summary-post-news
gnus-summary-post-news t "Post an article"]
[gnus-summary-followup-with-original
- gnus-summary-followup-with-original t
+ gnus-summary-followup-with-original t
"Post a followup and yank the original"]
- [gnus-summary-followup
+ [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
gnus-summary-reply t "Mail a reply"]
[gnus-summary-caesar-message
gnus-summary-caesar-message t "Rot 13"]
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
gnus-uu-post-news t "Post an uuencoded article"]
[gnus-summary-cancel-article
gnus-summary-cancel-article t "Cancel article"]
(defvar gnus-summary-mail-toolbar
'(
- [gnus-summary-prev-unread
+ [gnus-summary-prev-unread
gnus-summary-prev-unread-article t "Prev unread article"]
- [gnus-summary-next-unread
+ [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-save-article-file t "Save article in file"]
[gnus-summary-save-article
gnus-summary-save-article t "Save article"]
- [gnus-summary-catchup-and-exit
- gnus-summary-catchup-and-exit t "Catchup and exit"]
[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.")
(let (xface-glyph)
(if (featurep 'xface)
(setq xface-glyph
- (make-glyph (vector 'xface :data
+ (make-glyph (vector 'xface :data
(concat "X-Face: "
(buffer-substring beg end)))))
(let ((cur (current-buffer)))
(set-glyph-face xface-glyph 'gnus-x-face)
(goto-char (point-min))
(re-search-forward "^From:" nil t)
- (set-extent-begin-glyph
+ (set-extent-begin-glyph
(make-extent (point) (1+ (point))) xface-glyph))))
-(defun gnus-xmas-article-show-hidden-text (type &optional hide)
- "Show all hidden text of type TYPE.
-If HIDE, hide the text instead."
- (save-excursion
- (set-buffer gnus-article-buffer)
- (let ((buffer-read-only nil)
- (inhibit-point-motion-hooks t)
- (beg (point-min)))
- (while (gnus-goto-char (text-property-any
- beg (point-max) 'gnus-type type))
- (setq beg (point))
- (forward-char)
- (if hide
- (article-hide-text beg (point) gnus-hidden-properties)
- (article-unhide-text beg (point)))
- (setq beg (point)))
- (save-window-excursion
- (select-window (get-buffer-window (current-buffer)))
- (recenter))
- t)))
-
-(defvar gnus-xmas-pointer-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
+(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
+
+(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))
(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)))
+ (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)
- (if (not (stringp line))
- (list line)
- (when (string-match "^Gnus:" line)
- (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)))))))
+ (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)
projects / gnus / blobdiff