;;; smiley.el --- displaying smiley faces
-;; Copyright (C) 1996,97,98,99 Free Software Foundation, Inc.
+;; Copyright (C) 1996,97,98 Free Software Foundation, Inc.
;; Author: Wes Hardaker <hardaker@ece.ucdavis.edu>
;; Keywords: fun
;; To use:
;; (require 'smiley)
-;; (setq gnus-treat-display-smileys t)
+;; (add-hook 'gnus-article-display-hook 'gnus-smiley-display t)
;; The smilies were drawn by Joe Reiss <jreiss@vt.edu>.
("\\(:-+\\]+\\)\\W" 1 "FaceGoofy.xpm")
("\\(:-*D\\)\\W" 1 "FaceGrinning.xpm")
("\\(:-*[)>}»]+\\)\\W" 1 "FaceHappy.xpm")
- ("\\(=[)»]+\\)\\W" 1 "FaceHappy.xpm")
+ ("\\(=[)>»]+\\)\\W" 1 "FaceHappy.xpm")
("\\(:-*[/\\\"]\\)[^/]\\W" 1 "FaceIronic.xpm")
- ("[^.0-9]\\([8|]-*[|Oo%]\\)\\W" 1 "FaceKOed.xpm")
+ ("\\([8|]-*[|Oo%]\\)\\W" 1 "FaceKOed.xpm")
("\\([:|]-*#+\\)\\W" 1 "FaceNyah.xpm")
("\\(:-*[({]+\\)\\W" 1 "FaceSad.xpm")
("\\(=[({]+\\)\\W" 1 "FaceSad.xpm")
("\\(:-+D\\)\\W" 1 "FaceGrinning.xpm")
("\\(:-+[}»]+\\)\\W" 1 "FaceHappy.xpm")
("\\(:-*)+\\)\\W" 1 "FaceHappy.xpm")
- ("\\(=[)]+\\)\\W" 1 "FaceHappy.xpm")
+ ("\\(=[)>]+\\)\\W" 1 "FaceHappy.xpm")
("\\(:-+[/\\\"]+\\)\\W" 1 "FaceIronic.xpm")
("\\([8|]-+[|Oo%]\\)\\W" 1 "FaceKOed.xpm")
("\\([:|]-+#+\\)\\W" 1 "FaceNyah.xpm")
(defun smiley-popup-menu (e)
(interactive "e")
(popup-menu
- `("Smilies"
+ `("Smilies"
["Toggle This Smiley" (smiley-toggle-extent ,e) t]
["Toggle All Smilies" (smiley-toggle-extents ,e) t])))
(glyph (make-glyph
(list
(cons 'x (expand-file-name pixmap smiley-data-directory))
- (cons 'mswindows
- (expand-file-name pixmap smiley-data-directory))
(cons 'tty smiley)))))
(setq smiley-glyph-cache (cons (cons pixmap glyph) smiley-glyph-cache))
(set-glyph-face glyph 'default)
(defun smiley-toggle-extents (e)
(interactive "e")
(map-extents
- (lambda (e void)
- (let (ant)
- (if (annotationp (setq ant (extent-property e 'smiley-annotation)))
- (if (eq (extent-property e 'invisible) nil)
- (progn
- (reveal-annotation ant)
- (set-extent-property e 'invisible t)
- )
- (hide-annotation ant)
- (set-extent-property e 'invisible nil)))
- nil))
+ '(lambda (e void)
+ (let (ant)
+ (if (annotationp (setq ant (extent-property e 'smiley-annotation)))
+ (progn
+ (if (eq (extent-property e 'invisible) nil)
+ (progn
+ (reveal-annotation ant)
+ (set-extent-property e 'invisible t)
+ )
+ (hide-annotation ant)
+ (set-extent-property e 'invisible nil))))
+ nil))
(event-buffer e)))
;;;###autoload
(defun smiley-buffer (&optional buffer st nd)
(interactive)
- (when (featurep '(or x mswindows))
+ (when (featurep 'x)
(save-excursion
(when buffer
(set-buffer buffer))
(case-fold-search nil)
entry regexp beg group file)
(map-extents
- (lambda (e void)
- (when (or (extent-property e 'smiley-extent)
- (extent-property e 'smiley-annotation))
- (delete-extent e)))
+ '(lambda (e void)
+ (when (or (extent-property e 'smiley-extent)
+ (extent-property e 'smiley-annotation))
+ (delete-extent e)))
buffer st nd)
(goto-char (or st (point-min)))
(setq beg (point))
(set-extent-property ant 'smiley-extent ext)
(set-extent-property ext 'smiley-annotation ant)
;; Help
- (set-extent-property
- ext 'help-echo
- "button2 toggles smiley, button3 pops up menu")
- (set-extent-property
- ant 'help-echo
- "button2 toggles smiley, button3 pops up menu")
+ (set-extent-property ext 'help-echo
+ "button2 toggles smiley, button3 pops up menu")
+ (set-extent-property ant 'help-echo
+ "button2 toggles smiley, button3 pops up menu")
(set-extent-property ext 'balloon-help
"Mouse button2 - toggle smiley
Mouse button3 - menu")
(save-excursion
(goto-char start)
(when (and (re-search-backward "[()]" nil t)
- (eq (char-after) ?\()
+ (= (following-char) ?\()
(goto-char end)
(or (not (re-search-forward "[()]" nil t))
- (eq (char-after (1- (point))) ?\()))
+ (= (char-after (1- (point))) ?\()))
t)))
-(defun smiley-toggle-buffer (&optional arg buffer st nd)
- "Toggle displaying smiley faces.
-With arg, turn displaying on if and only if arg is positive."
- (interactive "P")
- (let (on off)
- (map-extents
- (lambda (e void)
- (let (ant)
- (if (annotationp (setq ant (extent-property e 'smiley-annotation)))
- (if (eq (extent-property e 'invisible) nil)
- (setq off (cons (cons ant e) off))
- (setq on (cons (cons ant e) on)))))
- nil)
- buffer st nd)
- (if (and (not (and (numberp arg) (< arg 0)))
- (or (and (numberp arg) (> arg 0))
- (null on)))
- (if off
- (while off
- (reveal-annotation (caar off))
- (set-extent-property (cdar off) 'invisible t)
- (setq off (cdr off)))
- (smiley-buffer))
- (while on
- (hide-annotation (caar on))
- (set-extent-property (cdar on) 'invisible nil)
- (setq on (cdr on))))))
-
(defvar gnus-article-buffer)
;;;###autoload
-(defun gnus-smiley-display (&optional arg)
- "Display \"smileys\" as small graphical icons.
-With arg, turn displaying on if and only if arg is positive."
- (interactive "P")
+(defun gnus-smiley-display ()
+ "Display \"smileys\" as small graphical icons."
+ (interactive)
(save-excursion
(set-buffer gnus-article-buffer)
- (save-restriction
- (widen)
- (article-goto-body)
- (smiley-toggle-buffer arg (current-buffer) (point) (point-max)))))
+ (goto-char (point-min))
+ ;; We skip the headers.
+ (unless (search-forward "\n\n" nil t)
+ (goto-char (point-max)))
+ (smiley-buffer (current-buffer) (point))))
(provide 'smiley)
projects / elisp / gnus.git- / blobdiff