X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmsw-glyphs.el;h=bd6f753ca1aa23f1d6b7d51ff18c2967816f2ae8;hb=2df059c60e547b9e6c827eea2682bd1511983dc0;hp=56904f335e2c1c66083b1f6c1592e38bcdc1377f;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/msw-glyphs.el b/lisp/msw-glyphs.el
index 56904f3..bd6f753 100644
--- a/lisp/msw-glyphs.el
+++ b/lisp/msw-glyphs.el
@@ -1,6 +1,7 @@
 ;;; msw-glyphs.el --- Support for glyphs in ms windows
 
 ;; Copyright (C) 1994, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 2002 Ben Wing.
 
 ;; Author: Kirill M. Katsnelson <kkm@kis.ru>
 ;; Maintainer: XEmacs Development Team
@@ -27,16 +28,27 @@
 
 ;;; Commentary:
 
-;; This file contains temporary definitions for 'mswindows glyphs.
-;; Since there currently is no image support, the glyps are defined
-;; TTY-style. This file has to be removed or reworked completely
-;; when we have images.
+;; Initialization code for MS Windows glyphs.
 
-;; This file is dumped with XEmacs.
+;; This file is dumped with XEmacs (when MS Windows support is
+;; compiled in). Make sure this is the first of msw-*.el files
+;; dumped.
 
 ;;; Code:
 
+(defun msgdi-device-p (&optional device)
+  "Return non-nil if DEVICE is a GDI device, that is 'mswindows or 'msprinter.
+MS GDI devices are mutuially WYSIWIG-compatible, so that many common glyph,
+color and font properties apply to them equally.
+
+This function is also a predicate for 'msgdi device tag, matching this
+device class."
+  (memq (device-type device) '(mswindows msprinter)))
+
 (progn
+
+  (define-specifier-tag 'msgdi (function msgdi-device-p))
+
   (set-console-type-image-conversion-list
    'mswindows
    `(("\\.bmp\\'" [bmp :file nil] 2)
@@ -61,11 +73,17 @@
      ;; strings are not allowed so they will be ignored.
      ("" [nothing])))
 
+  (set-console-type-image-conversion-list
+   'msprinter (console-type-image-conversion-list 'mswindows))
+
   (set-face-font 'border-glyph "WingDings:Regular:11::Symbol"
-		 'global 'mswindows)
-  (set-glyph-image continuation-glyph "\xC3" 'global 'mswindows)
-  (set-glyph-image truncation-glyph "\xF0" 'global 'mswindows)
-  (set-glyph-image hscroll-glyph "\xEF" 'global 'mswindows)
+		 'global 'msgdi)
+  (set-glyph-image continuation-glyph "\xC3" 'global 'msgdi)
+  (set-glyph-image truncation-glyph "\xF0" 'global 'msgdi)
+  (set-glyph-image hscroll-glyph "\xEF" 'global 'msgdi)
+  (set-glyph-contrib-p continuation-glyph nil)
+  (set-glyph-contrib-p truncation-glyph nil)
+  (set-glyph-contrib-p hscroll-glyph nil)
 
   (set-glyph-image octal-escape-glyph "\\")
   (set-glyph-image control-arrow-glyph "^")
@@ -80,11 +98,11 @@
 				  (if emacs-beta-version
 				      "xemacs-beta.xpm"
 				    "xemacs.xpm"))
-			  'global 'mswindows))
+			  'global 'msgdi))
 	(t
 	 (set-glyph-image xemacs-logo
 			  "XEmacs <insert spiffy graphic logo here>"
-			  'global 'mswindows)))
+			  'global 'msgdi)))
 )
 
 ;;; msw-glyphs.el ends here