X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fx-mouse.el;h=ca38faa1b6d85459949110fa7b86acb4d93bcd09;hb=71baa1c0cbbb886ac1528500c1bda51ac70decad;hp=8d295706cd8d3db06eda785a78b23b702e89ed79;hpb=113b194be934327de99a168d809271db252c07c4;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/x-mouse.el b/lisp/x-mouse.el
index 8d29570..ca38faa 100644
--- a/lisp/x-mouse.el
+++ b/lisp/x-mouse.el
@@ -40,7 +40,7 @@
 
 (defun x-mouse-kill (event)
   "Kill the text between the point and mouse and copy it to the clipboard and
-to the cut buffer"
+to the cut buffer."
   (interactive "@e")
   (let ((old-point (point)))
     (mouse-set-point event)
@@ -100,41 +100,50 @@ to the cut buffer"
   (if x-pointers-initialized  ; only do it when the first device is created
       nil
     (set-glyph-image text-pointer-glyph
-	  (or (x-get-resource "textPointer" "Cursor" 'string device)
-	      "xterm"))
+	  (or (x-get-resource "textPointer" "Cursor" 'string device nil 'warn)
+	      [cursor-font :data "xterm"]))
     (set-glyph-image selection-pointer-glyph
-	  (or (x-get-resource "selectionPointer" "Cursor" 'string device)
-	      "top_left_arrow"))
+	  (or (x-get-resource "selectionPointer" "Cursor" 'string device
+			      nil 'warn)
+	      [cursor-font :data "top_left_arrow"]))
     (set-glyph-image nontext-pointer-glyph
-	  (or (x-get-resource "spacePointer" "Cursor" 'string device)
-	      "xterm")) ; was "crosshair"
+	  (or (x-get-resource "spacePointer" "Cursor" 'string device nil 'warn)
+	      [cursor-font :data "xterm"])) ; was "crosshair"
     (set-glyph-image modeline-pointer-glyph
-	  (or (x-get-resource "modeLinePointer" "Cursor" 'string device)
+	  (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)
-	      "watch"))
+	  (or (x-get-resource "gcPointer" "Cursor" 'string device nil 'warn)
+	      [cursor-font :data "watch"]))
     (when (featurep 'scrollbar)
       (set-glyph-image
        scrollbar-pointer-glyph
-       (or (x-get-resource "scrollbarPointer" "Cursor" 'string device)
-	   "top_left_arrow")))
+       (or (x-get-resource "scrollbarPointer" "Cursor" 'string device
+			   nil 'warn)
+	   ;; 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)
-	      "watch"))
+	  (or (x-get-resource "busyPointer" "Cursor" 'string device nil 'warn)
+	      [cursor-font :data "watch"]))
     (set-glyph-image toolbar-pointer-glyph
-	  (or (x-get-resource "toolBarPointer" "Cursor" 'string device)
-	      "left_ptr"))
+	  (or (x-get-resource "toolBarPointer" "Cursor" 'string device
+			      nil 'warn)
+	      [cursor-font :data "left_ptr"]))
     (set-glyph-image divider-pointer-glyph
-	  (or (x-get-resource "dividerPointer" "Cursor" 'string device)
-	      "sb_h_double_arrow"))
+	  (or (x-get-resource "dividerPointer" "Cursor" 'string device
+			      nil 'warn)
+	      [cursor-font :data "sb_h_double_arrow"]))
     (let ((fg
-	   (x-get-resource "pointerColor" "Foreground" 'string device)))
+	   (x-get-resource "pointerColor" "Foreground" 'string device
+			   nil 'warn)))
       (and fg
 	   (set-face-foreground 'pointer fg)))
     (let ((bg
-	   (x-get-resource "pointerBackground" "Background" 'string device)))
+	   (x-get-resource "pointerBackground" "Background" 'string device
+			   nil 'warn)))
       (and bg
 	   (set-face-background 'pointer bg)))
     (setq x-pointers-initialized t))