Mercurial > hg > xemacs-beta
view src/redisplay-x.c @ 5776:65d65b52d608
Pass character count from coding systems to buffer insertion code.
src/ChangeLog addition:
2014-01-16 Aidan Kehoe <kehoea@parhasard.net>
Pass character count information from the no-conversion and
unicode coding systems to the buffer insertion code, making
#'find-file on large buffers a little snappier (if
ERROR_CHECK_TEXT is not defined).
* file-coding.c:
* file-coding.c (coding_character_tell): New.
* file-coding.c (conversion_coding_stream_description): New.
* file-coding.c (no_conversion_convert):
Update characters_seen when decoding.
* file-coding.c (no_conversion_character_tell): New.
* file-coding.c (lstream_type_create_file_coding): Create the
no_conversion type with data.
* file-coding.c (coding_system_type_create):
Make the character_tell method available here.
* file-coding.h:
* file-coding.h (struct coding_system_methods):
Add a new character_tell() method, passing charcount information
from the coding systems to the buffer code, avoiding duplicate
bytecount-to-charcount work especially with large buffers.
* fileio.c (Finsert_file_contents_internal):
Update this to pass charcount information to
buffer_insert_string_1(), if that is available from the lstream code.
* insdel.c:
* insdel.c (buffer_insert_string_1):
Add a new CCLEN argument, giving the character count of the string
to insert. It can be -1 to indicate that te function should work
it out itself using bytecount_to_charcount(), as it used to.
* insdel.c (buffer_insert_raw_string_1):
* insdel.c (buffer_insert_lisp_string_1):
* insdel.c (buffer_insert_ascstring_1):
* insdel.c (buffer_insert_emacs_char_1):
* insdel.c (buffer_insert_from_buffer_1):
* insdel.c (buffer_replace_char):
Update these functions to use the new calling convention.
* insdel.h:
* insdel.h (buffer_insert_string):
Update this header to reflect the new buffer_insert_string_1()
argument.
* lstream.c (Lstream_character_tell): New.
Return the number of characters *read* and seen by the consumer so
far, taking into account the unget buffer, and buffered reading.
* lstream.c (Lstream_unread):
Update unget_character_count here as appropriate.
* lstream.c (Lstream_rewind):
Reset unget_character_count here too.
* lstream.h:
* lstream.h (struct lstream):
Provide the character_tell method, add a new field,
unget_character_count, giving the number of characters ever passed
to Lstream_unread().
Declare Lstream_character_tell().
Make Lstream_ungetc(), which happens to be unused, an inline
function rather than a macro, in the course of updating it to
modify unget_character_count.
* print.c (output_string):
Use the new argument to buffer_insert_string_1().
* tests.c:
* tests.c (Ftest_character_tell):
New test function.
* tests.c (syms_of_tests):
Make it available.
* unicode.c:
* unicode.c (struct unicode_coding_stream):
* unicode.c (unicode_character_tell):
New method.
* unicode.c (unicode_convert):
Update the character counter as appropriate.
* unicode.c (coding_system_type_create_unicode):
Make the character_tell method available.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 16 Jan 2014 16:27:52 +0000 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* X output and frame manipulation routines. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994 Lucid, Inc. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 2002, 2003 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ /* Author: Chuck Thompson */ /* Lots of work done by Ben Wing for Mule */ /* Number of pixels below each line. */ int x_interline_space; /* #### this needs to be implemented, but per-font */ #define THIS_IS_X #include "redisplay-xlike-inc.c" static void x_output_shadows (struct frame *f, int x, int y, int width, int height, GC top_shadow_gc, GC bottom_shadow_gc, GC background_gc, int shadow_thickness, int edges); /***************************************************************************** x_window_output_begin Perform any necessary initialization prior to an update. ****************************************************************************/ static void XLIKE_window_output_begin (struct window *UNUSED (w)) { } /***************************************************************************** x_window_output_end Perform any necessary flushing of queues when an update has completed. ****************************************************************************/ static void XLIKE_window_output_end (struct window *w) { if (!(check_if_pending_expose_event (WINDOW_XDEVICE (w)))) XFlush (DEVICE_X_DISPLAY (WINDOW_XDEVICE (w))); } /***************************************************************************** x_bevel_area Draw shadows for the given area in the given face. ****************************************************************************/ static void XLIKE_bevel_area (struct window *w, face_index findex, int x, int y, int width, int height, int shadow_thickness, int edges, enum edge_style style) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); Display *dpy = DEVICE_X_DISPLAY (d); Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); Pixel top_shadow_pixel, bottom_shadow_pixel, background_pixel; Lisp_Object tmp_pixel; XColor tmp_color; XGCValues gcv; GC top_shadow_gc, bottom_shadow_gc, background_gc; int use_pixmap = 0; int flip_gcs = 0; unsigned long mask; assert (shadow_thickness >=0); memset (&gcv, ~0, sizeof (XGCValues)); tmp_pixel = WINDOW_FACE_CACHEL_BACKGROUND (w, findex); tmp_color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel)); /* First, get the GC's. */ top_shadow_pixel = tmp_color.pixel; bottom_shadow_pixel = tmp_color.pixel; background_pixel = tmp_color.pixel; x_generate_shadow_pixels (f, &top_shadow_pixel, &bottom_shadow_pixel, background_pixel, ef->core.background_pixel); tmp_pixel = WINDOW_FACE_CACHEL_FOREGROUND (w, findex); tmp_color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel)); gcv.background = tmp_color.pixel; gcv.graphics_exposures = False; mask = GCForeground | GCBackground | GCGraphicsExposures; /* If we can't distinguish one of the shadows (the color is the same as the background), it's better to use a pixmap to generate a dithered gray. */ if (top_shadow_pixel == background_pixel || bottom_shadow_pixel == background_pixel) use_pixmap = 1; if (use_pixmap) { if (DEVICE_X_GRAY_PIXMAP (d) == None) { DEVICE_X_GRAY_PIXMAP (d) = XCreatePixmapFromBitmapData (dpy, x_win, (char *) gray_bits, gray_width, gray_height, 1, 0, 1); } tmp_pixel = WINDOW_FACE_CACHEL_BACKGROUND (w, findex); tmp_color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel)); gcv.foreground = tmp_color.pixel; /* this is needed because the GC draws with a pixmap here */ gcv.fill_style = FillOpaqueStippled; gcv.stipple = DEVICE_X_GRAY_PIXMAP (d); top_shadow_gc = gc_cache_lookup (DEVICE_X_GC_CACHE (d), &gcv, (mask | GCStipple | GCFillStyle)); tmp_pixel = WINDOW_FACE_CACHEL_FOREGROUND (w, findex); tmp_color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel)); bottom_shadow_pixel = tmp_color.pixel; flip_gcs = (bottom_shadow_pixel == WhitePixelOfScreen (DefaultScreenOfDisplay (dpy))); } else { gcv.foreground = top_shadow_pixel; top_shadow_gc = gc_cache_lookup (DEVICE_X_GC_CACHE (d), &gcv, mask); } gcv.foreground = bottom_shadow_pixel; bottom_shadow_gc = gc_cache_lookup (DEVICE_X_GC_CACHE (d), &gcv, mask); if (use_pixmap && flip_gcs) { GC tmp_gc = bottom_shadow_gc; bottom_shadow_gc = top_shadow_gc; top_shadow_gc = tmp_gc; } gcv.foreground = background_pixel; background_gc = gc_cache_lookup (DEVICE_X_GC_CACHE (d), &gcv, mask); /* possibly revert the GC's This will give a depressed look to the divider */ if (style == EDGE_ETCHED_IN || style == EDGE_BEVEL_IN) { GC temp; temp = top_shadow_gc; top_shadow_gc = bottom_shadow_gc; bottom_shadow_gc = temp; } if (style == EDGE_ETCHED_IN || style == EDGE_ETCHED_OUT) shadow_thickness /= 2; /* Draw the shadows around the divider line */ x_output_shadows (f, x, y, width, height, top_shadow_gc, bottom_shadow_gc, background_gc, shadow_thickness, edges); if (style == EDGE_ETCHED_IN || style == EDGE_ETCHED_OUT) { /* Draw the shadows around the divider line */ x_output_shadows (f, x + shadow_thickness, y + shadow_thickness, width - 2*shadow_thickness, height - 2*shadow_thickness, bottom_shadow_gc, top_shadow_gc, background_gc, shadow_thickness, edges); } } /***************************************************************************** x_output_shadows Draw a shadow around the given area using the given GC's. It is the callers responsibility to set the GC's appropriately. ****************************************************************************/ static void x_output_shadows (struct frame *f, int x, int y, int width, int height, GC top_shadow_gc, GC bottom_shadow_gc, GC UNUSED (background_gc), int shadow_thickness, int edges) { struct device *d = XDEVICE (f->device); Display *dpy = DEVICE_X_DISPLAY (d); Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); XSegment top_shadow[20], bottom_shadow[20]; int elt; if (shadow_thickness > 10) shadow_thickness = 10; else if (shadow_thickness < 0) shadow_thickness = 0; if (shadow_thickness > (width / 2)) shadow_thickness = width / 2; if (shadow_thickness > (height / 2)) shadow_thickness = height / 2; for (elt = 0; elt < shadow_thickness; elt++) { int seg1 = elt; int seg2 = (edges & EDGE_TOP) ? elt + shadow_thickness : elt; int bot_seg2 = (edges & EDGE_BOTTOM) ? elt + shadow_thickness : elt; if (edges & EDGE_TOP) { top_shadow[seg1].x1 = x + elt; top_shadow[seg1].x2 = x + width - elt - 1; top_shadow[seg1].y1 = top_shadow[seg1].y2 = y + elt; } if (edges & EDGE_LEFT) { top_shadow[seg2].x1 = top_shadow[seg2].x2 = x + elt; top_shadow[seg2].y1 = y + elt; top_shadow[seg2].y2 = y + height - elt - 1; } if (edges & EDGE_BOTTOM) { bottom_shadow[seg1].x1 = x + elt; bottom_shadow[seg1].x2 = x + width - elt - 1; bottom_shadow[seg1].y1 = bottom_shadow[seg1].y2 = y + height - elt - 1; } if (edges & EDGE_RIGHT) { bottom_shadow[bot_seg2].x1 = bottom_shadow[bot_seg2].x2 = x + width - elt - 1; bottom_shadow[bot_seg2].y1 = y + elt; bottom_shadow[bot_seg2].y2 = y + height - elt - 1; } } XDrawSegments (dpy, x_win, top_shadow_gc, top_shadow, ((edges & EDGE_TOP) ? shadow_thickness : 0) + ((edges & EDGE_LEFT) ? shadow_thickness : 0)); XDrawSegments (dpy, x_win, bottom_shadow_gc, bottom_shadow, ((edges & EDGE_BOTTOM) ? shadow_thickness : 0) + ((edges & EDGE_RIGHT) ? shadow_thickness : 0)); } /***************************************************************************** x_generate_shadow_pixels Given three pixels (top shadow, bottom shadow, background) massage the top and bottom shadow colors to guarantee that they differ. The background pixels are not allowed to be modified. This function modifies its parameters. This code is modified from code blatantly stolen from lwlib/xlwmenu.c ****************************************************************************/ #define MINL(x,y) ((((unsigned long) (x)) < ((unsigned long) (y))) \ ? ((unsigned long) (x)) : ((unsigned long) (y))) void x_generate_shadow_pixels (struct frame *f, unsigned long *top_shadow, unsigned long *bottom_shadow, unsigned long background, unsigned long core_background) { struct device *d = XDEVICE (f->device); Display *dpy = DEVICE_X_DISPLAY (d); Colormap cmap = DEVICE_X_COLORMAP (d); Visual *visual = DEVICE_X_VISUAL (d); XColor topc, botc; int top_frobbed = 0, bottom_frobbed = 0; /* If the top shadow is the same color as the background, try to adjust it. */ if (*top_shadow == background) { topc.pixel = background; XQueryColor (dpy, cmap, &topc); /* don't overflow/wrap! */ topc.red = MINL (65535, (unsigned long) topc.red * 6 / 5); topc.green = MINL (65535, (unsigned long) topc.green * 6 / 5); topc.blue = MINL (65535, (unsigned long) topc.blue * 6 / 5); if (x_allocate_nearest_color (dpy, cmap, visual, &topc)) { *top_shadow = topc.pixel; top_frobbed = 1; } } /* If the bottom shadow is the same color as the background, try to adjust it. */ if (*bottom_shadow == background) { botc.pixel = background; XQueryColor (dpy, cmap, &botc); botc.red = (unsigned short) ((unsigned long) botc.red * 3 / 5); botc.green = (unsigned short) ((unsigned long) botc.green * 3 / 5); botc.blue = (unsigned short) ((unsigned long) botc.blue * 3 / 5); if (x_allocate_nearest_color (dpy, cmap, visual, &botc)) { *bottom_shadow = botc.pixel; bottom_frobbed = 1; } } /* If we had to adjust both shadows, then we have to do some additional work. */ if (top_frobbed && bottom_frobbed) { int top_avg = ((topc.red / 3) + (topc.green / 3) + (topc.blue / 3)); int bot_avg = ((botc.red / 3) + (botc.green / 3) + (botc.blue / 3)); if (bot_avg > top_avg) { Pixel tmp = *top_shadow; *top_shadow = *bottom_shadow; *bottom_shadow = tmp; } else if (topc.pixel == botc.pixel) { if (botc.pixel == background) *top_shadow = core_background; else *bottom_shadow = background; } } } /* Make audible bell. */ static void XLIKE_ring_bell (struct device *d, int volume, int pitch, int duration) { Display *display = DEVICE_X_DISPLAY (d); if (volume < 0) volume = 0; else if (volume > 100) volume = 100; if (pitch < 0 && duration < 0) { XBell (display, (volume * 2) - 100); XFlush (display); } else { XKeyboardState state; XKeyboardControl ctl; XSync (display, 0); /* #### grab server? */ XGetKeyboardControl (display, &state); ctl.bell_pitch = (pitch >= 0 ? pitch : (int) state.bell_pitch); ctl.bell_duration = (duration >= 0 ? duration : (int) state.bell_duration); XChangeKeyboardControl (display, KBBellPitch|KBBellDuration, &ctl); XBell (display, (volume * 2) - 100); ctl.bell_pitch = state.bell_pitch; ctl.bell_duration = state.bell_duration; XChangeKeyboardControl (display, KBBellPitch|KBBellDuration, &ctl); /* #### ungrab server? */ XSync (display, 0); } }