1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-18 10:16:51 +00:00
emacs/lisp/gnus/gnus-fun.el
Miles Bader 4a2358e9b4 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-530
Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 106-111)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

2005-09-05  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/message.el (message-tab-body-function): Fixed mismatched custom
   type.

   * lisp/gnus/gnus.el (gnus-group-change-level-function): Ditto.

   * lisp/gnus/gnus-msg.el (gnus-outgoing-message-group): Ditto.

   * lisp/gnus/gnus-art.el (gnus-signature-limit)
   (gnus-article-mime-part-function): Ditto.

2005-09-04  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/nnweb.el (nnweb-type-definition, nnweb-google-wash-article):
   Make fetching article by MID work again for Google Groups.  Added
   FIXME concerning gnus-group-make-web-group.

   * lisp/gnus/mml-smime.el (mml-smime-sign-query, mml-smime-get-dns-cert):
   Don't depend on Gnus by using mail-extract-address-components if
   gnus-extract-address-components is not bound.

   * lisp/gnus/gnus.el (gnus-user-agent): Use list of symbols instead of
   symbols.  Display full version number for (S)XEmacs.  Optionally
   display (S)XEmacs codename.

   * lisp/gnus/gnus-util.el (gnus-emacs-version): Update for new
   `gnus-user-agent'.

   * lisp/gnus/gnus-msg.el (gnus-extended-version): Make it possible to omit
   Gnus version.

2005-09-02  Hrvoje Niksic  <hniksic@xemacs.org>

   * lisp/gnus/mm-encode.el (mm-encode-content-transfer-encoding): Likewise
   when encoding.

   * lisp/gnus/mm-bodies.el (mm-decode-content-transfer-encoding):
   De-canonicalize CRLF for all text content types, not just
   text/plain.

2005-09-02  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Doc fix.

   * lisp/gnus/gnus-msg.el (gnus-inews-insert-gcc): Fix the mistake of using
   list, not listp.

2005-08-29  Romain Francoise  <romain@orebokech.com>

   * lisp/gnus/gnus-fun.el (gnus-convert-image-to-face-command): Fix typo in
   docstring.
   (gnus-face-from-file): Likewise.

2005-08-31  Juanma Barranquero  <lekktu@gmail.com>

   * lisp/gnus/gnus-art.el (w3m-minor-mode-map):
   * lisp/gnus/gnus-spec.el (gnus-newsrc-file-version):
   * lisp/gnus/gnus-util.el (nnmail-active-file-coding-system)
   (gnus-original-article-buffer, gnus-user-agent):
   * lisp/gnus/gnus.el (gnus-ham-process-destinations)
   (gnus-parameter-ham-marks-alist)
   (gnus-parameter-spam-marks-alist, gnus-spam-autodetect)
   (gnus-spam-autodetect-methods, gnus-spam-newsgroup-contents)
   (gnus-spam-process-destinations, gnus-spam-process-newsgroups):
   * lisp/gnus/mm-decode.el (gnus-current-window-configuration):
   * lisp/gnus/mm-extern.el (gnus-article-mime-handles):
   * lisp/gnus/mm-url.el (url-current-object, url-package-name)
   (url-package-version):
   * lisp/gnus/mm-view.el (gnus-article-mime-handles, gnus-newsgroup-charset)
   (smime-keys, w3m-cid-retrieve-function-alist)
   (w3m-current-buffer, w3m-display-inline-images)
   (w3m-minor-mode-map):
   * lisp/gnus/mml-smime.el (gnus-extract-address-components):
   * lisp/gnus/mml.el (gnus-article-mime-handles, gnus-mouse-2)
   (gnus-newsrc-hashtb, message-default-charset)
   (message-deletable-headers, message-options)
   (message-posting-charset, message-required-mail-headers)
   (message-required-news-headers):
   * lisp/gnus/mml1991.el (mc-pgp-always-sign):
   * lisp/gnus/mml2015.el (mc-pgp-always-sign):
   * lisp/gnus/nnheader.el (nnmail-extra-headers):
   * lisp/gnus/rfc1843.el (gnus-decode-encoded-word-function)
   (gnus-decode-header-function, gnus-newsgroup-name):
   * lisp/gnus/spam-stat.el (gnus-original-article-buffer): Add defvars.
2005-09-05 23:58:09 +00:00

261 lines
8.2 KiB
EmacsLisp

;;; gnus-fun.el --- various frivolous extension functions to Gnus
;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; This file is part of GNU Emacs.
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;; Code:
(eval-when-compile
(require 'cl))
(require 'mm-util)
(require 'gnus-ems)
(require 'gnus-util)
(defcustom gnus-x-face-directory (expand-file-name "x-faces" gnus-directory)
"*Directory where X-Face PBM files are stored."
:version "22.1"
:group 'gnus-fun
:type 'directory)
(defcustom gnus-convert-pbm-to-x-face-command "pbmtoxbm %s | compface"
"Command for converting a PBM to an X-Face."
:version "22.1"
:group 'gnus-fun
:type 'string)
(defcustom gnus-convert-image-to-x-face-command "giftopnm %s | ppmnorm | pnmscale -width 48 -height 48 | ppmtopgm | pgmtopbm | pbmtoxbm | compface"
"Command for converting an image to an X-Face.
By default it takes a GIF filename and output the X-Face header data
on stdout."
:version "22.1"
:group 'gnus-fun
:type 'string)
(defcustom gnus-convert-image-to-face-command "djpeg %s | ppmnorm | pnmscale -width 48 -height 48 | ppmquant %d | pnmtopng"
"Command for converting an image to a Face.
By default it takes a JPEG filename and output the Face header data
on stdout."
:version "22.1"
:group 'gnus-fun
:type 'string)
(defun gnus-shell-command-to-string (command)
"Like `shell-command-to-string' except not mingling ERROR."
(with-output-to-string
(call-process shell-file-name nil (list standard-output nil)
nil shell-command-switch command)))
(defun gnus-shell-command-on-region (start end command)
"A simplified `shell-command-on-region'.
Output to the current buffer, replace text, and don't mingle error."
(call-process-region start end shell-file-name t
(list (current-buffer) nil)
nil shell-command-switch command))
;;;###autoload
(defun gnus-random-x-face ()
"Return X-Face header data chosen randomly from `gnus-x-face-directory'."
(interactive)
(when (file-exists-p gnus-x-face-directory)
(let* ((files (directory-files gnus-x-face-directory t "\\.pbm$"))
(file (nth (random (length files)) files)))
(when file
(gnus-shell-command-to-string
(format gnus-convert-pbm-to-x-face-command
(shell-quote-argument file)))))))
;;;###autoload
(defun gnus-insert-random-x-face-header ()
"Insert a random X-Face header from `gnus-x-face-directory'."
(interactive)
(let ((data (gnus-random-x-face)))
(save-excursion
(message-goto-eoh)
(if data
(insert "X-Face: " data)
(message
"No face returned by `gnus-random-x-face'. Does %s/*.pbm exist?"
gnus-x-face-directory)))))
;;;###autoload
(defun gnus-x-face-from-file (file)
"Insert an X-Face header based on an image file."
(interactive "fImage file name (by default GIF): ")
(when (file-exists-p file)
(gnus-shell-command-to-string
(format gnus-convert-image-to-x-face-command
(shell-quote-argument (expand-file-name file))))))
;;;###autoload
(defun gnus-face-from-file (file)
"Return a Face header based on an image file."
(interactive "fImage file name (by default JPEG): ")
(when (file-exists-p file)
(let ((done nil)
(attempt "")
(quant 16))
(while (and (not done)
(> quant 1))
(setq attempt
(let ((coding-system-for-read 'binary))
(gnus-shell-command-to-string
(format gnus-convert-image-to-face-command
(shell-quote-argument (expand-file-name file))
quant))))
(if (> (length attempt) 726)
(progn
(setq quant (- quant 2))
(gnus-message 9 "Length %d; trying quant %d"
(length attempt) quant))
(setq done t)))
(if done
(mm-with-unibyte-buffer
(insert attempt)
(gnus-face-encode))
nil))))
(defun gnus-face-encode ()
(let ((step 72))
(base64-encode-region (point-min) (point-max))
(goto-char (point-min))
(while (search-forward "\n" nil t)
(replace-match ""))
(goto-char (point-min))
(while (> (- (point-max) (point))
step)
(forward-char step)
(insert "\n ")
(setq step 76))
(buffer-string)))
;;;###autoload
(defun gnus-convert-face-to-png (face)
"Convert FACE (which is base64-encoded) to a PNG.
The PNG is returned as a string."
(mm-with-unibyte-buffer
(insert face)
(ignore-errors
(base64-decode-region (point-min) (point-max)))
(buffer-string)))
;;;###autoload
(defun gnus-convert-png-to-face (file)
"Convert FILE to a Face.
FILE should be a PNG file that's 48x48 and smaller than or equal to
726 bytes."
(mm-with-unibyte-buffer
(insert-file-contents file)
(when (> (buffer-size) 726)
(error "The file is %d bytes long, which is too long"
(buffer-size)))
(gnus-face-encode)))
(defface gnus-x-face '((t (:foreground "black" :background "white")))
"Face to show X-Face.
The colors from this face are used as the foreground and background
colors of the displayed X-Faces."
:group 'gnus-article-headers)
(defun gnus-display-x-face-in-from (data)
"Display the X-Face DATA in the From header."
(let ((default-enable-multibyte-characters nil)
pbm)
(when (or (gnus-image-type-available-p 'xface)
(and (gnus-image-type-available-p 'pbm)
(setq pbm (uncompface data))))
(save-excursion
(save-restriction
(article-narrow-to-head)
(gnus-article-goto-header "from")
(when (bobp)
(insert "From: [no `from' set]\n")
(forward-char -17))
(gnus-add-image
'xface
(gnus-put-image
(if (gnus-image-type-available-p 'xface)
(gnus-create-image
(concat "X-Face: " data)
'xface t :face 'gnus-x-face)
(gnus-create-image
pbm 'pbm t :face 'gnus-x-face)) nil 'xface))
(gnus-add-wash-type 'xface))))))
(defun gnus-grab-cam-x-face ()
"Grab a picture off the camera and make it into an X-Face."
(interactive)
(shell-command "xawtv-remote snap ppm")
(let ((file nil))
(while (null (setq file (directory-files "/tftpboot/sparky/tmp"
t "snap.*ppm")))
(sleep-for 1))
(setq file (car file))
(with-temp-buffer
(shell-command
(format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | ppmnorm 2>/dev/null | pnmscale -width 48 | ppmtopgm | pgmtopbm -threshold -value 0.92 | pbmtoxbm | compface"
file)
(current-buffer))
;;(sleep-for 3)
(delete-file file)
(buffer-string))))
(defun gnus-grab-cam-face ()
"Grab a picture off the camera and make it into an X-Face."
(interactive)
(shell-command "xawtv-remote snap ppm")
(let ((file nil)
result)
(while (null (setq file (directory-files "/tftpboot/sparky/tmp"
t "snap.*ppm")))
(sleep-for 1))
(setq file (car file))
(shell-command
(format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale -width 48 -height 48 | ppmtopgm > /tmp/gnus.face.ppm"
file))
(let ((gnus-convert-image-to-face-command
(format "cat '%%s' | ppmquant %%d | ppmchange %s | pnmtopng"
(gnus-fun-ppm-change-string))))
(setq result (gnus-face-from-file "/tmp/gnus.face.ppm")))
(delete-file file)
;;(delete-file "/tmp/gnus.face.ppm")
result))
(defun gnus-fun-ppm-change-string ()
(let* ((possibilites '("%02x0000" "00%02x00" "0000%02x"
"%02x%02x00" "00%02x%02x" "%02x00%02x"))
(format (concat "'#%02x%02x%02x' '#"
(nth (random 6) possibilites)
"'"))
(values nil))
(dotimes (i 255)
(push (format format i i i i i i)
values))
(mapconcat 'identity values " ")))
(provide 'gnus-fun)
;;; arch-tag: 9d000a69-15cc-4491-9dc0-4627484f50c1
;;; gnus-fun.el ends here