Mercurial > hg > xemacs-beta
comparison src/event-msw.c @ 502:7039e6323819
[xemacs-hg @ 2001-05-04 22:41:46 by ben]
----------------------- byte-comp warning fixes -----------------
New functions for cleanly eliminating byte-compiler warnings.
Their definitions require no changes at all in bytecomp.el,
meaning that any package that wants to use them and be compatible
with older versions of XEmacs need only copy the code and rename
the functions (i.e. prefix them with the package name).
Eliminate byte-compiler warnings using the new functions in
bytecomp-runtime.el.
Move coding-system-put,get,category, since they're not
Mule-specific and are used in prefer-coding-system.
font.el was incredibly ugly. Clean it up. Avoid using defsubst
for any exported functions, to avoid possible compatibility
problems if we later change the internal interface. (It happened
before, with face accessors, between 19.8 and 19.9). Fix tons
of warnings.
Clean up (new function gpm-is-supported-p eliminates duplicate
code in gpm-create/delete-device-hook) and eliminate warnings.
---------- make byte-recompile-directory work in the ---------
core `lisp' dir, even in the absence of
a Mule XEmacs (i.e. make it skip the Mule
files rather than trying to compile them).
now you should be able to do `touch *.el'
in the `lisp' dir, then
M-x byte-recompile-directory, and get no
warnings.
Avoid trying to compile Mule files in byte-recompile-directory
when we're not in a Mule XEmacs, since we're highly likely to get
syntax errors.
Add a coding-system cookie to all Mule files so that
byte-recompile-directory ignores them.
Magic cookie function moved to files.el from code-files.el (for
use by bytecomp even in a non-coding-system XEmacs), and changed
names and semantics for use by bytecomp. NOTE: IMO this is an
internal function that we can change as we like (and there is
absolutely no code anywhere else using the function).
---------------- GUI improvements: menus, help -------------------
Rearrange order of keymap declarations to be alphabetical.
Improve help on help to include all bindings, and group by
category. Add bindings for new Info commands. Remove
warnings. Use command-hyper-apropos in place of command-apropos.
Add a function to do the equivalent of command-apropos.
Evals its help-text argument so you can put expressions there.
Used now by help-for-help.
Add binding to continue text searches. Expand index searches to
work over multiple info documents. Add commands to search
text/index in User and Lispref.
Add new entry, "Uncomment Region" (parallels "Comment Out Region").
Redo Help menu; add bindings for new Info commands to search the
index or text of the User and Lispref manuals. Add command for
mark-paragraph, activate-region. Make Edit->R accelerator be
rectangle, not register (more commonly used), and put rectangle
first. Fix the Edit Init File entry to never load the .elc file.
Simplify the default-popup-menu. Add Cmds->Tabs menu.
Use kp-left not kp_left, etc.
---------------- Miscellaneous bug fixes/cleanup -------------------
byte-compiler-options: Correct doc string.
easy-menu-do-define: fix extra quote.
fill-paragraph-or-region:Rewrite to be more correct -- use
call-interactively so that we always get exactly the same
behavior as if the functions were called directly.
No need to fiddle with zmacs-region-stays, now that bogus
clearing of it (2001-04-28 src/ChangeLog) is removed.
Put dialog titles back in -- this time correctly. Fix various
other problems with leaks and such.
key-sequence-list-description:
Clean up fun to always correctly canonicalize.
Clean up Kinsoku comments, synch comment-region with FSF 20.7.
* simple.el (region-exists-p):
* simple.el (region-active-p):
Add comment about which one is correct to use in menu specs.
* sound.el (load-sound-file):
Minor code clean up.
* startup.el:
* startup.el (command-line-early):
* startup.el (initial-scratch-message):
Comment changes. Add info about sample.init.el to splash screen.
Improve initial-scratch-message and clarify purpose of Scratch
buffer. Fix byte-compile warning.
------------------------ Added features -------------------------
Add new variable to control whether etags checks all parent
directories for tag files. (On by default.)
* hash-table.el: New file, useful utility functions.
* dumped-lisp.el (preloaded-file-list): Dump hash-table.el.
------------ notable bug fix: Windows event code --------------
Get critical quit working.
------------ notable bug fix and new feature: regex code --------------
Shy groups were implemented in a horrible, half-assed way that
would cause them to screw up regex searching in most cases.
Fixed to work correctly.
Also extended back-reference syntax past 9. Only is recognized
as such if there are at least that many non-shy groups; and
optionally will warn about such uses, to catch old code that
might be using them differently. (Added variable to control
this in search.c -- `warn-about-possibly-incompatible-back-
references', on by default for the moment. Declared in lisp.h.
---------------- process/SIGIO improvements -------------------
define USE_GETADDRINFO to replace more complex conditional,
and use it. the code conditionalized on this in
unix_open_network_stream had *serious* problems handling errors.
it's now fixed, and major amounts of duplicate code between
the two versions were combined.
don't disable SIGIO and other interrupts unless
CONNECT_NEEDS_SLOWED_INTERRUPTS is defined -- don't penalize OS's
without bugs. similarly for a freebsd bug that was affecting all
OS's.
* s\ultrix.h:
define CONNECT_NEEDS_SLOWED_INTERRUPTS, since that's the OS
mentioned as having a kernel bug.
* sysdep.c (request_sigio_on_device):
* sysdep.c (unrequest_sigio_on_device):
fix SIGIO problems on Linux. add check for O_ASYNC in case it's
defined and FASYNC isn't. add comment about other ways to do
SIGIO on Linux.
* callproc.c (Fold_call_process_internal):
* process.c (Fstart_process_internal):
Deal with the possibility that `default-directory' doesn't
have terminating slash. Correct comments about vfork.
---------------- Miscellaneous bug fixes/cleanup -------------------
* callint.c (Finteractive):
Add lots of documentation -- exactly what the Lisp equivalents of
all the interactive specs are.
* console.h (struct console): change type of quit_char to Emchar.
* event-msw.c (lstream_type_create_mswindows_selectable): spacing
change.
Eliminate events-mod.h and combine into events.h.
* emacs.c:
* emacs.c (make_arg_list_1):
* emacs.c (main_1):
A couple of char->Extbyte changes, add a comment.
* glyphs-msw.c:
Correct indentation of function defns to not exceed 80 cols.
Try (sort of) to fix some code that sets the colors of the
progress gauge. (Commented out)
* keymap.c (syms_of_keymap):
use DEFSYMBOL.
* process.c (read_process_output):
No need to fiddle with zmacs_region_stays, now that bogus
clearing of it (see below) is removed.
* search.c (Freplace_match): warning fix.
author | ben |
---|---|
date | Fri, 04 May 2001 22:42:35 +0000 |
parents | 54fa1a5c2d12 |
children | 0493e9f3c27f |
comparison
equal
deleted
inserted
replaced
501:0a255b32b157 | 502:7039e6323819 |
---|---|
63 #include "syswait.h" | 63 #include "syswait.h" |
64 #include "systime.h" | 64 #include "systime.h" |
65 #include "sysdep.h" | 65 #include "sysdep.h" |
66 #include "objects-msw.h" | 66 #include "objects-msw.h" |
67 | 67 |
68 #include "events-mod.h" | |
69 #ifdef HAVE_MSG_SELECT | 68 #ifdef HAVE_MSG_SELECT |
70 #include "sysfile.h" | 69 #include "sysfile.h" |
71 #include "console-tty.h" | 70 #include "console-tty.h" |
72 #elif defined(CYGWIN) | 71 #elif defined(CYGWIN) |
73 typedef unsigned int SOCKET; | 72 typedef unsigned int SOCKET; |
85 #define ADJR_MENUFLAG FALSE | 84 #define ADJR_MENUFLAG FALSE |
86 #endif | 85 #endif |
87 | 86 |
88 /* Fake key modifier which is attached to a quit char event. | 87 /* Fake key modifier which is attached to a quit char event. |
89 Removed upon dequeueing an event */ | 88 Removed upon dequeueing an event */ |
90 #define FAKE_MOD_QUIT 0x80 | 89 #define FAKE_MOD_QUIT (1 << 20) |
90 #define FAKE_MOD_QUIT_CRITICAL (1 << 21) | |
91 | 91 |
92 /* Timer ID used for button2 emulation */ | 92 /* Timer ID used for button2 emulation */ |
93 #define BUTTON_2_TIMER_ID 1 | 93 #define BUTTON_2_TIMER_ID 1 |
94 | 94 |
95 static Lisp_Object mswindows_find_frame (HWND hwnd); | 95 static Lisp_Object mswindows_find_frame (HWND hwnd); |
1046 | 1046 |
1047 sevt = XEVENT(event); | 1047 sevt = XEVENT(event); |
1048 if (sevt->event_type == key_press_event | 1048 if (sevt->event_type == key_press_event |
1049 && (sevt->event.key.modifiers & FAKE_MOD_QUIT)) | 1049 && (sevt->event.key.modifiers & FAKE_MOD_QUIT)) |
1050 { | 1050 { |
1051 sevt->event.key.modifiers &= ~FAKE_MOD_QUIT; | 1051 sevt->event.key.modifiers &= |
1052 ~(FAKE_MOD_QUIT | FAKE_MOD_QUIT_CRITICAL); | |
1052 --mswindows_quit_chars_count; | 1053 --mswindows_quit_chars_count; |
1053 } | 1054 } |
1054 | 1055 |
1055 return event; | 1056 return event; |
1056 } | 1057 } |
2145 { | 2146 { |
2146 BYTE keymap_trans[256]; | 2147 BYTE keymap_trans[256]; |
2147 BYTE keymap_orig[256]; | 2148 BYTE keymap_orig[256]; |
2148 BYTE keymap_sticky[256]; | 2149 BYTE keymap_sticky[256]; |
2149 int has_AltGr = mswindows_current_layout_has_AltGr (); | 2150 int has_AltGr = mswindows_current_layout_has_AltGr (); |
2150 int mods = 0; | 2151 int mods = 0, mods_with_shift = 0; |
2151 int extendedp = lParam & 0x1000000; | 2152 int extendedp = lParam & 0x1000000; |
2152 Lisp_Object keysym; | 2153 Lisp_Object keysym; |
2153 int sticky_changed; | 2154 int sticky_changed; |
2154 | 2155 |
2155 #ifdef DEBUG_XEMACS | 2156 #ifdef DEBUG_XEMACS |
2180 } | 2181 } |
2181 else | 2182 else |
2182 memcpy (keymap_sticky, keymap_orig, 256); | 2183 memcpy (keymap_sticky, keymap_orig, 256); |
2183 | 2184 |
2184 mods = mswindows_modifier_state (keymap_sticky, (DWORD) -1, has_AltGr); | 2185 mods = mswindows_modifier_state (keymap_sticky, (DWORD) -1, has_AltGr); |
2186 mods_with_shift = mods; | |
2185 | 2187 |
2186 /* Handle non-printables */ | 2188 /* Handle non-printables */ |
2187 if (!NILP (keysym = mswindows_key_to_emacs_keysym (wParam, mods, | 2189 if (!NILP (keysym = mswindows_key_to_emacs_keysym (wParam, mods, |
2188 extendedp))) | 2190 extendedp))) |
2189 { | 2191 { |
2248 | 2250 |
2249 while (PeekMessage (&tranmsg, hwnd, WM_CHAR, WM_CHAR, PM_REMOVE) | 2251 while (PeekMessage (&tranmsg, hwnd, WM_CHAR, WM_CHAR, PM_REMOVE) |
2250 || PeekMessage (&tranmsg, hwnd, WM_SYSCHAR, WM_SYSCHAR, | 2252 || PeekMessage (&tranmsg, hwnd, WM_SYSCHAR, WM_SYSCHAR, |
2251 PM_REMOVE)) | 2253 PM_REMOVE)) |
2252 { | 2254 { |
2253 int mods1 = mods; | 2255 int mods_with_quit = mods; |
2254 WPARAM ch = tranmsg.wParam; | 2256 WPARAM ch = tranmsg.wParam; |
2255 | 2257 |
2256 /* If a quit char with no modifiers other than control and | 2258 /* If a quit char with no modifiers other than control and |
2257 shift, then mark it with a fake modifier, which is removed | 2259 shift, then mark it with a fake modifier, which is removed |
2258 upon dequeueing the event */ | 2260 upon dequeueing the event */ |
2259 /* #### This might also not withstand localization, if | 2261 /* !!#### Fix this in my mule ws -- replace current_buffer |
2260 quit character is not a latin-1 symbol */ | 2262 with 0 */ |
2261 if (((quit_ch < ' ' && (mods & XEMACS_MOD_CONTROL) | 2263 if (((quit_ch < ' ' && (mods & XEMACS_MOD_CONTROL) |
2262 && quit_ch + 'a' - 1 == ch) | 2264 && DOWNCASE (current_buffer, quit_ch + 'a' - 1) == |
2265 DOWNCASE (current_buffer, ch)) | |
2263 || (quit_ch >= ' ' && !(mods & XEMACS_MOD_CONTROL) | 2266 || (quit_ch >= ' ' && !(mods & XEMACS_MOD_CONTROL) |
2264 && quit_ch == ch)) | 2267 && DOWNCASE (current_buffer, quit_ch) == |
2265 && ((mods & ~(XEMACS_MOD_CONTROL | XEMACS_MOD_SHIFT)) | 2268 DOWNCASE (current_buffer, ch))) |
2269 && ((mods_with_shift & | |
2270 ~(XEMACS_MOD_CONTROL | XEMACS_MOD_SHIFT)) | |
2266 == 0)) | 2271 == 0)) |
2267 { | 2272 { |
2268 mods1 |= FAKE_MOD_QUIT; | 2273 mods_with_quit |= FAKE_MOD_QUIT; |
2274 if (mods_with_shift & XEMACS_MOD_SHIFT) | |
2275 mods_with_quit |= FAKE_MOD_QUIT_CRITICAL; | |
2269 ++mswindows_quit_chars_count; | 2276 ++mswindows_quit_chars_count; |
2270 } | 2277 } |
2271 else if (potential_accelerator && !got_accelerator && | 2278 else if (potential_accelerator && !got_accelerator && |
2272 mswindows_char_is_accelerator (frame, ch)) | 2279 mswindows_char_is_accelerator (frame, ch)) |
2273 { | 2280 { |
2274 got_accelerator = 1; | 2281 got_accelerator = 1; |
2275 break; | 2282 break; |
2276 } | 2283 } |
2277 mswindows_enqueue_keypress_event (hwnd, make_char (ch), mods1); | 2284 mswindows_enqueue_keypress_event (hwnd, make_char (ch), |
2285 mods_with_quit); | |
2278 } /* while */ | 2286 } /* while */ |
2279 | 2287 |
2280 /* This generates WM_SYSCHAR messages, which are interpreted | 2288 /* This generates WM_SYSCHAR messages, which are interpreted |
2281 by DefWindowProc as the menu selections. */ | 2289 by DefWindowProc as the menu selections. */ |
2282 if (got_accelerator) | 2290 if (got_accelerator) |
3462 /* Quit cannot happen in modal loop: all program | 3470 /* Quit cannot happen in modal loop: all program |
3463 input is dedicated to Windows. */ | 3471 input is dedicated to Windows. */ |
3464 if (mswindows_in_modal_loop) | 3472 if (mswindows_in_modal_loop) |
3465 return; | 3473 return; |
3466 | 3474 |
3467 /* Drain windows queue. This sets up number of quit characters in | 3475 /* Drain windows queue. This sets up number of quit characters in |
3468 the queue */ | 3476 the queue. */ |
3469 mswindows_drain_windows_queue (); | 3477 mswindows_drain_windows_queue (); |
3470 | 3478 |
3471 if (mswindows_quit_chars_count > 0) | 3479 if (mswindows_quit_chars_count > 0) |
3472 { | 3480 { |
3473 /* Yes there's a hidden one... Throw it away */ | 3481 /* Yes there's a hidden one... Throw it away */ |
3481 while (mswindows_quit_chars_count-- > 0) | 3489 while (mswindows_quit_chars_count-- > 0) |
3482 { | 3490 { |
3483 emacs_event = mswindows_cancel_dispatch_event (&match_against); | 3491 emacs_event = mswindows_cancel_dispatch_event (&match_against); |
3484 assert (!NILP (emacs_event)); | 3492 assert (!NILP (emacs_event)); |
3485 | 3493 |
3486 if (XEVENT(emacs_event)->event.key.modifiers & XEMACS_MOD_SHIFT) | 3494 if (XEVENT (emacs_event)->event.key.modifiers & |
3495 FAKE_MOD_QUIT_CRITICAL) | |
3487 critical_p = 1; | 3496 critical_p = 1; |
3488 | 3497 |
3489 Fdeallocate_event(emacs_event); | 3498 Fdeallocate_event (emacs_event); |
3490 } | 3499 } |
3491 | 3500 |
3492 Vquit_flag = critical_p ? Qcritical : Qt; | 3501 Vquit_flag = critical_p ? Qcritical : Qt; |
3493 } | 3502 } |
3494 } | 3503 } |
3757 void | 3766 void |
3758 lstream_type_create_mswindows_selectable (void) | 3767 lstream_type_create_mswindows_selectable (void) |
3759 { | 3768 { |
3760 init_slurp_stream (); | 3769 init_slurp_stream (); |
3761 init_shove_stream (); | 3770 init_shove_stream (); |
3762 #if defined (HAVE_SOCKETS) && !defined(HAVE_MSG_SELECT) | 3771 #if defined (HAVE_SOCKETS) && !defined (HAVE_MSG_SELECT) |
3763 init_winsock_stream (); | 3772 init_winsock_stream (); |
3764 #endif | 3773 #endif |
3765 } | 3774 } |
3766 | 3775 |
3767 void | 3776 void |