view src/glyphs-msw.h @ 5307:c096d8051f89

Have NATNUMP give t for positive bignums; check limits appropriately. src/ChangeLog addition: 2010-11-20 Aidan Kehoe <kehoea@parhasard.net> * abbrev.c (Fexpand_abbrev): * alloc.c: * alloc.c (Fmake_list): * alloc.c (Fmake_vector): * alloc.c (Fmake_bit_vector): * alloc.c (Fmake_byte_code): * alloc.c (Fmake_string): * alloc.c (vars_of_alloc): * bytecode.c (UNUSED): * bytecode.c (Fbyte_code): * chartab.c (decode_char_table_range): * cmds.c (Fself_insert_command): * data.c (check_integer_range): * data.c (Fnatnump): * data.c (Fnonnegativep): * data.c (Fstring_to_number): * elhash.c (hash_table_size_validate): * elhash.c (decode_hash_table_size): * eval.c (Fbacktrace_frame): * event-stream.c (lisp_number_to_milliseconds): * event-stream.c (Faccept_process_output): * event-stream.c (Frecent_keys): * event-stream.c (Fdispatch_event): * events.c (Fmake_event): * events.c (Fevent_timestamp): * events.c (Fevent_timestamp_lessp): * events.h: * events.h (struct command_builder): * file-coding.c (gzip_putprop): * fns.c: * fns.c (check_sequence_range): * fns.c (Frandom): * fns.c (Fnthcdr): * fns.c (Flast): * fns.c (Fnbutlast): * fns.c (Fbutlast): * fns.c (Fmember): * fns.c (Ffill): * fns.c (Freduce): * fns.c (replace_string_range_1): * fns.c (Freplace): * font-mgr.c (Ffc_pattern_get): * frame-msw.c (msprinter_set_frame_properties): * glyphs.c (check_valid_xbm_inline): * indent.c (Fmove_to_column): * intl-win32.c (mswindows_multibyte_to_unicode_putprop): * lisp.h: * lisp.h (ARRAY_DIMENSION_LIMIT): * lread.c (decode_mode_1): * mule-ccl.c (ccl_get_compiled_code): * number.h: * process-unix.c (unix_open_multicast_group): * process.c (Fset_process_window_size): * profile.c (Fstart_profiling): * unicode.c (Funicode_to_char): Change NATNUMP to return 1 for positive bignums; changes uses of it and of CHECK_NATNUM appropriately, usually by checking for an integer in an appropriate range. Add array-dimension-limit and use it in #'make-vector, #'make-string. Add array-total-size-limit, array-rank-limit while we're at it, for the sake of any Common Lisp-oriented code that uses these limits. Rename check_int_range to check_integer_range, have it take Lisp_Objects (and thus bignums) instead. Remove bignum_butlast(), just set int_n to an appropriately large integer if N is a bignum. Accept bignums in check_sequence_range(), change the functions that use check_sequence_range() appropriately. Move the definition of NATNUMP() to number.h; document why it's a reasonable name, contradicting an old comment. tests/ChangeLog addition: 2010-11-20 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el: * automated/lisp-tests.el (featurep): * automated/lisp-tests.el (wrong-type-argument): * automated/mule-tests.el (featurep): Check for args-out-of-range errors instead of wrong-type-argument errors in various places when code is handed a large bignum instead of a fixnum. Also check for the wrong-type-argument errors when giving the same code a non-integer value.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 20 Nov 2010 16:49:11 +0000
parents 6728e641994e
children 308d34e9f07d
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 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. */

#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_ */