annotate lisp/gpm.el @ 5047:07dcc7000bbf

put width before height consistently, fix a real bug found in the process -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * EmacsFrame.c (EmacsFrameRecomputeCellSize): * faces.c (default_face_font_info): * faces.c (default_face_width_and_height): * faces.c (Fface_list): * faces.h: * frame-gtk.c (gtk_set_initial_frame_size): * frame-gtk.c (gtk_set_frame_size): * frame-gtk.c (gtk_recompute_cell_sizes): * frame.c: * frame.c (frame_conversion_internal_1): * frame.c (change_frame_size_1): * frame.c (change_frame_size): * glyphs-msw.c (mswindows_combo_box_instantiate): * glyphs-widget.c (widget_instantiate): * glyphs-widget.c (tree_view_query_geometry): * glyphs-widget.c (Fwidget_logical_to_character_width): * glyphs-widget.c (Fwidget_logical_to_character_height): * indent.c (vmotion_pixels): * redisplay-output.c (get_cursor_size_and_location): * redisplay-xlike-inc.c (XLIKE_output_eol_cursor): * redisplay-xlike-inc.c (XLIKE_flash): * redisplay.c (calculate_baseline): * redisplay.c (start_with_point_on_display_line): * redisplay.c (glyph_to_pixel_translation): * redisplay.c (pixel_to_glyph_translation): * window.c (margin_width_internal): * window.c (frame_size_valid_p): * window.c (frame_pixsize_valid_p): * window.c (check_frame_size): * window.c (set_window_pixsize): * window.c (window_pixel_height_to_char_height): * window.c (window_char_height_to_pixel_height): * window.c (window_displayed_height): * window.c (window_pixel_width_to_char_width): * window.c (window_char_width_to_pixel_width): * window.c (change_window_height): * window.c (window_scroll): * window.h: IMPORTANT: Aidan and Carbon Repo, please pay attention and fix appropriately! Rename: default_face_height_and_width -> default_face_width_and_height and reverse width/height arguments. Reverse width/height arguments to the following functions: -- default_face_font_info -- default_face_height_and_width (see above) -- check_frame_size -- frame_size_valid_p (made into a static function) Fix a redisplay bug where args to default_face_height_and_width were in the wrong order.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 18:56:01 -0600
parents 023b83f4e54b
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
1 ;;; gpm.el --- Support the mouse when emacs run on a Linux console.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
2
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
3 ;; Copyright (C) 1999 Free Software Foundation
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
4
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
5 ;; Author: William Perry <wmperry@gnu.org>
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
6 ;; Keywords: mouse, terminals
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
7
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
8 ;; This file is part of XEmacs.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
9
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
10 ;; XEmacs is free software; you can redistribute it and/or modify
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
13 ;; any later version.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
14
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
15 ;; XEmacs is distributed in the hope that it will be useful,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
18 ;; GNU General Public License for more details.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
19
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
613
023b83f4e54b [xemacs-hg @ 2001-06-10 10:42:16 by ben]
ben
parents: 502
diff changeset
21 ;; along with XEmacs; see the file COPYING. If not, write to the
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
23 ;; Boston, MA 02111-1307, USA.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
24
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
25 (defvar gpm-enabled-devices (make-hash-table :test 'eq
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
26 :size 13
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
27 :weakness 'key)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
28 "A hash table of devices with GPM currently turned on.")
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
29
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
30 (defun gpm-mode (&optional arg device)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
31 "Toggle GPM mouse mode.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
32 With prefix arg, turn GPM mouse mode on if and only if arg is positive."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
33 (interactive (list current-prefix-arg (selected-device)))
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
34 (with-fboundp 'gpm-enable
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
35 (cond
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
36 ((null arg) ; Toggle
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
37 (if (gethash device gpm-enabled-devices)
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
38 (progn
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
39 (gpm-enable device nil)
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
40 (remhash device gpm-enabled-devices))
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
41 (gpm-enable device t)
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
42 (puthash device t gpm-enabled-devices)))
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
43 ((> arg 0) ; Turn on
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
44 (gpm-enable device t)
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
45 (puthash device t gpm-enabled-devices))
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
46 ((gethash device gpm-enabled-devices) ; Turn off
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
47 (gpm-enable device nil)
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
48 (remhash device gpm-enabled-devices)))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
49
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
50 (defun turn-on-gpm-mouse-tracking (&optional device)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
51 ;; Enable mouse tracking on linux console
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
52 (gpm-mode 5 device))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
53
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
54 (defun turn-off-gpm-mouse-tracking (&optional device)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
55 ;; Disable mouse tracking on linux console
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
56 (gpm-mode -5 device))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
57
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
58 (defun gpm-is-supported-p (device)
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
59 "Returns non-nil if GPM is usable right now on DEVICE in this XEmacs session.
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
60 This checks whether GPM support was compiled in, TTY support was
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
61 compiled in, XEmacs is running on Linux, the current console/device is
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
62 TTY, and its terminal type has been set to `linux'."
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
63 (and (not noninteractive) ; Don't want to do this in batch mode
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
64 (fboundp 'gpm-enable) ; Must have C-level GPM support
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
65 (eq system-type 'linux) ; Must be running linux
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
66 (eq (device-type device) 'tty) ; on a tty
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
67 (equal "linux" (declare-fboundp ; an a linux terminal type
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
68 (console-tty-terminal-type (device-console device))))))
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
69
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
70 (defun gpm-create-device-hook (device)
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
71 (if (gpm-is-supported-p device)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
72 (turn-on-gpm-mouse-tracking device)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
73
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
74 (defun gpm-delete-device-hook (device)
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 442
diff changeset
75 (if (gpm-is-supported-p device)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
76 (turn-off-gpm-mouse-tracking device)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
77
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
78 ;; Restore normal mouse behavior outside Emacs
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
79
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
80 (add-hook 'suspend-hook 'turn-off-gpm-mouse-tracking)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
81 (add-hook 'suspend-resume-hook 'turn-on-gpm-mouse-tracking)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
82 (add-hook 'create-device-hook 'gpm-create-device-hook)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
83 (add-hook 'delete-device-hook 'gpm-delete-device-hook)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
84
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
85 (provide 'gpm)