Mercurial > hg > RemoteEditor > emacs

changeset 60:f0a30adf13de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author gongo
date Wed, 27 Aug 2008 18:29:21 +0900
parents 04eb9d562e60
children 2dea55a8d0e4
files ChangeLog redit-client-sm.el
diffstat 2 files changed, 36 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Aug 27 17:50:17 2008 +0900
+++ b/ChangeLog	Wed Aug 27 18:29:21 2008 +0900
@@ -1,5 +1,8 @@
 2008-08-27  Wataru MIYAGUNI  <gongo@cr.ie.u-ryukyu.ac.jp>
 
+	* redit-client-sm.el (redit-debug-message): add
+	message ラッパー。redit-debug-flag を見て message するか否か
+
 	* thinking:
 	テスト用SMGUIを使って、二つのSessionを立ち上げてみた。
             
--- a/redit-client-sm.el	Wed Aug 27 17:50:17 2008 +0900
+++ b/redit-client-sm.el	Wed Aug 27 18:29:21 2008 +0900
@@ -130,6 +130,11 @@
 (defconst redit-quit-ack-command       54)
 
 
+(defconst redit-debug-flag nil)
+(defun redit-debug-message (string)
+  (if (eq redit-debug-flag t)
+      (message string)))
+
 ;;;;;;;;;;;;;;;;;;
 ;; Queue struct ;;
 ;;;;;;;;;;;;;;;;;;
@@ -181,6 +186,7 @@
 
 ;; sid: Session ID
 ;; eid: Editor ID
+;; prevline: この Session に対応するバッファで最後に編集された行
 ;; send_cmdlist: rep_command list from user to SessionManager
 ;; recv_cmdlist: rep_command list from SessionManager to user
 (defstruct SessionInfo (sid nil) (eid nil) (prevline 1)
@@ -324,16 +330,19 @@
 	  (process-send-string redit-client-process
 			       (redit-make-packet
 				redit-join-command 0 0 0 0 7 "bufname"))
-	  (message (format "join-command: %d 0 0 0 0 0" redit-join-command)))
+	  (redit-debug-message
+	   (format "join-command: %d 0 0 0 0 0" redit-join-command))
+	  )
       ;; PUT if buffer-name is not "*scratch*"
       (progn
 	(process-send-string redit-client-process
 			     (redit-make-packet
 			      redit-put-command 0 0 0 0
 			      (string-bytes bufname) bufname))
-	(message (format
-		  "put-command: %d 0 0 0 0 %d %s"
-		  redit-put-command (string-bytes bufname) (buffer-name))))
+	(redit-debug-message
+	 (format "put-command: %d 0 0 0 0 %d %s"
+		 redit-put-command (string-bytes bufname) (buffer-name)))
+	)
       )))
 
 (defun redit-quit-command ()
@@ -408,10 +417,11 @@
 		
 		(process-send-string redit-client-process packet)
 		
-		(message (format
-			  "insert-command: %d %d %d %d %d %d %s"
-			  redit-insert-command redit-client-session-id
-			  redit-client-editor-id 0 linenum text-size text))))
+		(redit-debug-message
+		 (format "insert-command: %d %d %d %d %d %d %s"
+			 redit-insert-command redit-client-session-id
+			 redit-client-editor-id 0 linenum text-size text))
+		))
 	  ))
     (error "redit-client is not running.")))
 
@@ -427,10 +437,11 @@
 			5 "55555"))
 	  
 	  (process-send-string redit-client-process packet))
-	(message (format
-		  "delete-line-command: %d %d %d %d %d %d %s"
-		  redit-delete-line-command redit-client-session-id
-		  redit-client-editor-id 0 linenum 5 "55555")))
+	(redit-debug-message
+	 (format "delete-line-command: %d %d %d %d %d %d %s"
+		 redit-delete-line-command redit-client-session-id
+		 redit-client-editor-id 0 linenum 5 "55555"))
+	)
     (error "redit-client is not running.")))
 
 ;; redit-client-process へcloseコマンドを送る
@@ -601,7 +612,6 @@
 ;; バッファが変更される直前に呼ばれる。
 ;; begin と end には変更前の変更部分の始まりと終わりの point が入る
 (defun redit-client-before-change-function (begin end)
-  ;; (message "before-change-function")
   (setq redit-client-before-begin-line (real-count-lines begin))
   (setq redit-client-before-end-line (real-count-lines end))
   (setq redit-client-previous-max-line (real-count-lines (point-max)))
@@ -611,7 +621,6 @@
 ;; バッファが変更された直後に呼ばれる
 ;; begin と end には変更後の変更部分の始まりと終わりの point が入る
 (defun redit-client-after-change-function (begin end length)
-  ;; (message "after-change-function")
   (let ((endl) (cur-max-line) (max-line-diff) (prev-edit-line) (sinfo))
     (setq redit-client-after-begin-line (real-count-lines begin))
     (setq redit-client-after-end-line (real-count-lines end))
@@ -812,9 +821,10 @@
 
     (switch-to-buffer bufname)
 
-    (message (format "join-ack: Session [%d] %s"
-		     redit-client-session-id bufname))
-    (message (format "Your editor id = %d" redit-client-editor-id))
+    (redit-debug-message
+     (format "join-ack: Session [%d] %s" redit-client-session-id bufname))
+    (redit-debug-message
+     (format "Your editor id = %d" redit-client-editor-id))
 
 ))
 
@@ -840,9 +850,10 @@
 
     (switch-to-buffer bufname)
     
-    (message (format "put-ack Session [%d] %s"
-		     redit-client-session-id bufname))
-    (message (format "Your editor id = %d" redit-client-editor-id))
+    (redit-debug-message
+     (format "put-ack Session [%d] %s" redit-client-session-id bufname))
+    (redit-debug-message
+     (format "Your editor id = %d" redit-client-editor-id))
 ))
   
 ;; SessionIDを名前とした、新しいバッファを開く
@@ -856,9 +867,9 @@
 ;; プロセスの状態を見て、対応したメッセージを表示
 (defun redit-client-sentinel (proc msg)
   (cond ((eq (process-status proc) 'exit)
-	 (message "Client subprocess exited"))
+	 (redit-debug-message "Client subprocess exited"))
 	((eq (process-status proc) 'signal)
-	 (message "Client subprocess killed"))))
+	 (redit-debug-message "Client subprocess killed"))))
 
 (defun gen-seqno ()
   "generate editor local sequence number."