Mercurial > hg > xemacs-beta
comparison src/event-msw.c @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
author | ben |
---|---|
date | Thu, 04 Nov 2004 23:08:28 +0000 |
parents | 04bc9d2f42c7 |
children | ab71ad6ff3dd |
comparison
equal
deleted
inserted
replaced
2366:2a392e0c390a | 2367:ecf1ebac70d8 |
---|---|
2063 return (HDDEDATA) DDE_FACK; | 2063 return (HDDEDATA) DDE_FACK; |
2064 } | 2064 } |
2065 else if (!DdeCmpStringHandles (hszTopic, mswindows_dde_topic_system)) | 2065 else if (!DdeCmpStringHandles (hszTopic, mswindows_dde_topic_system)) |
2066 { | 2066 { |
2067 DWORD len = DdeGetData (hdata, NULL, 0, 0); | 2067 DWORD len = DdeGetData (hdata, NULL, 0, 0); |
2068 LPBYTE extcmd = (LPBYTE) ALLOCA (len + 1); | 2068 Extbyte *extcmd = alloca_extbytes (len + 1); |
2069 Ibyte *cmd; | 2069 Ibyte *cmd; |
2070 Ibyte *end; | 2070 Ibyte *end; |
2071 struct gcpro gcpro1, gcpro2; | 2071 struct gcpro gcpro1, gcpro2; |
2072 Lisp_Object l_dndlist = Qnil; | 2072 Lisp_Object l_dndlist = Qnil; |
2073 Lisp_Object emacs_event = Fmake_event (Qnil, Qnil); | 2073 Lisp_Object emacs_event = Fmake_event (Qnil, Qnil); |
2074 Lisp_Object frmcons, devcons, concons; | 2074 Lisp_Object frmcons, devcons, concons; |
2075 Lisp_Event *event = XEVENT (emacs_event); | 2075 Lisp_Event *event = XEVENT (emacs_event); |
2076 | 2076 |
2077 DdeGetData (hdata, extcmd, len, 0); | 2077 DdeGetData (hdata, (LPBYTE) extcmd, len, 0); |
2078 DdeFreeDataHandle (hdata); | 2078 DdeFreeDataHandle (hdata); |
2079 | 2079 |
2080 TO_INTERNAL_FORMAT (DATA, (extcmd, len), | 2080 TO_INTERNAL_FORMAT (DATA, (extcmd, len), |
2081 C_STRING_ALLOCA, cmd, | 2081 C_STRING_ALLOCA, cmd, |
2082 Qmswindows_tstr); | 2082 Qmswindows_tstr); |
2083 | 2083 |
2084 /* Check syntax & that it's an [Open("foo")] command, which we | 2084 /* Check syntax & that it's an [Open("foo")] command, which we |
2085 * treat like a file drop */ | 2085 * treat like a file drop */ |
2086 if (*cmd == '[') | 2086 if (*cmd == '[') |
2087 cmd++; | 2087 cmd++; |
2088 if (qxestrncasecmp_c (cmd, MSWINDOWS_DDE_ITEM_OPEN, | 2088 if (qxestrncasecmp_ascii (cmd, MSWINDOWS_DDE_ITEM_OPEN, |
2089 strlen (MSWINDOWS_DDE_ITEM_OPEN))) | 2089 strlen (MSWINDOWS_DDE_ITEM_OPEN))) |
2090 return DDE_FNOTPROCESSED; | 2090 return DDE_FNOTPROCESSED; |
2091 cmd += strlen (MSWINDOWS_DDE_ITEM_OPEN); | 2091 cmd += strlen (MSWINDOWS_DDE_ITEM_OPEN); |
2092 while (*cmd == ' ') | 2092 while (*cmd == ' ') |
2093 cmd++; | 2093 cmd++; |
2944 case WM_MBUTTONUP: | 2944 case WM_MBUTTONUP: |
2945 /* Real middle mouse button has nothing to do with emulated one: | 2945 /* Real middle mouse button has nothing to do with emulated one: |
2946 if one wants to exercise fingers playing chords on the mouse, | 2946 if one wants to exercise fingers playing chords on the mouse, |
2947 he is allowed to do that! */ | 2947 he is allowed to do that! */ |
2948 mswindows_enqueue_mouse_button_event (hwnd, message_, | 2948 mswindows_enqueue_mouse_button_event (hwnd, message_, |
2949 MAKEPOINTS (lParam), | 2949 XE_MAKEPOINTS (lParam), |
2950 wParam &~ MK_MBUTTON, | 2950 wParam &~ MK_MBUTTON, |
2951 GetMessageTime()); | 2951 GetMessageTime()); |
2952 break; | 2952 break; |
2953 | 2953 |
2954 case WM_LBUTTONUP: | 2954 case WM_LBUTTONUP: |
2964 else if (msframe->button2_is_down) | 2964 else if (msframe->button2_is_down) |
2965 { | 2965 { |
2966 msframe->button2_is_down = 0; | 2966 msframe->button2_is_down = 0; |
2967 msframe->ignore_next_rbutton_up = 1; | 2967 msframe->ignore_next_rbutton_up = 1; |
2968 mswindows_enqueue_mouse_button_event (hwnd, WM_MBUTTONUP, | 2968 mswindows_enqueue_mouse_button_event (hwnd, WM_MBUTTONUP, |
2969 MAKEPOINTS (lParam), | 2969 XE_MAKEPOINTS (lParam), |
2970 wParam | 2970 wParam |
2971 &~ (MK_LBUTTON | MK_MBUTTON | 2971 &~ (MK_LBUTTON | MK_MBUTTON |
2972 | MK_RBUTTON), | 2972 | MK_RBUTTON), |
2973 GetMessageTime()); | 2973 GetMessageTime()); |
2974 } | 2974 } |
2976 { | 2976 { |
2977 if (msframe->button2_need_rbutton) | 2977 if (msframe->button2_need_rbutton) |
2978 { | 2978 { |
2979 msframe->button2_need_rbutton = 0; | 2979 msframe->button2_need_rbutton = 0; |
2980 mswindows_enqueue_mouse_button_event (hwnd, WM_LBUTTONDOWN, | 2980 mswindows_enqueue_mouse_button_event (hwnd, WM_LBUTTONDOWN, |
2981 MAKEPOINTS (lParam), | 2981 XE_MAKEPOINTS (lParam), |
2982 wParam &~ MK_LBUTTON, | 2982 wParam &~ MK_LBUTTON, |
2983 GetMessageTime()); | 2983 GetMessageTime()); |
2984 } | 2984 } |
2985 mswindows_enqueue_mouse_button_event (hwnd, WM_LBUTTONUP, | 2985 mswindows_enqueue_mouse_button_event (hwnd, WM_LBUTTONUP, |
2986 MAKEPOINTS (lParam), | 2986 XE_MAKEPOINTS (lParam), |
2987 wParam &~ MK_LBUTTON, | 2987 wParam &~ MK_LBUTTON, |
2988 GetMessageTime()); | 2988 GetMessageTime()); |
2989 } | 2989 } |
2990 break; | 2990 break; |
2991 | 2991 |
3002 else if (msframe->button2_is_down) | 3002 else if (msframe->button2_is_down) |
3003 { | 3003 { |
3004 msframe->button2_is_down = 0; | 3004 msframe->button2_is_down = 0; |
3005 msframe->ignore_next_lbutton_up = 1; | 3005 msframe->ignore_next_lbutton_up = 1; |
3006 mswindows_enqueue_mouse_button_event (hwnd, WM_MBUTTONUP, | 3006 mswindows_enqueue_mouse_button_event (hwnd, WM_MBUTTONUP, |
3007 MAKEPOINTS (lParam), | 3007 XE_MAKEPOINTS (lParam), |
3008 wParam | 3008 wParam |
3009 &~ (MK_LBUTTON | MK_MBUTTON | 3009 &~ (MK_LBUTTON | MK_MBUTTON |
3010 | MK_RBUTTON), | 3010 | MK_RBUTTON), |
3011 GetMessageTime()); | 3011 GetMessageTime()); |
3012 } | 3012 } |
3014 { | 3014 { |
3015 if (msframe->button2_need_lbutton) | 3015 if (msframe->button2_need_lbutton) |
3016 { | 3016 { |
3017 msframe->button2_need_lbutton = 0; | 3017 msframe->button2_need_lbutton = 0; |
3018 mswindows_enqueue_mouse_button_event (hwnd, WM_RBUTTONDOWN, | 3018 mswindows_enqueue_mouse_button_event (hwnd, WM_RBUTTONDOWN, |
3019 MAKEPOINTS (lParam), | 3019 XE_MAKEPOINTS (lParam), |
3020 wParam &~ MK_RBUTTON, | 3020 wParam &~ MK_RBUTTON, |
3021 GetMessageTime()); | 3021 GetMessageTime()); |
3022 } | 3022 } |
3023 mswindows_enqueue_mouse_button_event (hwnd, WM_RBUTTONUP, | 3023 mswindows_enqueue_mouse_button_event (hwnd, WM_RBUTTONUP, |
3024 MAKEPOINTS (lParam), | 3024 XE_MAKEPOINTS (lParam), |
3025 wParam &~ MK_RBUTTON, | 3025 wParam &~ MK_RBUTTON, |
3026 GetMessageTime()); | 3026 GetMessageTime()); |
3027 } | 3027 } |
3028 break; | 3028 break; |
3029 | 3029 |
3034 { | 3034 { |
3035 KillTimer (hwnd, BUTTON_2_TIMER_ID); | 3035 KillTimer (hwnd, BUTTON_2_TIMER_ID); |
3036 msframe->button2_need_lbutton = 0; | 3036 msframe->button2_need_lbutton = 0; |
3037 msframe->button2_need_rbutton = 0; | 3037 msframe->button2_need_rbutton = 0; |
3038 if (mswindows_button2_near_enough (msframe->last_click_point, | 3038 if (mswindows_button2_near_enough (msframe->last_click_point, |
3039 MAKEPOINTS (lParam))) | 3039 XE_MAKEPOINTS (lParam))) |
3040 { | 3040 { |
3041 mswindows_enqueue_mouse_button_event (hwnd, WM_MBUTTONDOWN, | 3041 mswindows_enqueue_mouse_button_event (hwnd, WM_MBUTTONDOWN, |
3042 MAKEPOINTS (lParam), | 3042 XE_MAKEPOINTS (lParam), |
3043 wParam | 3043 wParam |
3044 &~ (MK_LBUTTON | MK_MBUTTON | 3044 &~ (MK_LBUTTON | MK_MBUTTON |
3045 | MK_RBUTTON), | 3045 | MK_RBUTTON), |
3046 GetMessageTime()); | 3046 GetMessageTime()); |
3047 msframe->button2_is_down = 1; | 3047 msframe->button2_is_down = 1; |
3052 msframe->last_click_point, | 3052 msframe->last_click_point, |
3053 msframe->last_click_mods | 3053 msframe->last_click_mods |
3054 &~ MK_RBUTTON, | 3054 &~ MK_RBUTTON, |
3055 msframe->last_click_time); | 3055 msframe->last_click_time); |
3056 mswindows_enqueue_mouse_button_event (hwnd, WM_LBUTTONDOWN, | 3056 mswindows_enqueue_mouse_button_event (hwnd, WM_LBUTTONDOWN, |
3057 MAKEPOINTS (lParam), | 3057 XE_MAKEPOINTS (lParam), |
3058 wParam &~ MK_LBUTTON, | 3058 wParam &~ MK_LBUTTON, |
3059 GetMessageTime()); | 3059 GetMessageTime()); |
3060 } | 3060 } |
3061 } | 3061 } |
3062 else | 3062 else |
3063 { | 3063 { |
3064 mswindows_set_chord_timer (hwnd); | 3064 mswindows_set_chord_timer (hwnd); |
3065 msframe->button2_need_rbutton = 1; | 3065 msframe->button2_need_rbutton = 1; |
3066 msframe->last_click_point = MAKEPOINTS (lParam); | 3066 msframe->last_click_point = XE_MAKEPOINTS (lParam); |
3067 msframe->last_click_mods = wParam; | 3067 msframe->last_click_mods = wParam; |
3068 } | 3068 } |
3069 msframe->last_click_time = GetMessageTime(); | 3069 msframe->last_click_time = GetMessageTime(); |
3070 break; | 3070 break; |
3071 | 3071 |
3076 { | 3076 { |
3077 KillTimer (hwnd, BUTTON_2_TIMER_ID); | 3077 KillTimer (hwnd, BUTTON_2_TIMER_ID); |
3078 msframe->button2_need_lbutton = 0; | 3078 msframe->button2_need_lbutton = 0; |
3079 msframe->button2_need_rbutton = 0; | 3079 msframe->button2_need_rbutton = 0; |
3080 if (mswindows_button2_near_enough (msframe->last_click_point, | 3080 if (mswindows_button2_near_enough (msframe->last_click_point, |
3081 MAKEPOINTS (lParam))) | 3081 XE_MAKEPOINTS (lParam))) |
3082 { | 3082 { |
3083 mswindows_enqueue_mouse_button_event (hwnd, WM_MBUTTONDOWN, | 3083 mswindows_enqueue_mouse_button_event (hwnd, WM_MBUTTONDOWN, |
3084 MAKEPOINTS (lParam), | 3084 XE_MAKEPOINTS (lParam), |
3085 wParam | 3085 wParam |
3086 &~ (MK_LBUTTON | MK_MBUTTON | 3086 &~ (MK_LBUTTON | MK_MBUTTON |
3087 | MK_RBUTTON), | 3087 | MK_RBUTTON), |
3088 GetMessageTime()); | 3088 GetMessageTime()); |
3089 msframe->button2_is_down = 1; | 3089 msframe->button2_is_down = 1; |
3094 msframe->last_click_point, | 3094 msframe->last_click_point, |
3095 msframe->last_click_mods | 3095 msframe->last_click_mods |
3096 &~ MK_LBUTTON, | 3096 &~ MK_LBUTTON, |
3097 msframe->last_click_time); | 3097 msframe->last_click_time); |
3098 mswindows_enqueue_mouse_button_event (hwnd, WM_RBUTTONDOWN, | 3098 mswindows_enqueue_mouse_button_event (hwnd, WM_RBUTTONDOWN, |
3099 MAKEPOINTS (lParam), | 3099 XE_MAKEPOINTS (lParam), |
3100 wParam &~ MK_RBUTTON, | 3100 wParam &~ MK_RBUTTON, |
3101 GetMessageTime()); | 3101 GetMessageTime()); |
3102 } | 3102 } |
3103 } | 3103 } |
3104 else | 3104 else |
3105 { | 3105 { |
3106 mswindows_set_chord_timer (hwnd); | 3106 mswindows_set_chord_timer (hwnd); |
3107 msframe->button2_need_lbutton = 1; | 3107 msframe->button2_need_lbutton = 1; |
3108 msframe->last_click_point = MAKEPOINTS (lParam); | 3108 msframe->last_click_point = XE_MAKEPOINTS (lParam); |
3109 msframe->last_click_mods = wParam; | 3109 msframe->last_click_mods = wParam; |
3110 } | 3110 } |
3111 msframe->last_click_time = GetMessageTime(); | 3111 msframe->last_click_time = GetMessageTime(); |
3112 break; | 3112 break; |
3113 | 3113 |
3149 /* When waiting for the second mouse button to finish | 3149 /* When waiting for the second mouse button to finish |
3150 button2 emulation, and have moved too far, just pretend | 3150 button2 emulation, and have moved too far, just pretend |
3151 as if timer has expired. This improves drag-select feedback */ | 3151 as if timer has expired. This improves drag-select feedback */ |
3152 if ((msframe->button2_need_lbutton || msframe->button2_need_rbutton) | 3152 if ((msframe->button2_need_lbutton || msframe->button2_need_rbutton) |
3153 && !mswindows_button2_near_enough (msframe->last_click_point, | 3153 && !mswindows_button2_near_enough (msframe->last_click_point, |
3154 MAKEPOINTS (lParam))) | 3154 XE_MAKEPOINTS (lParam))) |
3155 { | 3155 { |
3156 KillTimer (hwnd, BUTTON_2_TIMER_ID); | 3156 KillTimer (hwnd, BUTTON_2_TIMER_ID); |
3157 qxeSendMessage (hwnd, WM_TIMER, BUTTON_2_TIMER_ID, 0); | 3157 qxeSendMessage (hwnd, WM_TIMER, BUTTON_2_TIMER_ID, 0); |
3158 } | 3158 } |
3159 | 3159 |
3161 event = XEVENT(emacs_event); | 3161 event = XEVENT(emacs_event); |
3162 | 3162 |
3163 XSET_EVENT_CHANNEL (emacs_event, mswindows_find_frame(hwnd)); | 3163 XSET_EVENT_CHANNEL (emacs_event, mswindows_find_frame(hwnd)); |
3164 XSET_EVENT_TIMESTAMP (emacs_event, GetMessageTime()); | 3164 XSET_EVENT_TIMESTAMP (emacs_event, GetMessageTime()); |
3165 XSET_EVENT_TYPE (emacs_event, pointer_motion_event); | 3165 XSET_EVENT_TYPE (emacs_event, pointer_motion_event); |
3166 XSET_EVENT_MOTION_X (emacs_event,MAKEPOINTS (lParam).x); | 3166 XSET_EVENT_MOTION_X (emacs_event, XE_MAKEPOINTS (lParam).x); |
3167 XSET_EVENT_MOTION_Y (emacs_event,MAKEPOINTS (lParam).y); | 3167 XSET_EVENT_MOTION_Y (emacs_event, XE_MAKEPOINTS (lParam).y); |
3168 XSET_EVENT_MOTION_MODIFIERS (emacs_event, | 3168 XSET_EVENT_MOTION_MODIFIERS (emacs_event, |
3169 mswindows_modifier_state (NULL, wParam, 0)); | 3169 mswindows_modifier_state (NULL, wParam, 0)); |
3170 | 3170 |
3171 mswindows_enqueue_dispatch_event (emacs_event); | 3171 mswindows_enqueue_dispatch_event (emacs_event); |
3172 } | 3172 } |
3556 /* enqueue button4/5 events if mswindows_handle_mousewheel_event | 3556 /* enqueue button4/5 events if mswindows_handle_mousewheel_event |
3557 doesn't handle the event, such as when the scrollbars are not | 3557 doesn't handle the event, such as when the scrollbars are not |
3558 displayed */ | 3558 displayed */ |
3559 if (!mswindows_handle_mousewheel_event (mswindows_find_frame (hwnd), | 3559 if (!mswindows_handle_mousewheel_event (mswindows_find_frame (hwnd), |
3560 keys, delta, | 3560 keys, delta, |
3561 MAKEPOINTS (lParam))) | 3561 XE_MAKEPOINTS (lParam))) |
3562 mswindows_enqueue_mouse_button_event (hwnd, message_, | 3562 mswindows_enqueue_mouse_button_event (hwnd, message_, |
3563 MAKEPOINTS (lParam), | 3563 XE_MAKEPOINTS (lParam), |
3564 wParam, | 3564 wParam, |
3565 GetMessageTime()); | 3565 GetMessageTime()); |
3566 /* We are not in a modal loop so no pumping is necessary. */ | 3566 /* We are not in a modal loop so no pumping is necessary. */ |
3567 break; | 3567 break; |
3568 } | 3568 } |
3714 Charcount len = qxeDragQueryFile ((HDROP) wParam, i, NULL, 0); | 3714 Charcount len = qxeDragQueryFile ((HDROP) wParam, i, NULL, 0); |
3715 /* The URLs that we make here aren't correct according to section | 3715 /* The URLs that we make here aren't correct according to section |
3716 * 3.10 of rfc1738 because they're missing the //<host>/ part and | 3716 * 3.10 of rfc1738 because they're missing the //<host>/ part and |
3717 * because they may contain reserved characters. But that's OK - | 3717 * because they may contain reserved characters. But that's OK - |
3718 * they just need to be good enough to keep dragdrop.el happy. */ | 3718 * they just need to be good enough to keep dragdrop.el happy. */ |
3719 fname_ext = (Extbyte *) ALLOCA ((len + 1) * XETCHAR_SIZE); | 3719 fname_ext = alloca_extbytes ((len + 1) * XETCHAR_SIZE); |
3720 qxeDragQueryFile ((HDROP) wParam, i, fname_ext, len + 1); | 3720 qxeDragQueryFile ((HDROP) wParam, i, fname_ext, len + 1); |
3721 | 3721 |
3722 TO_INTERNAL_FORMAT (DATA, (fname_ext, len * XETCHAR_SIZE), | 3722 TO_INTERNAL_FORMAT (DATA, (fname_ext, len * XETCHAR_SIZE), |
3723 ALLOCA, (fname, fnamelen), | 3723 ALLOCA, (fname, fnamelen), |
3724 Qmswindows_tstr); | 3724 Qmswindows_tstr); |
3725 | 3725 |
3726 /* May be a shell link aka "shortcut" - replace fname if so */ | 3726 /* May be a shell link aka "shortcut" - replace fname if so */ |
3727 #if !defined (NO_CYGWIN_COM_SUPPORT) | 3727 #if !defined (NO_CYGWIN_COM_SUPPORT) |
3728 if (!qxestrcasecmp_c (fname + fnamelen - 4, ".LNK")) | 3728 if (!qxestrcasecmp_ascii (fname + fnamelen - 4, ".LNK")) |
3729 { | 3729 { |
3730 /* #### | 3730 /* #### |
3731 | 3731 |
3732 Note the following in the docs: | 3732 Note the following in the docs: |
3733 | 3733 |
3769 if (CoCreateInstance ( | 3769 if (CoCreateInstance ( |
3770 XECOMID (CLSID_ShellLink), | 3770 XECOMID (CLSID_ShellLink), |
3771 NULL, | 3771 NULL, |
3772 CLSCTX_INPROC_SERVER, | 3772 CLSCTX_INPROC_SERVER, |
3773 XECOMID (IID_IShellLinkW), | 3773 XECOMID (IID_IShellLinkW), |
3774 (void **) &psl) == S_OK) | 3774 &VOIDP_CAST (psl)) == S_OK) |
3775 { | 3775 { |
3776 IPersistFile *ppf; | 3776 IPersistFile *ppf; |
3777 | 3777 |
3778 if (XECOMCALL2 (psl, QueryInterface, | 3778 if (XECOMCALL2 (psl, QueryInterface, |
3779 XECOMID (IID_IPersistFile), | 3779 XECOMID (IID_IPersistFile), |
3780 (void **) &ppf) == | 3780 &VOIDP_CAST (ppf)) == S_OK) |
3781 S_OK) | |
3782 { | 3781 { |
3783 Extbyte *fname_unicode; | 3782 Extbyte *fname_unicode; |
3784 WIN32_FIND_DATAW wfd; | 3783 WIN32_FIND_DATAW wfd; |
3785 LPWSTR resolved = | 3784 LPWSTR resolved = |
3786 alloca_array (WCHAR, PATH_MAX + 1); | 3785 alloca_array (WCHAR, PATH_MAX + 1); |
3830 if (CoCreateInstance ( | 3829 if (CoCreateInstance ( |
3831 XECOMID (CLSID_ShellLink), | 3830 XECOMID (CLSID_ShellLink), |
3832 NULL, | 3831 NULL, |
3833 CLSCTX_INPROC_SERVER, | 3832 CLSCTX_INPROC_SERVER, |
3834 XECOMID (IID_IShellLinkA), | 3833 XECOMID (IID_IShellLinkA), |
3835 (void **) &psl) == S_OK) | 3834 &VOIDP_CAST (psl)) == S_OK) |
3836 { | 3835 { |
3837 IPersistFile *ppf; | 3836 IPersistFile *ppf; |
3838 | 3837 |
3839 if (XECOMCALL2 (psl, QueryInterface, | 3838 if (XECOMCALL2 (psl, QueryInterface, |
3840 XECOMID (IID_IPersistFile), | 3839 XECOMID (IID_IPersistFile), |
3841 (void **) &ppf) == | 3840 &VOIDP_CAST (ppf)) == S_OK) |
3842 S_OK) | |
3843 { | 3841 { |
3844 Extbyte *fname_unicode; | 3842 Extbyte *fname_unicode; |
3845 WIN32_FIND_DATAA wfd; | 3843 WIN32_FIND_DATAA wfd; |
3846 LPSTR resolved = | 3844 LPSTR resolved = |
3847 alloca_array (CHAR, PATH_MAX + 1); | 3845 alloca_array (CHAR, PATH_MAX + 1); |
3914 | 3912 |
3915 /* Sizes always in bytes, even for unicode. | 3913 /* Sizes always in bytes, even for unicode. |
3916 ImmGetCompositionStringW is supported even on Windows 9x, and | 3914 ImmGetCompositionStringW is supported even on Windows 9x, and |
3917 allows us to handle multiple languages. */ | 3915 allows us to handle multiple languages. */ |
3918 len = ImmGetCompositionStringW (imc, GCS_RESULTSTR, NULL, 0); | 3916 len = ImmGetCompositionStringW (imc, GCS_RESULTSTR, NULL, 0); |
3919 result = alloca_array (Extbyte, len); | 3917 result = alloca_extbytes (len); |
3920 ImmGetCompositionStringW (imc, GCS_RESULTSTR, (WCHAR *) result, len); | 3918 ImmGetCompositionStringW (imc, GCS_RESULTSTR, (WCHAR *) result, len); |
3921 ImmReleaseContext (hwnd, imc); | 3919 ImmReleaseContext (hwnd, imc); |
3922 | 3920 |
3923 TO_INTERNAL_FORMAT (DATA, (result, len), | 3921 TO_INTERNAL_FORMAT (DATA, (result, len), |
3924 ALLOCA, (resultint, lenint), | 3922 ALLOCA, (resultint, lenint), |
5178 } | 5176 } |
5179 | 5177 |
5180 void | 5178 void |
5181 vars_of_event_mswindows (void) | 5179 vars_of_event_mswindows (void) |
5182 { | 5180 { |
5183 reinit_vars_of_event_mswindows (); | |
5184 | |
5185 mswindows_s_dispatch_event_queue = Qnil; | 5181 mswindows_s_dispatch_event_queue = Qnil; |
5186 staticpro (&mswindows_s_dispatch_event_queue); | 5182 staticpro (&mswindows_s_dispatch_event_queue); |
5187 mswindows_s_dispatch_event_queue_tail = Qnil; | 5183 mswindows_s_dispatch_event_queue_tail = Qnil; |
5188 dump_add_root_lisp_object (&mswindows_s_dispatch_event_queue_tail); | 5184 dump_add_root_lisp_object (&mswindows_s_dispatch_event_queue_tail); |
5189 | 5185 |