diff lisp/x-mouse.el @ 446:1ccc32a20af4 r21-2-38

Import from CVS: tag r21-2-38
author cvs
date Mon, 13 Aug 2007 11:37:21 +0200
parents 576fb035e263
children 7039e6323819
line wrap: on
line diff
--- a/lisp/x-mouse.el	Mon Aug 13 11:36:20 2007 +0200
+++ b/lisp/x-mouse.el	Mon Aug 13 11:37:21 2007 +0200
@@ -101,39 +101,41 @@
       nil
     (set-glyph-image text-pointer-glyph
 	  (or (x-get-resource "textPointer" "Cursor" 'string device nil 'warn)
-	      "xterm"))
+	      [cursor-font :data "xterm"]))
     (set-glyph-image selection-pointer-glyph
 	  (or (x-get-resource "selectionPointer" "Cursor" 'string device
 			      nil 'warn)
-	      "top_left_arrow"))
+	      [cursor-font :data "top_left_arrow"]))
     (set-glyph-image nontext-pointer-glyph
 	  (or (x-get-resource "spacePointer" "Cursor" 'string device nil 'warn)
-	      "xterm")) ; was "crosshair"
+	      [cursor-font :data "xterm"])) ; was "crosshair"
     (set-glyph-image modeline-pointer-glyph
 	  (or (x-get-resource "modeLinePointer" "Cursor" 'string device
 			      nil 'warn)
 ;;	      "fleur"))
-	      "sb_v_double_arrow"))
+	      [cursor-font :data "sb_v_double_arrow"]))
     (set-glyph-image gc-pointer-glyph
 	  (or (x-get-resource "gcPointer" "Cursor" 'string device nil 'warn)
-	      "watch"))
+	      [cursor-font :data "watch"]))
     (when (featurep 'scrollbar)
       (set-glyph-image
        scrollbar-pointer-glyph
        (or (x-get-resource "scrollbarPointer" "Cursor" 'string device
 			   nil 'warn)
-	   "top_left_arrow")))
+	   ;; bizarrely if we don't specify the specific locale (x) this
+	   ;; gets instantiated on the stream device. Bad puppy.
+	   [cursor-font :data "top_left_arrow"]) 'global '(default x)))
     (set-glyph-image busy-pointer-glyph
 	  (or (x-get-resource "busyPointer" "Cursor" 'string device nil 'warn)
-	      "watch"))
+	      [cursor-font :data "watch"]))
     (set-glyph-image toolbar-pointer-glyph
 	  (or (x-get-resource "toolBarPointer" "Cursor" 'string device
 			      nil 'warn)
-	      "left_ptr"))
+	      [cursor-font :data "left_ptr"]))
     (set-glyph-image divider-pointer-glyph
 	  (or (x-get-resource "dividerPointer" "Cursor" 'string device
 			      nil 'warn)
-	      "sb_h_double_arrow"))
+	      [cursor-font :data "sb_h_double_arrow"]))
     (let ((fg
 	   (x-get-resource "pointerColor" "Foreground" 'string device
 			   nil 'warn)))