X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Fmodeline.el;h=3e10878d94279232b1cece825de329989391c651;hp=08886a9caa5808121bb682bbb8b8ce609a450bf9;hb=5378ab6d2bb24fd8d39025be1574d406cf91f141;hpb=716cfba952c1dc0d2cf5c968971f3780ba728a89

diff --git a/lisp/modeline.el b/lisp/modeline.el
index 08886a9..3e10878 100644
--- a/lisp/modeline.el
+++ b/lisp/modeline.el
@@ -39,6 +39,23 @@
   "Modeline customizations."
   :group 'environment)
 
+(defcustom modeline-3d-p ;; added for the options menu
+  (let ((thickness
+	 (specifier-instance modeline-shadow-thickness)))
+    (and (integerp thickness)
+	 (> thickness 0)))
+  "Whether the default toolbar is globally visible. This option can be
+customized through the options menu."
+  :group 'display
+  :type 'boolean
+  :set #'(lambda (var val)
+	   (if val
+	       (set-specifier modeline-shadow-thickness 2)
+	     (set-specifier modeline-shadow-thickness 0))
+	   (redraw-modeline t)
+	   (setq modeline-3d-p val))
+  )
+
 (defcustom drag-divider-event-lag 150
   "*The pause (in msecs) between divider drag events before redisplaying.
 If this value is too small, dragging will be choppy because redisplay cannot
@@ -79,7 +96,23 @@ a scrollbar for its own text, which then moves in the opposite direction."
 		  (set-glyph-image modeline-pointer-glyph "fleur" 'global 'x))
 		 (t
 		  (set-glyph-image modeline-pointer-glyph "sb_v_double_arrow"
-				   'global 'x)))))
+				   'global 'x))))
+	 (when (featurep 'mswindows)
+	   (cond ((eq val t)
+		  (set-glyph-image modeline-pointer-glyph
+				   [mswindows-resource :resource-type cursor
+						       :resource-id "SizeAll"]
+				   'global 'mswindows))
+		 ((eq val 'scrollbar)
+		  (set-glyph-image modeline-pointer-glyph
+				   [mswindows-resource :resource-type cursor
+						       :resource-id "Normal"]
+				   'global 'mswindows))
+		 (t
+		  (set-glyph-image modeline-pointer-glyph
+				   [mswindows-resource :resource-type cursor
+						       :resource-id "SizeNS"]
+				   'global 'mswindows)))))
   :group 'modeline)
 
 (defun mouse-drag-modeline (event)
@@ -555,12 +588,17 @@ parentheses on the modeline."
 		     "button2 cycles to the next buffer")
 
 (defconst modeline-buffer-identification
-  (list (cons modeline-buffer-id-left-extent (purecopy "XEmacs%N:"))
+  (list (cons modeline-buffer-id-left-extent "XEmacs%N:")
 					; this used to be "XEmacs:"
-	(cons modeline-buffer-id-right-extent (purecopy " %17b")))
+	(cons modeline-buffer-id-right-extent " %17b"))
   "Modeline control for identifying the buffer being displayed.
-Its default value is \"XEmacs: %17b\" (NOT!).  Major modes that edit things
-other than ordinary files may change this (e.g. Info, Dired,...)")
+Its default value is
+
+  (list (cons modeline-buffer-id-left-extent \"XEmacs%N:\")
+	(cons modeline-buffer-id-right-extent \" %17b\")))
+
+Major modes that edit things other than ordinary files may change this
+(e.g. Info, Dired,...).")
 (make-variable-buffer-local 'modeline-buffer-identification)
 
 ;; These are for the sake of minor mode menu.  #### All of this is
@@ -588,7 +626,7 @@ Normally nil in most modes, since there is no process to display.")
 (set-extent-property modeline-modified-extent 'help-echo
 		     "button2 toggles the buffer's read-only status")
 
-(defconst modeline-modified (purecopy '("--%1*%1+-"))
+(defconst modeline-modified '("--%1*%1+-")
   "Modeline control for displaying whether current buffer is modified.")
 (make-variable-buffer-local 'modeline-modified)
 
@@ -607,21 +645,21 @@ Normally nil in most modes, since there is no process to display.")
 (setq-default
  modeline-format
  (list
-  (purecopy "")
+  ""
   (cons modeline-modified-extent 'modeline-modified)
   (cons modeline-buffer-id-extent 'modeline-buffer-identification)
-  (purecopy "   ")
+  "   "
   'global-mode-string
-  (purecopy "   %[(")
+  "   %[("
   (cons modeline-minor-mode-extent
-	(list (purecopy "") 'mode-name 'minor-mode-alist))
-  (cons modeline-narrowed-extent (purecopy "%n"))
+	(list "" 'mode-name 'minor-mode-alist))
+  (cons modeline-narrowed-extent "%n")
   'modeline-process
-  (purecopy ")%]----")
-  (list 'line-number-mode (purecopy "L%l--"))
-  (list 'column-number-mode (purecopy "C%c--"))
-  (cons -3 (purecopy "%p"))
-  (purecopy "-%-")))
+  ")%]----"
+  (list 'line-number-mode "L%l--")
+  (list 'column-number-mode "C%c--")
+  (cons -3 "%p")
+  "-%-"))
 
 ;;; Added for XEmacs 20.3.  Provide wrapper for vc since it may not always be
 ;;; present, and its symbols are not visible this early in the dump if it