X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-options.el;h=c886a1c5f3f3992ca767f14f3eff1b8c08f33b11;hp=0f814035f1ed9296f064e812f16849ff5468c5ed;hb=218d1f3a9ab6ab368fb9de131a15b9e79af16ea0;hpb=5935701a450552d02a0d2920b86fa87b7bad0acb

diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index 0f81403..c886a1c 100644
--- a/lisp/riece-options.el
+++ b/lisp/riece-options.el
@@ -1,4 +1,4 @@
-;;; riece-options.el --- customization
+;;; riece-options.el --- customization -*- lexical-binding: t -*-
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -19,8 +19,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -29,7 +29,9 @@
 
 ;; User modifiable variables.
 (defgroup riece nil
-  "Riece specific customize group.")
+  "Riece specific customize group."
+  :prefix "riece-"
+  :group 'applications)
 
 (defgroup riece-options nil
   "Riece user customizable variables."
@@ -63,11 +65,6 @@
   :prefix "riece-"
   :group 'riece)
 
-(defcustom riece-use-full-window t
-  "If non-nil, whole Emacs window is used to display dialogue."
-  :type 'boolean
-  :group 'riece-looks)
-
 (defcustom riece-window-center-line -2
   "Line number of center point in window when scrolling.
 If nil, erases the entire frame and then redraws with point in the
@@ -130,7 +127,9 @@ way is to put Riece variables on .emacs or file loaded from there."
 			  riece-toolbar
 			  riece-alias
 			  riece-ctlseq
-			  riece-keyword)
+			  riece-keyword
+			  riece-shrink-buffer
+			  riece-mcat)
   "Add-ons insinuated into Riece."
   :type '(repeat symbol)
   :group 'riece-options)
@@ -145,43 +144,78 @@ way is to put Riece variables on .emacs or file loaded from there."
   :prefix "riece-"
   :group 'riece)
 
-(define-widget 'riece-service-spec 'radio
-  "Edit service spec entries"
-  :convert-widget 'riece-service-spec-convert)
-
-(defun riece-service-spec-convert (widget)
-  (widget-put widget :args '((integer :tag "Port Number")
-			     (string :tag "Name")))
-  widget)
-
-(define-widget 'riece-server-spec 'repeat
-  "Edit server spec entries"
-  :match (lambda (widget value)
-	   (eval `(and ,@(mapcar
-			  (lambda (entry)
-			    (or (stringp (cdr entry))
-				(listp (cdr entry))))
-			  value))))
-  :convert-widget 'riece-server-spec-convert)
-
-(defun riece-server-spec-convert (widget)
-  (let* ((host '(const :format "" :value :host))
-	 (service '(const :format "" :value :service))
-	 (host
-	  `(group :inline t ,host (string :tag "Host")))
-	 (service
-	  `(group :inline t ,service riece-service-spec))
-	 (spec
-	  `(cons (string :tag "Name")
-		 (radio (string :tag "Host")
-			(list ,host ,service))))
-	 (args (list spec)))
-    (widget-put widget :args args)
-    widget))
+(defgroup riece-coding nil
+  "Coding system."
+  :tag "Coding"
+  :prefix "riece-"
+  :group 'riece)
+
+(defcustom riece-default-coding-system
+  (if (featurep 'mule)
+      (cons 'ctext 'iso-2022-jp-2))
+  "Coding system for process I/O.
+The value is a coding system, or a cons cell (DECODING . ENCODING)
+specifying the coding systems for decoding and encoding respectively."
+  :type '(choice (symbol :tag "Coding system")
+		 (cons (symbol :tag "Input coding system")
+		       (symbol :tag "Output coding system"))
+		 (const nil :tag "No conversion"))
+  :group 'riece-coding)
 
 (defcustom riece-server-alist nil
   "An alist mapping server names to plist."
-  :type 'riece-server-spec
+  :type '(repeat
+	  (group
+	   (string :tag "Server")
+	   (list :inline t :tag "Host"
+		 :format "%{%t%}: %v"
+		 (const :tag "" :value :host)
+		 string)
+	   (repeat :inline t :tag "Options"
+		   (choice :inline t :value nil
+			   (list :inline t :tag "Port"
+				 :format "%{%t%}: %v"
+				 (const :tag "" :value :service)
+				 (choice (const :tag "Default" 6667)
+					 integer
+					 string))
+			   (list :inline t :tag "Nickname"
+				 :format "%{%t%}: %v"
+				 (const :tag "" :value :nickname)
+				 (choice (const :tag "Default" riece-nickname)
+					 string))
+			   (list :inline t :tag "Realname"
+				 :format "%{%t%}: %v"
+				 (const :tag "" :value :realname)
+				 (choice (const :tag "Default" riece-realname)
+					 string))
+			   (list :inline t :tag "Username"
+				 :format "%{%t%}: %v"
+				 (const :tag "" :value :username)
+				 (choice (const :tag "Default" riece-username)
+					 string))
+			   (list :inline t :tag "Password"
+				 :format "%{%t%}: %v"
+				 (const :tag "" :value :password)
+				 string)
+			   (list :inline t :tag "Function"
+				 :format "%{%t%}: %v"
+				 (const :tag "" :value :function)
+				 (choice
+				  (const :tag "Default"
+					 riece-default-open-connection-function)
+				  function))
+			   (list :inline t :tag "Coding system"
+				 :format "%{%t%}: %v"
+				 (const :tag "" :value :coding)
+				 (choice
+				  (const :tag "Default"
+					 riece-default-coding-system)
+				  (choice
+				   (symbol :tag "Coding system")
+				   (cons (symbol :tag "Input coding system")
+					 (symbol :tag "Output coding system"))
+				   (const nil :tag "No conversion"))))))))
   :group 'riece-server)
 
 (defcustom riece-server (getenv "IRCSERVER")
@@ -211,6 +245,11 @@ way is to put Riece variables on .emacs or file loaded from there."
   :group 'riece-server)
 
 (defcustom riece-username nil
+  "Your login name."
+  :type 'string
+  :group 'riece-server)
+
+(defcustom riece-realname nil
   "Your user name."
   :type 'string
   :group 'riece-server)
@@ -249,7 +288,7 @@ way is to put Riece variables on .emacs or file loaded from there."
   :group 'riece-server)
 
 (defcustom riece-user-cache-max-size 512
-  "Maximum size of cache of usernames."
+  "Maximum size of cache of user names."
   :type 'integer
   :group 'riece-server)