Mercurial > hg > xemacs-beta
annotate lisp/term/sup-mouse.el @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 11:02:24 -0600 |
| parents | d682c0f82a71 |
| children | 85bd42a1e544 308d34e9f07d |
| rev | line source |
|---|---|
| 0 | 1 ;;; sup-mouse.el --- supdup mouse support for lisp machines |
| 2 | |
| 3 ;; Copyright (C) Free Software Foundation 1985, 1986 | |
| 4 | |
| 5 ;; Author: Wolfgang Rupprecht | |
| 6 ;; Maintainer: FSF | |
| 7 ;; Created: 21 Nov 1986 | |
| 8 ;; Keywords: hardware | |
| 9 | |
| 10 ;; (from code originally written by John Robinson@bbn for the bitgraph) | |
| 11 | |
| 12 ;; This file is part of GNU Emacs. | |
| 13 | |
| 14 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
| 15 ;; it under the terms of the GNU General Public License as published by | |
| 16 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 17 ;; any later version. | |
| 18 | |
| 19 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 22 ;; GNU General Public License for more details. | |
| 23 | |
| 24 ;; You should have received a copy of the GNU General Public License | |
| 25 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
| 26 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
| 27 | |
| 28 ;;; Code: | |
| 29 | |
| 30 ;;; User customization option: | |
| 31 | |
| 32 (defvar sup-mouse-fast-select-window nil | |
| 33 "*Non-nil for mouse hits to select new window, then execute; else just select.") | |
| 34 | |
| 35 (defconst mouse-left 0) | |
| 36 (defconst mouse-center 1) | |
| 37 (defconst mouse-right 2) | |
| 38 | |
| 39 (defconst mouse-2left 4) | |
| 40 (defconst mouse-2center 5) | |
| 41 (defconst mouse-2right 6) | |
| 42 | |
| 43 (defconst mouse-3left 8) | |
| 44 (defconst mouse-3center 9) | |
| 45 (defconst mouse-3right 10) | |
| 46 | |
| 47 ;;; Defuns: | |
| 48 | |
| 772 | 49 (defun sup-window-edges (&optional win) |
| 50 (error "not implemented") | |
| 51 (window-pixel-edges win)) | |
| 52 | |
| 0 | 53 (defun sup-mouse-report () |
| 54 "This function is called directly by the mouse, it parses and | |
| 55 executes the mouse commands. | |
| 56 | |
| 57 L move point * |---- These apply for mouse click in a window. | |
| 58 2L delete word | | |
| 59 3L copy word | If sup-mouse-fast-select-window is nil, | |
| 60 C move point and yank * | just selects that window. | |
| 61 2C yank pop | | |
| 62 R set mark * | | |
| 63 2R delete region | | |
| 64 3R copy region | | |
| 65 | |
| 66 on modeline on \"scroll bar\" in minibuffer | |
| 67 L scroll-up line to top execute-extended-command | |
| 68 C proportional goto-char line to middle mouse-help | |
| 69 R scroll-down line to bottom eval-expression" | |
| 70 | |
| 71 (interactive) | |
| 72 (let* | |
| 73 ;; expect a string of <esc>:<buttons>;<x-pos>;<y-pos>c | |
| 74 ((buttons (sup-get-tty-num ?\;)) | |
| 75 (x (sup-get-tty-num ?\;)) | |
| 76 (y (sup-get-tty-num ?c)) | |
| 77 (window (sup-pos-to-window x y)) | |
| 772 | 78 (edges (sup-window-edges window)) |
| 0 | 79 (old-window (selected-window)) |
| 80 (in-minibuf-p (eq y (1- (frame-height)))) | |
| 81 (same-window-p (and (not in-minibuf-p) (eq window old-window))) | |
| 82 (in-modeline-p (eq y (1- (nth 3 edges)))) | |
| 83 (in-scrollbar-p (>= x (1- (nth 2 edges))))) | |
| 84 (setq x (- x (nth 0 edges))) | |
| 85 (setq y (- y (nth 1 edges))) | |
| 86 | |
| 87 ; (error "mouse-hit %d %d %d" buttons x y) ;;;; debug | |
| 88 | |
| 89 (cond (in-modeline-p | |
| 90 (select-window window) | |
| 91 (cond ((= buttons mouse-left) | |
| 92 (scroll-up)) | |
| 93 ((= buttons mouse-right) | |
| 94 (scroll-down)) | |
| 95 ((= buttons mouse-center) | |
| 96 (goto-char (/ (* x | |
| 97 (- (point-max) (point-min))) | |
| 98 (1- (window-width)))) | |
| 99 (beginning-of-line) | |
| 100 (what-cursor-position))) | |
| 101 (select-window old-window)) | |
| 102 (in-scrollbar-p | |
| 103 (select-window window) | |
| 104 (scroll-up | |
| 105 (cond ((= buttons mouse-left) | |
| 106 y) | |
| 107 ((= buttons mouse-right) | |
| 108 (+ y (- 2 (window-height)))) | |
| 109 ((= buttons mouse-center) | |
| 110 (/ (+ 2 y y (- (window-height))) 2)) | |
| 111 (t | |
| 112 0))) | |
| 113 (select-window old-window)) | |
| 114 (same-window-p | |
| 115 (cond ((= buttons mouse-left) | |
| 116 (sup-move-point-to-x-y x y)) | |
| 117 ((= buttons mouse-2left) | |
| 118 (sup-move-point-to-x-y x y) | |
| 119 (kill-word 1)) | |
| 120 ((= buttons mouse-3left) | |
| 121 (sup-move-point-to-x-y x y) | |
| 122 (save-excursion | |
| 123 (copy-region-as-kill | |
| 124 (point) (progn (forward-word 1) (point)))) | |
| 125 (setq this-command 'yank) | |
| 126 ) | |
| 127 ((= buttons mouse-right) | |
| 128 (push-mark) | |
| 129 (sup-move-point-to-x-y x y) | |
| 130 (exchange-point-and-mark)) | |
| 131 ((= buttons mouse-2right) | |
| 132 (push-mark) | |
| 133 (sup-move-point-to-x-y x y) | |
| 134 (kill-region (mark) (point))) | |
| 135 ((= buttons mouse-3right) | |
| 136 (push-mark) | |
| 137 (sup-move-point-to-x-y x y) | |
| 138 (copy-region-as-kill (mark) (point)) | |
| 139 (setq this-command 'yank)) | |
| 140 ((= buttons mouse-center) | |
| 141 (sup-move-point-to-x-y x y) | |
| 142 (setq this-command 'yank) | |
| 143 (yank)) | |
| 144 ((= buttons mouse-2center) | |
| 145 (yank-pop 1)) | |
| 146 ) | |
| 147 ) | |
| 148 (in-minibuf-p | |
| 149 (cond ((= buttons mouse-right) | |
| 150 (call-interactively 'eval-expression)) | |
| 151 ((= buttons mouse-left) | |
| 152 (call-interactively 'execute-extended-command)) | |
| 153 ((= buttons mouse-center) | |
| 154 (describe-function 'sup-mouse-report)); silly self help | |
| 155 )) | |
| 156 (t ;in another window | |
| 157 (select-window window) | |
| 158 (cond ((not sup-mouse-fast-select-window)) | |
| 159 ((= buttons mouse-left) | |
| 160 (sup-move-point-to-x-y x y)) | |
| 161 ((= buttons mouse-right) | |
| 162 (push-mark) | |
| 163 (sup-move-point-to-x-y x y) | |
| 164 (exchange-point-and-mark)) | |
| 165 ((= buttons mouse-center) | |
| 166 (sup-move-point-to-x-y x y) | |
| 167 (setq this-command 'yank) | |
| 168 (yank)) | |
| 169 )) | |
| 170 ))) | |
| 171 | |
| 172 | |
| 173 (defun sup-get-tty-num (term-char) | |
| 174 "Read from terminal until TERM-CHAR is read, and return intervening number. | |
| 175 Upon non-numeric not matching TERM-CHAR signal an error." | |
| 176 (let | |
| 177 ((num 0) | |
| 178 (char (read-char))) | |
| 179 (while (and (>= char ?0) | |
| 180 (<= char ?9)) | |
| 181 (setq num (+ (* num 10) (- char ?0))) | |
| 182 (setq char (read-char))) | |
| 183 (or (eq term-char char) | |
| 184 (error "Invalid data format in mouse command")) | |
| 185 num)) | |
| 186 | |
| 187 (defun sup-move-point-to-x-y (x y) | |
| 188 "Position cursor in window coordinates. | |
| 189 X and Y are 0-based character positions in the window." | |
| 190 (move-to-window-line y) | |
| 191 (move-to-column x) | |
| 192 ) | |
| 193 | |
| 194 (defun sup-pos-to-window (x y) | |
| 195 "Find window corresponding to frame coordinates. | |
| 196 X and Y are 0-based character positions on the frame." | |
| 772 | 197 (let ((edges (sup-window-edges)) |
| 0 | 198 (window nil)) |
| 199 (while (and (not (eq window (selected-window))) | |
| 200 (or (< y (nth 1 edges)) | |
| 201 (>= y (nth 3 edges)) | |
| 202 (< x (nth 0 edges)) | |
| 203 (>= x (nth 2 edges)))) | |
| 204 (setq window (next-window window)) | |
| 772 | 205 (setq edges (sup-window-edges window)) |
| 0 | 206 ) |
| 207 (or window (selected-window)) | |
| 208 ) | |
| 209 ) | |
| 210 | |
| 211 ;;; sup-mouse.el ends here |