X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-xmas.el;h=6eb65fe225786a67bb37709d1c53f7f6e689a4bd;hb=92590f3fd3b6fce0c7c5dfaf754c095d586051c1;hp=d2a41f3d8862112ac492342ffdcee836716fd3d0;hpb=d12901e0b4585ca9b0a270fbd71c82bb73011712;p=gnus diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index d2a41f3d8..6eb65fe22 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -1,7 +1,7 @@ ;;; gnus-xmas.el --- Gnus functions for XEmacs -;; Copyright (C) 1995,96 Free Software Foundation, Inc. +;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc. -;; Author: Lars Magne Ingebrigtsen +;; Author: Lars Magne Ingebrigtsen ;; Keywords: news ;; This file is part of GNU Emacs. @@ -26,18 +26,27 @@ ;;; Code: (require 'text-props) -(eval-when-compile (require 'cl)) (defvar menu-bar-mode (featurep 'menubar)) (require 'messagexmas) +(require 'wid-edit) -(defvar gnus-xmas-glyph-directory nil - "*Directory where Gnus logos and icons are located. +(defgroup gnus-xmas nil + "XEmacsoid support for Gnus" + :group 'gnus) + +(defcustom 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.") +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") + '((flame "#cc3300" "#ff2200") + (pine "#c0cc93" "#f8ffb8") (moss "#a1cc93" "#d2ffb8") (irish "#04cc90" "#05ff97") (sky "#049acc" "#05deff") @@ -46,24 +55,33 @@ automatically.") (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.") -(defvar gnus-xmas-logo-color-style 'september - "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 dino)) + :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.") -(defvar gnus-article-x-face-command - (if (featurep 'xface) +(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. + "*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.") +asynchronously. The compressed face will be piped to this command." + :type '(choice string function)) ;;; Internal variables. @@ -77,7 +95,6 @@ asynchronously. The compressed face will be piped to this command.") (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) @@ -118,37 +135,49 @@ asynchronously. The compressed face will be piped to this command.") (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 - 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 () ;; Highlight selected article in summary buffer (when gnus-summary-selected-face - (if gnus-newsgroup-selected-overlay - (delete-extent gnus-newsgroup-selected-overlay)) - (setq gnus-newsgroup-selected-overlay + (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))) +(defcustom 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'." + :type 'boolean + :group 'gnus-xmas) + +(defun gnus-xmas-switch-horizontal-scrollbar-off () + (when (featurep 'scrollbar) + (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 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. + ;; 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) - (progn - (sit-for 0) - (window-displayed-height)) + (window-displayed-height) (- (window-height) 2))) (top (cond ((< height 4) 0) ((< height 7) 1) @@ -163,8 +192,7 @@ displayed, no centering will be performed." ;; 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))))) + 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))) @@ -174,8 +202,27 @@ displayed, no centering will be performed." (gnus-horizontal-recenter) (select-window selected)))))) -(defun gnus-xmas-add-hook (hook function &optional append local) - (add-hook hook function)) +(defun gnus-xmas-summary-set-display-table () + ;; Setup the display table -- like `gnus-summary-setup-display-table', + ;; but done in an XEmacsish way. + (let ((table (make-display-table)) + (i 32)) + ;; Nix out all the control chars... + (while (>= (setq i (1- i)) 0) + (aset table i [??])) + ;; ... but not newline and cr, of course. (cr is necessary for the + ;; 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) + (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))) (defun gnus-xmas-add-text-properties (start end props &optional object) (add-text-properties start end props object) @@ -189,24 +236,6 @@ displayed, no centering will be performed." (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. @@ -217,18 +246,25 @@ call it with the value of the `gnus-data' text property." (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)) + (set-extent-endpoints extent start end buffer)) + +(defun gnus-xmas-kill-all-overlays () + "Delete all extents in the current buffer." + (map-extents (lambda (extent ignore) + (delete-extent extent) + nil))) ;; Fixed by Christopher Davis . (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)) - (gnus-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 @@ -266,24 +302,21 @@ call it with the value of the `gnus-data' text property." (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 @@ -313,14 +346,34 @@ call it with the value of the `gnus-data' text property." (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)) +(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)) @@ -335,172 +388,97 @@ call it with the value of the `gnus-data' text property." (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))) - (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-widget-button-keymap widget-button-keymap) - (or (memq 'underline (face-list)) - (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-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) - - (require 'text-props) - (if (< emacs-minor-version 14) + (fset 'gnus-deactivate-mark 'ignore) + (fset 'gnus-window-edges 'window-pixel-edges) + + (if (and (<= emacs-major-version 19) + (< emacs-minor-version 14)) (fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties)) - (or (boundp 'standard-display-table) (setq standard-display-table nil)) + (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 (symbol-function func))) + (let ((fval (indirect-function func))) (if (compiled-function-p fval) (list 'funcall fval) (cons 'progn (cdr (cdr fval)))))) - - ;; Fix by "jeff (j.d.) sparkes" . - (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-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-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-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) + (fset 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p) (add-hook 'gnus-group-mode-hook 'gnus-xmas-group-menu-add) (add-hook 'gnus-summary-mode-hook 'gnus-xmas-summary-menu-add) @@ -508,6 +486,7 @@ pounce directly on the real variables themselves.") (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) @@ -517,14 +496,14 @@ pounce directly on the real variables themselves.") (add-hook 'gnus-group-mode-hook 'gnus-xmas-setup-group-toolbar) (add-hook 'gnus-summary-mode-hook 'gnus-xmas-setup-summary-toolbar) - (when (and (<= emacs-major-version 19) - (<= emacs-minor-version 13)) - (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))) + (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)) ;;; XEmacs logo and toolbar. @@ -534,117 +513,120 @@ pounce directly on the real variables themselves.") ;; 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 - _ ___ _ _ - _ ___ __ ___ __ _ ___ - __ _ ___ __ ___ - _ ___ _ - _ _ __ _ - ___ __ _ - __ _ - _ _ _ - _ _ _ - _ _ _ - __ ___ - _ _ _ _ - _ _ - _ _ - _ _ - _ - __ - -" - "")) - ;; And then hack it. - (gnus-indent-rigidly (point-min) (point-max) - (/ (max (- (window-width) (or x 46)) 0) 2)) + (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)) - (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. + (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)) - (and (search-forward "Praxis" nil t) - (put-text-property (match-beginning 0) (match-end 0) 'face 'bold)) + (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)) - (let* ((mode-string (gnus-group-set-mode-line))) - (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. -(defvar gnus-use-toolbar (if (featurep 'toolbar) - 'default-toolbar - nil) +(defcustom 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-get-new-news gnus-group-get-new-news t "Get new news"] - [gnus-group-get-new-news-this-group +`right-toolbar', and `left-toolbar'." + :type '(choice (const default-toolbar) + (const top-toolbar) (const bottom-toolbar) + (const left-toolbar) (const right-toolbar) + (const :tag "no toolbar" nil)) + :group 'gnus-xmas) + +(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 + [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"] [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-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 +(defvar gnus-summary-toolbar + '([gnus-summary-prev-unread + gnus-summary-prev-page-or-article t "Page up"] + [gnus-summary-next-unread + gnus-summary-next-page t "Page down"] + [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"] @@ -654,10 +636,12 @@ If it is non-nil, it must be a toolbar. The five legal values are 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-uu-post-news + gnus-uu-post-news t "Post a uuencoded 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"] @@ -666,12 +650,12 @@ If it is non-nil, it must be a toolbar. The five legal values are (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-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"] @@ -687,6 +671,8 @@ If it is non-nil, it must be a toolbar. The five legal values are 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"] @@ -719,66 +705,108 @@ XEmacs compatibility workaround." '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)) +(defface gnus-x-face '((t (:foreground "black" :background "white"))) + "Face to show X face" + :group 'gnus-xmas) (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 ))))))) + (let ((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) - (goto-char (point-min)) - (re-search-forward "^From:" nil t) - (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 - (gnus-hide-text beg (point) gnus-hidden-properties) - (gnus-unhide-text beg (point))) - (setq beg (point))) - (save-window-excursion - (select-window (get-buffer-window (current-buffer))) - (recenter)) - t))) + (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" + 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)) chop) - (if (not (stringp line)) - (list line) - (unless (setq chop (string-match ":" line)) - (setq chop (/ (length line) 2))) - (list (cons modeline-buffer-id-left-extent (substring line 0 chop)) - (cons modeline-buffer-id-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) + (gnus-splash))) + +(defun gnus-xmas-annotation-in-region-p (b e) + (map-extents (lambda (e u) t) nil b e nil nil 'mm t)) (provide 'gnus-xmas)