Mercurial > hg > xemacs-beta

view src/glyphs-msw.h @ 5776:65d65b52d608

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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

/* mswindows-specific glyphs and related.
   Copyright (C) 1998 Andy Piper

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. */

#ifndef INCLUDED_glyphs_msw_h_
#define INCLUDED_glyphs_msw_h_

#ifdef HAVE_MS_WINDOWS

#include "syswindows.h"
#include "glyphs.h"

/****************************************************************************
 *                         Image-Instance Object                            *
 ****************************************************************************/

struct mswindows_image_instance_data
{
  HBITMAP *bitmaps;
  HICON icon;
  int real_width, real_height;
};

#define MSWINDOWS_IMAGE_INSTANCE_DATA(i) \
((struct mswindows_image_instance_data *) (i)->data)

#define IMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \
     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[0])
#define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \
     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[slice])
#define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \
     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps)
#define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \
     (* (HBITMAP *) &(IMAGE_INSTANCE_PIXMAP_MASK (i)))		/* Make it lvalue */
#define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \
     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon)
#define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_WIDTH(i) \
     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_width)
#define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_HEIGHT(i) \
     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_height)

#define XIMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \
  IMAGE_INSTANCE_MSWINDOWS_BITMAP (XIMAGE_INSTANCE (i))
#define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i, slice) \
  IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (XIMAGE_INSTANCE (i, slice))
#define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \
  IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (XIMAGE_INSTANCE (i))
#define XIMAGE_INSTANCE_MSWINDOWS_MASK(i) \
  IMAGE_INSTANCE_MSWINDOWS_MASK (XIMAGE_INSTANCE (i))
#define XIMAGE_INSTANCE_MSWINDOWS_ICON(i) \
  IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i))

int mswindows_resize_dibitmap_instance (Lisp_Image_Instance *ii,
					struct frame *f,
					int newx, int newy);
HBITMAP mswindows_create_resized_bitmap (Lisp_Image_Instance *ii,
					 struct frame *f,
					 int newx, int newy);
HBITMAP mswindows_create_resized_mask (Lisp_Image_Instance *ii,
				       struct frame *f,
				       int newx, int newy);
void mswindows_initialize_image_instance_icon (Lisp_Image_Instance *image,
					       int cursor);

#define WIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \
     (HWND) (IMAGE_INSTANCE_SUBWINDOW_ID (i))

#define XWIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \
  WIDGET_INSTANCE_MSWINDOWS_HANDLE (XIMAGE_INSTANCE (i))

struct mswindows_subwindow_data
{
  HWND clip_window;
};

#define MSWINDOWS_SUBWINDOW_DATA(i) \
  ((struct mswindows_subwindow_data *) (i)->data)
#define IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \
     (MSWINDOWS_SUBWINDOW_DATA (i)->clip_window)

#define XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA(i) \
  MSWINDOWS_SUBWINDOW_DATA (XIMAGE_INSTANCE (i))
#define XIMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \
  IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (XIMAGE_INSTANCE (i))

#define DOMAIN_MSWINDOWS_HANDLE(domain) \
  ((IMAGE_INSTANCEP (domain) && \
  XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA (domain)) ? \
   XWIDGET_INSTANCE_MSWINDOWS_HANDLE (domain) : \
   FRAME_MSWINDOWS_HANDLE (DOMAIN_XFRAME (domain)))

#endif /* HAVE_MS_WINDOWS */

#endif /* INCLUDED_glyphs_msw_h_ */