[uim-commit] r2491 - trunk/emacs

[ekato at freedesktop.org]

Author: ekato
Date: 2005-12-09 05:22:40 -0800 (Fri, 09 Dec 2005)
New Revision: 2491

Modified:
   trunk/emacs/uim-key.el
   trunk/emacs/uim-keymap.el
   trunk/emacs/uim.el
Log:
2005-12-09 Konosuke Watanabe
* emacs/uim-key.el
* emacs/uim-keymap.el
* emacs/uim.el
  - Support mouse wheel.


Modified: trunk/emacs/uim-key.el
===================================================================
--- trunk/emacs/uim-key.el	2005-12-09 13:20:27 UTC (rev 2490)
+++ trunk/emacs/uim-key.el	2005-12-09 13:22:40 UTC (rev 2491)
@@ -280,7 +280,9 @@
 	 (lastkey (nth (- (length keylist) 1) keylist)))
     (cond ((setq button
 		 (assoc lastkey
-			'((button1 . 1) (button2 . 2) (button3 . 3))))
+			'((button1 . 1) (button2 . 2) 
+			  (button3 . 3) (button4 . 4)
+			  (button5 . 5))))
 	   ;; mouse press
 	   (delq lastkey keylist)
 	   (setq event 
@@ -289,7 +291,9 @@
 	   )
 	  ((setq button
 		 (assoc lastkey
-			'((button1up . 1) (button2up . 2) (button3up . 3))))
+			'((button1up . 1) (button2up . 2) 
+			  (button3up . 3) (button4up . 4)
+			  (button5up . 5))))
 	   ;; mouse up
 	   (delq lastkey keylist)
 	   (setq event 

Modified: trunk/emacs/uim-keymap.el
===================================================================
--- trunk/emacs/uim-keymap.el	2005-12-09 13:20:27 UTC (rev 2490)
+++ trunk/emacs/uim-keymap.el	2005-12-09 13:22:40 UTC (rev 2491)
@@ -77,7 +77,7 @@
 (defun uim-unbind-mouse-event ()
   (let ((mouse-modifiers uim-mouse-modifiers))
     (while mouse-modifiers
-      (let ((mouse '(mouse-1 mouse-2 mouse-3)))
+      (let ((mouse '(mouse-1 mouse-2 mouse-3 mouse-4 mouse-5)))
 	(while mouse
 	  (let ((event (vector (append (car mouse-modifiers)
 				       (list (car mouse))))))

Modified: trunk/emacs/uim.el
===================================================================
--- trunk/emacs/uim.el	2005-12-09 13:20:27 UTC (rev 2490)
+++ trunk/emacs/uim.el	2005-12-09 13:22:40 UTC (rev 2491)
@@ -911,7 +911,7 @@
 		 (setq sendkey 
 		       (uim-convert-keystr-to-uimagent-vector (key-description keyvec)))
 
-		 (cond ((string-match "button\\(1\\|2\\|3\\)" 
+		 (cond ((string-match "button\\(1\\|2\\|3\\|4\\|5\\)" 
 				      (key-description keyvec))
 			;; through mouse event
 			(setq mouse t)
@@ -946,7 +946,7 @@
 			(setq count (prefix-numeric-value arg)))
 		       ((and (eventp event)
 			     (memq (event-basic-type event) 
-				   '(mouse-1 mouse-2 mouse-3)))
+				   '(mouse-1 mouse-2 mouse-3 mouse-4 mouse-5)))
 			;; detect mouse event
 			;;(uim-debug "mouse event")
 			(setq bypass t)