Mercurial > hg > xemacs-beta
view src/scrollbar-msw.c @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 19 Sep 2009 22:53:13 +0100 |
parents | 20773f9b7bc0 |
children | 16112448d484 |
line wrap: on
line source
/* scrollbar implementation -- mswindows interface. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994 Amdahl Corporation. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995 Darrell Kindred <dkindred+@cmu.edu>. Copyright (C) 2001, 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* This file essentially Mule-ized (except perhaps some Unicode splitting). 5-2000. */ #include <config.h> #include "lisp.h" #include "device.h" #include "elhash.h" #include "events.h" #include "frame-impl.h" #include "opaque.h" #include "scrollbar.h" #include "specifier.h" #include "window-impl.h" #include "console-msw-impl.h" #include "scrollbar-msw.h" /* We use a similar sort of vertical scrollbar drag hack for mswindows * scrollbars as is used for Motif or Lucid scrollbars under X. * We do character-based instead of line-based scrolling, which can mean that * without the hack it is impossible to drag to the end of a buffer. */ #define VERTICAL_SCROLLBAR_DRAG_HACK static int vertical_drag_in_progress = 0; extern Lisp_Object mswindows_find_frame (HWND hwnd); /* As long as the HWND is around, the scrollbar instance must be GC-protected. We have gotten crashes, apparently from trying to access a dead, freed frame inside of a window mirror pointed to by the scrollbar structure. */ static Lisp_Object Vmswindows_scrollbar_instance_table; static void mswindows_create_scrollbar_instance (struct frame *f, int vertical, struct scrollbar_instance *sb) { int orientation; Lisp_Object ptr; sb->scrollbar_data = xnew_and_zero (struct mswindows_scrollbar_data); if (vertical) orientation = SBS_VERT; else orientation = SBS_HORZ; SCROLLBAR_MSW_HANDLE (sb) = qxeCreateWindowEx (0, XETEXT ("SCROLLBAR"), 0, orientation|WS_CHILD, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, FRAME_MSWINDOWS_HANDLE (f), NULL, NULL, NULL); SCROLLBAR_MSW_INFO (sb).cbSize = sizeof (SCROLLINFO); SCROLLBAR_MSW_INFO (sb).fMask = SIF_ALL; GetScrollInfo (SCROLLBAR_MSW_HANDLE (sb), SB_CTL, &SCROLLBAR_MSW_INFO (sb)); ptr = make_opaque_ptr (SCROLLBAR_MSW_HANDLE (sb)); Fputhash (ptr, wrap_scrollbar_instance (sb), Vmswindows_scrollbar_instance_table); qxeSetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA, (LONG) LISP_TO_VOID (ptr)); } static void mswindows_free_scrollbar_instance (struct scrollbar_instance *sb) { if (sb->scrollbar_data) { void *opaque = (void *) qxeGetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA); Lisp_Object ptr; ptr = VOID_TO_LISP (opaque); assert (OPAQUE_PTRP (ptr)); ptr = Fremhash (ptr, Vmswindows_scrollbar_instance_table); assert (!NILP (ptr)); DestroyWindow (SCROLLBAR_MSW_HANDLE (sb)); xfree (sb->scrollbar_data, void *); } } static void unshow_that_mofo (void *handle) { ShowScrollBar ((HWND) handle, SB_CTL, 0); } static void mswindows_release_scrollbar_instance (struct scrollbar_instance *sb) { if (gc_in_progress) /* #### way bogus! need to remove the offending call. see mark_redisplay(). */ register_post_gc_action (unshow_that_mofo, (void *) SCROLLBAR_MSW_HANDLE (sb)); else ShowScrollBar (SCROLLBAR_MSW_HANDLE (sb), SB_CTL, 0); SCROLLBAR_MSW_SIZE (sb) = 0; } #define UPDATE_POS_FIELD(field) \ if (new_##field >= 0 && SCROLLBAR_MSW_DATA (sb)->field != new_##field) { \ SCROLLBAR_MSW_DATA (sb)->field = new_##field; \ pos_changed = 1; \ } static void mswindows_update_scrollbar_instance_values (struct window *UNUSED (w), struct scrollbar_instance *sb, int UNUSED (new_line_increment), int UNUSED (new_page_increment), int new_minimum, int new_maximum, int new_slider_size, int new_slider_position, int new_scrollbar_width, int new_scrollbar_height, int new_scrollbar_x, int new_scrollbar_y) { int pos_changed = 0; int vert = qxeGetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_STYLE) & SBS_VERT; #if 0 stderr_out ("[%d, %d], page = %d, pos = %d, inhibit = %d\n", new_minimum, new_maximum, new_slider_size, new_slider_position,inhibit_slider_size_change); #endif /* These might be optimized, but since at least one will change at each call, it's probably not worth it. */ SCROLLBAR_MSW_INFO (sb).nMin = new_minimum; SCROLLBAR_MSW_INFO (sb).nMax = new_maximum; SCROLLBAR_MSW_INFO (sb).nPage = new_slider_size + 1; /* +1 for DISABLENOSCROLL */ SCROLLBAR_MSW_INFO (sb).nPos = new_slider_position; #ifndef VERTICAL_SCROLLBAR_DRAG_HACK SCROLLBAR_MSW_INFO (sb).fMask = ((vert && vertical_drag_in_progress) ? SIF_RANGE | SIF_POS : SIF_ALL | SIF_DISABLENOSCROLL); #else SCROLLBAR_MSW_INFO (sb).fMask = SIF_ALL | SIF_DISABLENOSCROLL; /* Ignore XEmacs' requests to update the thumb position and size; they don't * bear any relation to reality because we're reporting made-up positions */ if (!(vert && vertical_drag_in_progress)) #endif SetScrollInfo (SCROLLBAR_MSW_HANDLE (sb), SB_CTL, &SCROLLBAR_MSW_INFO (sb), TRUE); UPDATE_POS_FIELD (scrollbar_x); UPDATE_POS_FIELD (scrollbar_y); UPDATE_POS_FIELD (scrollbar_width); UPDATE_POS_FIELD (scrollbar_height); if (pos_changed) { MoveWindow (SCROLLBAR_MSW_HANDLE (sb), new_scrollbar_x, new_scrollbar_y, new_scrollbar_width, new_scrollbar_height, TRUE); } } static void mswindows_update_scrollbar_instance_status (struct window *UNUSED (w), int UNUSED (active), int size, struct scrollbar_instance *sb) { if (SCROLLBAR_MSW_SIZE (sb) != size) { SCROLLBAR_MSW_SIZE (sb) = size; ShowScrollBar (SCROLLBAR_MSW_HANDLE (sb), SB_CTL, SCROLLBAR_MSW_SIZE (sb)); SCROLLBAR_MSW_INFO(sb).fMask |= SIF_DISABLENOSCROLL; SetScrollInfo(SCROLLBAR_MSW_HANDLE (sb), SB_CTL, &SCROLLBAR_MSW_INFO (sb), TRUE); } } void mswindows_handle_scrollbar_event (HWND hwnd, int code, int UNUSED (pos)) { struct frame *f; Lisp_Object win, frame; struct scrollbar_instance *sb = 0; void *v; SCROLLINFO scrollinfo; int vert = qxeGetWindowLong (hwnd, GWL_STYLE) & SBS_VERT; int value; v = (void *) qxeGetWindowLong (hwnd, GWL_USERDATA); if (!v) { /* apparently this can happen, as it was definitely necessary to put the check in for sb below (VERTICAL_SCROLLBAR_DRAG_HACK) */ frame = mswindows_find_frame (hwnd); f = XFRAME (frame); win = FRAME_SELECTED_WINDOW (f); } else { Lisp_Object ptr; ptr = VOID_TO_LISP (v); assert (OPAQUE_PTRP (ptr)); ptr = Fgethash (ptr, Vmswindows_scrollbar_instance_table, Qnil); sb = XSCROLLBAR_INSTANCE (ptr); /* #### we're still hitting an abort here with 0 as the second parameter, although only occasionally. It seems that sometimes we receive events for scrollbars that don't exist anymore. I assume it must happen like this: The user does something that causes a scrollbar to disappear (e.g. Alt-TAB, causing recomputation of everything in the new frame) and then immediately uses the mouse wheel, generating scrollbar events. Both events get posted before we have a chance to process them, and in processing the first, the scrollbar mentioned in the second disappears. */ win = real_window (sb->mirror, 1); if (NILP (win)) return; frame = WINDOW_FRAME (XWINDOW (win)); f = XFRAME (frame); } /* SB_LINEDOWN == SB_CHARLEFT etc. This is the way they will always be - any Windows is binary compatible backward with old programs */ switch (code) { case SB_LINEDOWN: mswindows_enqueue_misc_user_event (frame, vert ? Qscrollbar_line_down : Qscrollbar_char_right, win); break; case SB_LINEUP: mswindows_enqueue_misc_user_event (frame, vert ? Qscrollbar_line_up : Qscrollbar_char_left, win); break; case SB_PAGEDOWN: mswindows_enqueue_misc_user_event (win, vert ? Qscrollbar_page_down : Qscrollbar_page_right, vert ? Fcons (win, Qnil) : win); break; case SB_PAGEUP: mswindows_enqueue_misc_user_event (frame, vert ? Qscrollbar_page_up : Qscrollbar_page_left, vert ? Fcons (win, Qnil) : win); break; case SB_BOTTOM: mswindows_enqueue_misc_user_event (frame, vert ? Qscrollbar_to_bottom : Qscrollbar_to_right, win); break; case SB_TOP: mswindows_enqueue_misc_user_event (frame, vert ? Qscrollbar_to_top : Qscrollbar_to_left, win); break; case SB_THUMBTRACK: case SB_THUMBPOSITION: scrollinfo.cbSize = sizeof(SCROLLINFO); scrollinfo.fMask = SIF_ALL; GetScrollInfo (hwnd, SB_CTL, &scrollinfo); vertical_drag_in_progress = vert; #ifdef VERTICAL_SCROLLBAR_DRAG_HACK if (vert && (scrollinfo.nTrackPos > scrollinfo.nPos)) /* new buffer position = * buffer position at start of drag + * ((text remaining in buffer at start of drag) * * (amount that the thumb has been moved) / * (space that remained past end of the thumb at start of drag)) */ value = (int) (scrollinfo.nPos + (((double) (scrollinfo.nMax - scrollinfo.nPos) * (scrollinfo.nTrackPos - scrollinfo.nPos)) / (scrollinfo.nMax - scrollinfo.nPage - scrollinfo.nPos))) - 2; /* ensure that the last line doesn't disappear off screen */ else #endif value = scrollinfo.nTrackPos; mswindows_enqueue_misc_user_event (frame, vert ? Qscrollbar_vertical_drag : Qscrollbar_horizontal_drag, Fcons (win, make_int (value))); break; case SB_ENDSCROLL: #ifdef VERTICAL_SCROLLBAR_DRAG_HACK if (vertical_drag_in_progress && sb) /* User has just dropped the thumb - finally update it */ SetScrollInfo (SCROLLBAR_MSW_HANDLE (sb), SB_CTL, &SCROLLBAR_MSW_INFO (sb), TRUE); #endif vertical_drag_in_progress = 0; break; } } static int can_scroll (struct scrollbar_instance *scrollbar) { return scrollbar != NULL && IsWindowVisible (SCROLLBAR_MSW_HANDLE (scrollbar)) && IsWindowEnabled (SCROLLBAR_MSW_HANDLE (scrollbar)); } int mswindows_handle_mousewheel_event (Lisp_Object frame, int keys, int delta, POINTS where) { int hasVertBar, hasHorzBar; /* Indicates presence of scroll bars */ unsigned wheelScrollLines = 0; /* Number of lines per wheel notch */ Lisp_Object win = Qnil, corpore, sano; struct window_mirror *mirror; int mene, _mene, tekel, upharsin; Charbpos mens, sana; Charcount in; struct window *needle_in_haystack = 0; POINT donde_esta; donde_esta.x = where.x; donde_esta.y = where.y; /* Find the window to scroll */ /* The mouse event could actually occur outside of the emacs frame. */ if (ScreenToClient (FRAME_MSWINDOWS_HANDLE (XFRAME (frame)), &donde_esta) != 0) { /* stderr_out ("donde_esta: %d %d\n", donde_esta.x, donde_esta.y); */ pixel_to_glyph_translation (XFRAME (frame), donde_esta.x, donde_esta.y, &mene, &_mene, &tekel, &upharsin, &needle_in_haystack, &mens, &sana, &in, &corpore, &sano); if (needle_in_haystack) { win = wrap_window (needle_in_haystack); /* stderr_out ("found needle\n"); debug_print (win); */ } } if (!needle_in_haystack) { win = FRAME_SELECTED_WINDOW (XFRAME (frame)); needle_in_haystack = XWINDOW (win); } mirror = find_window_mirror (needle_in_haystack); /* Check that there is something to scroll */ hasVertBar = can_scroll (mirror->scrollbar_vertical_instance); hasHorzBar = can_scroll (mirror->scrollbar_horizontal_instance); if (!hasVertBar && !hasHorzBar) return FALSE; /* No support for panning and zooming, so ignore */ if (keys & (MK_SHIFT | MK_CONTROL)) return FALSE; /* Get the number of lines per wheel delta */ qxeSystemParametersInfo (SPI_GETWHEELSCROLLLINES, 0, &wheelScrollLines, 0); /* Calculate the amount to scroll */ if (wheelScrollLines == WHEEL_PAGESCROLL) { /* Scroll by a page */ Lisp_Object function; if (hasVertBar) function = delta > 0 ? Qscrollbar_page_up : Qscrollbar_page_down; else function = delta > 0 ? Qscrollbar_page_left : Qscrollbar_page_right; mswindows_enqueue_misc_user_event (frame, function, Fcons (win, Qnil)); } else /* Scroll by a number of lines */ { /* Calc the number of lines to scroll */ int toScroll = MulDiv (delta, wheelScrollLines, WHEEL_DELTA); /* Do the scroll */ Lisp_Object function; if (hasVertBar) function = delta > 0 ? Qscrollbar_line_up : Qscrollbar_line_down; else function = delta > 0 ? Qscrollbar_char_left : Qscrollbar_char_right; if (toScroll < 0) toScroll = -toScroll; while (toScroll--) mswindows_enqueue_misc_user_event (frame, function, win); } return TRUE; } #ifdef MEMORY_USAGE_STATS static int mswindows_compute_scrollbar_instance_usage (struct device *UNUSED (d), struct scrollbar_instance *inst, struct overhead_stats *ovstats) { int total = 0; while (inst) { struct mswindows_scrollbar_data *data = (struct mswindows_scrollbar_data *) inst->scrollbar_data; total += malloced_storage_size (data, sizeof (*data), ovstats); inst = inst->next; } return total; } #endif /* MEMORY_USAGE_STATS */ /************************************************************************/ /* Device-specific ghost specifiers initialization */ /************************************************************************/ DEFUN ("mswindows-init-scrollbar-metrics", Fmswindows_init_scrollbar_metrics, 1, 1, 0, /* */ (locale)) { if (DEVICEP (locale)) { add_spec_to_ghost_specifier (Vscrollbar_width, make_int (GetSystemMetrics (SM_CXVSCROLL)), locale, Qmswindows, Qnil); add_spec_to_ghost_specifier (Vscrollbar_height, make_int (GetSystemMetrics (SM_CYHSCROLL)), locale, Qmswindows, Qnil); } return Qnil; } /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_scrollbar_mswindows (void) { CONSOLE_HAS_METHOD (mswindows, create_scrollbar_instance); CONSOLE_HAS_METHOD (mswindows, free_scrollbar_instance); CONSOLE_HAS_METHOD (mswindows, release_scrollbar_instance); CONSOLE_HAS_METHOD (mswindows, update_scrollbar_instance_values); CONSOLE_HAS_METHOD (mswindows, update_scrollbar_instance_status); /* CONSOLE_HAS_METHOD (mswindows, scrollbar_width_changed_in_frame); */ #ifdef MEMORY_USAGE_STATS CONSOLE_HAS_METHOD (mswindows, compute_scrollbar_instance_usage); #endif } void syms_of_scrollbar_mswindows (void) { DEFSUBR (Fmswindows_init_scrollbar_metrics); } void vars_of_scrollbar_mswindows (void) { Fprovide (intern ("mswindows-scrollbars")); staticpro (&Vmswindows_scrollbar_instance_table); Vmswindows_scrollbar_instance_table = make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); }