;;; calc-keypd.el --- mouse-capable keypad input for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
-;; Maintainer: Jay Belanger <belanger@truman.edu>
+;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
;; This file is part of GNU Emacs.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY. No author or distributor
-;; accepts responsibility to anyone for the consequences of using it
-;; or for whether it serves any particular purpose or works at all,
-;; unless he says so in writing. Refer to the GNU Emacs General Public
-;; License for full details.
-
-;; Everyone is granted permission to copy, modify and redistribute
-;; GNU Emacs, but only under the conditions described in the
-;; GNU Emacs General Public License. A copy of this license is
-;; supposed to have been given to you along with GNU Emacs so you
-;; can know your rights and responsibilities. It should be in a
-;; file named COPYING. Among other things, the copyright notice
-;; and this notice must be preserved on all copies.
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
(define-key calc-keypad-mode-map (kbd "RET") 'calc-keypad-press)
(define-key calc-keypad-mode-map (kbd "TAB") 'calc-keypad-menu)
(define-key calc-keypad-mode-map "q" 'calc-keypad-off)
- (define-key calc-keypad-mode-map [(mouse-3)] 'calc-keypad-right-click)
- (define-key calc-keypad-mode-map [(mouse-2)] 'calc-keypad-middle-click)
- (define-key calc-keypad-mode-map [(mouse-1)] 'calc-keypad-left-click)
+ (define-key calc-keypad-mode-map [down-mouse-1] 'ignore)
+ (define-key calc-keypad-mode-map [drag-mouse-1] 'ignore)
+ (define-key calc-keypad-mode-map [double-mouse-1] 'ignore)
+ (define-key calc-keypad-mode-map [triple-mouse-1] 'ignore)
+ (define-key calc-keypad-mode-map [down-mouse-2] 'ignore)
+ (define-key calc-keypad-mode-map [drag-mouse-2] 'ignore)
+ (define-key calc-keypad-mode-map [double-mouse-2] 'ignore)
+ (define-key calc-keypad-mode-map [triple-mouse-2] 'ignore)
+ (define-key calc-keypad-mode-map [down-mouse-3] 'ignore)
+ (define-key calc-keypad-mode-map [drag-mouse-3] 'ignore)
+ (define-key calc-keypad-mode-map [double-mouse-3] 'ignore)
+ (define-key calc-keypad-mode-map [triple-mouse-3] 'ignore)
+ (define-key calc-keypad-mode-map [mouse-3] 'calc-keypad-right-click)
+ (define-key calc-keypad-mode-map [mouse-2] 'calc-keypad-middle-click)
+ (define-key calc-keypad-mode-map [mouse-1] 'calc-keypad-left-click)
(put 'calc-keypad-mode 'mode-class 'special)
(make-local-variable 'calc-main-buffer))
(set-window-buffer old-win (calc-trail-buffer))
(set-window-buffer win calc-keypad-buffer)
(set-window-start win 1)
- (setq win (split-window win (+ width 3) t))
+ (setq win (split-window win (+ width 7) t))
(set-window-buffer win calcbuf))
(if (or t ; left-side keypad not yet fully implemented
- (< (save-excursion
- (set-buffer (window-buffer old-win))
+ (< (with-current-buffer (window-buffer old-win)
(current-column))
(/ (window-width) 2)))
(setq win (split-window old-win (- (window-width old-win)
(delete-region (point-min) (point))
(if calc-keypad-input
(insert "Calc: " calc-keypad-input "\n")
- (insert "----+-----Calc " calc-version "-----+----"
+ (insert "----+----+--Calc---+----+----"
(int-to-string (1+ calc-keypad-menu))
"\n")))))
(setq calc-keypad-prev-input calc-keypad-input))
(interactive)
(unless (eq major-mode 'calc-keypad-mode)
(error "Must be in *Calc Keypad* buffer for this command"))
- (let* ((row (save-excursion
- (beginning-of-line)
- (count-lines (point-min) (point))))
+ (let* ((row (count-lines (point-min) (point-at-bol)))
(y (/ row 2))
(x (/ (current-column) (if (>= y 4) 6 5)))
radix frac inv
(defun calc-keypad-left-click (event)
"Handle a left-button mouse click in Calc Keypad window."
(interactive "e")
- (goto-char (posn-point (event-start event)))
- (calc-keypad-press))
+ (with-current-buffer calc-keypad-buffer
+ (goto-char (posn-point (event-start event)))
+ (calc-keypad-press)))
(defun calc-keypad-right-click (event)
"Handle a right-button mouse click in Calc Keypad window."
(interactive "e")
- (save-excursion
- (set-buffer calc-keypad-buffer)
+ (with-current-buffer calc-keypad-buffer
(calc-keypad-menu)))
(defun calc-keypad-middle-click (event)
negative-argument))
(and prefix (string-match "\\`\e?[-0-9]\\'" keys)))
(progn
- (setq last-command-char (aref keys (1- (length keys))))
+ (setq last-command-event (aref keys (1- (length keys))))
(command-execute cmd)
(setq flush 'not-any-more
prefix t
(provide 'calc-keypd)
-;;; arch-tag: 4ba0d360-2bb6-40b8-adfa-eb373765b3f9
;;; calc-keypd.el ends here
HCoop / bpt / emacs.git / blobdiff