Mercurial > hg > xemacs-beta
annotate lisp/x-win-xfree86.el @ 4932:8b63e21b0436
fix compile issues with gcc 4
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* aclocal.m4 (XE_SHLIB_STUFF):
Use -export-all-symbols instead of -export-dynamic on PE targets
(Cygwin and MinGW).
* configure.ac (XE_EXPAND_VARIABLE):
* configure.ac (TAB):
Create variable XEMACS_CC_GPP to check whether we're running g++.
Don't just check for an executable called `g++' -- it might be
called g++-4 or whatever. Instead, check for either named `g++*'
or claiming to be g++ when called with --version. Rewrite code do
use the variable.
Add -fno-strict-aliasing to optimization flags when GCC and
optimized, and in all cases with g++, since under these circumstances
strict aliasing is otherwise assumed, and XEmacs can't easily be
made to respect its restrictions.
* configure: Regenerate.
lib-src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* fakemail.c (args_size):
* fakemail.c (parse_header):
* ootags.c (C_entries):
Fix warnings about possible use of uninitialized vars.
lwlib/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* xlwgauge.c (GaugeResize):
* xlwgauge.c (GaugeSize):
Fix warnings about possible use of uninitialized vars.
modules/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_exec):
* postgresql/postgresql.c (Fpq_get_result):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* chartab.c (decode_char_table_range):
* extents.c (extent_fragment_update):
* objects-msw.c (initialize_font_instance):
* process.c (Fgetenv):
* redisplay-output.c (get_next_display_block):
Fix warnings about possible use of uninitialized vars.
* compiler.h:
* compiler.h (REGISTER):
* event-stream.c (is_scrollbar_event):
* window.c (window_scrollbar_width):
* window.c (window_scrollbar_height):
* window.c (window_left_window_gutter_width):
* window.c (window_right_window_gutter_width):
Add USED_IF_SCROLLBARS. Use it to fix warnings about unused
vars when --with-scrollbars=no.
* config.h.in:
Change comment to explain better why DECLARE_INLINE_HEADER
is needed.
* dialog-msw.c:
* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
* emacs.c (main_1):
* event-msw.c (struct mswin_message_debug):
* event-msw.c (debug_output_mswin_message):
* font-mgr.c:
* font-mgr.c (Ffc_config_filename):
* glyphs-msw.c (struct):
* glyphs-msw.c (bitmap_table):
* glyphs-x.c (update_widget_face):
* intl-win32.c (struct lang_to_string):
* intl-win32.c (lang_to_string_table):
* nas.c:
* objects-xlike-inc.c:
* objects-xlike-inc.c (xft_find_charset_font):
* syswindows.h:
* win32.c (mswindows_output_last_error):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
* lisp.h:
G++ 4.3 needs #include <limits> to avoid errors about min/max.
* lisp.h (disabled_assert_with_message):
Use disabled_assert* whenever asserts are disabled. Rewrite
disabled_assert* to avoid complaints about unused vars by
pretending to use the vars but casting them to (void).
Remove code that defined assert() weirdly if DEBUG_XEMACS but
not USE_ASSERTIONS -- configure sets USE_ASSERTIONS automatically
when DEBUG_XEMACS, and if the user has forced it off, then
so be it.
* lisp.h (SYMBOL_KEYWORD):
Put some of the combined `extern Lisp_Object's back under
the file they are declared in. Cosmetic fix.
* number.h:
Remove `extern Lisp_Object' decls that duplicate lisp.h,
since they have different C vs. C++ linkage.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sun, 24 Jan 2010 22:04:58 -0600 |
| parents | e3ef34f57070 |
| children | 17fe69fff7fa |
| rev | line source |
|---|---|
| 428 | 1 ;;; x-win-xfree86.el --- runtime initialization for XFree86 servers |
| 2 ;; Copyright (C) 1995 Sun Microsystems, Inc. | |
| 3 ;; Copyright (C) 1995 Ben Wing. | |
| 4 | |
| 5 ;; Author: Ben Wing | |
| 6 ;; Author: Martin Buchholz (rewritten to use function-key-map) | |
| 7 ;; Keywords: terminals | |
| 8 | |
| 9 ;; This file is part of XEmacs. | |
| 10 | |
| 11 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 12 ;; under the terms of the GNU General Public License as published by | |
| 13 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;; any later version. | |
| 15 | |
| 16 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 ;; General Public License for more details. | |
| 20 | |
| 21 ;; You should have received a copy of the GNU General Public License | |
| 22 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 24 ;; Boston, MA 02111-1307, USA. | |
| 25 | |
| 26 ;;; Commentary: | |
| 27 | |
| 28 ;; This file is loaded by x-win.el at run-time when we are sure that XEmacs | |
| 29 ;; is running on the display of something running XFree86 (Linux, | |
| 30 ;; NetBSD, FreeBSD, and perhaps other Intel Unixen). | |
| 31 | |
| 32 ;;; #### bleck!!! Use key-translation-map! | |
| 33 | |
| 34 ;;; #### Counter-bleck!! We shouldn't override a user binding for F13. | |
| 35 ;;; So we use function-key-map for now. | |
| 36 ;;; When we've implemented a fallback-style equivalent of | |
| 37 ;;; keyboard-translate-table, we'll use that instead. (martin) | |
| 38 | |
| 39 ;; For no obvious reason, shift-F1 is called F13, although Meta-F1 and | |
| 40 ;; Control-F1 have normal names. | |
| 41 | |
| 502 | 42 ;;; Code: |
| 43 | |
| 44 (globally-declare-fboundp | |
| 45 '(x-keysym-on-keyboard-p x-keysym-on-keyboard-sans-modifiers-p)) | |
| 46 | |
| 428 | 47 ;;;###autoload |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3171
diff
changeset
|
48 (defun x-win-init-xfree86 (device) |
| 3171 | 49 |
| 50 ;; We know this keyboard is an XFree86 keyboard. As such, we can predict | |
| 51 ;; what key scan codes will correspond to the keys on US keyboard layout, | |
| 52 ;; and we can use that information to fall back to the US layout when | |
| 53 ;; looking up commands that would otherwise fail. (Cf. the hard-coding of | |
| 54 ;; this information in /usr/X11R6/lib/X11/xkb/keycodes/xfree86 ) | |
| 55 ;; | |
| 56 ;; These settings for x-us-keymap-first-keycode and | |
| 57 ;; x-us-keymap-description were determined with | |
| 58 ;; | |
| 59 ;; setxkbmap us | |
| 60 ;; xmodmap -pke > keyboard-description.txt | |
| 61 ;; | |
| 62 ;; "8" is the key code of the first line, x-us-keymap-description is | |
| 63 ;; taken from the column describing the bindings. | |
| 64 | |
| 65 (setq x-us-keymap-first-keycode 8 | |
| 66 x-us-keymap-description | |
| 67 [nil nil [?1 ?!] [?2 ?@] [?3 ?\#] [?4 ?$] [?5 ?%] [?6 ?^] [?7 ?&] | |
| 68 [?8 ?*] [?9 ?\(] [?0 ?\)] [?- ?_] [?= ?+] nil ?\t [?q ?Q] | |
| 69 [?w ?W] [?e ?E] [?r ?R] [?t ?T] [?y ?Y] [?u ?U] [?i ?I] [?o ?O] | |
| 70 [?p ?P] [?\[ ?{] [?\] ?}] nil nil [?a ?A] [?s ?S] [?d ?D] | |
| 71 [?f ?F] [?g ?G] [?h ?H] [?j ?J] [?k ?K] [?l ?L] [?\; ?:] | |
| 72 [?\' ?\"] [?\` ?~] nil [?\\ ?|] [?z ?Z] [?x ?X] [?c ?C] | |
| 73 [?v ?V] [?b ?B] [?n ?N] [?m ?M] [?\, ?<] [?\. ?>] [?/ ?\?] | |
| 74 nil ?* nil ?\ nil nil nil nil nil nil nil nil nil nil nil | |
| 75 nil nil ?7 ?8 ?9 ?- ?4 ?5 ?6 ?+ ?1 ?2 ?3 ?0 ?\. nil nil | |
| 76 [?< ?>] nil nil nil nil nil nil nil nil nil nil nil nil | |
| 77 nil nil nil nil nil ?/ nil nil nil nil nil nil nil nil | |
| 78 nil nil nil nil nil ?=]) | |
| 79 | |
| 428 | 80 (loop for (key sane-key) in |
| 81 '((f13 f1) | |
| 82 (f14 f2) | |
| 83 (f15 f3) | |
| 84 (f16 f4) | |
| 85 (f17 f5) | |
| 86 (f18 f6) | |
| 87 (f19 f7) | |
| 88 (f20 f8) | |
| 89 (f21 f9) | |
| 90 (f22 f10) | |
| 91 (f23 f11) | |
| 92 (f24 f12)) | |
|
4482
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
93 ;; Get the correct value for function-key-map |
|
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
94 with function-key-map = (symbol-value-in-console 'function-key-map |
|
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
95 (device-console device) |
|
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
96 function-key-map) |
|
e3ef34f57070
Bind function-key-map correctly in device-specific startup code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4477
diff
changeset
|
97 |
| 428 | 98 do |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3171
diff
changeset
|
99 (when (and (x-keysym-on-keyboard-p key device) |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3171
diff
changeset
|
100 (not (x-keysym-on-keyboard-sans-modifiers-p key device))) |
| 428 | 101 ;; define also the control, meta, and meta-control versions. |
| 102 (loop for mods in '(() (control) (meta) (meta control)) do | |
| 103 (define-key function-key-map `[(,@mods ,key)] `[(shift ,@mods ,sane-key)]) | |
| 104 )))) | |
| 105 | |
| 106 ;;; x-win-xfree86.el ends here |