Mercurial > hg > xemacs-beta
comparison src/glyphs.c @ 647:b39c14581166
[xemacs-hg @ 2001-08-13 04:45:47 by ben]
removal of unsigned, size_t, etc.
author | ben |
---|---|
date | Mon, 13 Aug 2001 04:46:48 +0000 |
parents | 4b7d425dd3c2 |
children | fdefd0186b75 |
comparison
equal
deleted
inserted
replaced
646:00c54252fe4f | 647:b39c14581166 |
---|---|
1187 image_instance_live_p (Lisp_Object instance) | 1187 image_instance_live_p (Lisp_Object instance) |
1188 { | 1188 { |
1189 return DOMAIN_LIVE_P (XIMAGE_INSTANCE_DOMAIN (instance)); | 1189 return DOMAIN_LIVE_P (XIMAGE_INSTANCE_DOMAIN (instance)); |
1190 } | 1190 } |
1191 | 1191 |
1192 static unsigned long | 1192 static Hash_Code |
1193 image_instance_hash (Lisp_Object obj, int depth) | 1193 image_instance_hash (Lisp_Object obj, int depth) |
1194 { | 1194 { |
1195 Lisp_Image_Instance *i = XIMAGE_INSTANCE (obj); | 1195 Lisp_Image_Instance *i = XIMAGE_INSTANCE (obj); |
1196 unsigned long hash = HASH5 (LISP_HASH (IMAGE_INSTANCE_DOMAIN (i)), | 1196 Hash_Code hash = HASH5 (LISP_HASH (IMAGE_INSTANCE_DOMAIN (i)), |
1197 IMAGE_INSTANCE_WIDTH (i), | 1197 IMAGE_INSTANCE_WIDTH (i), |
1198 IMAGE_INSTANCE_MARGIN_WIDTH (i), | 1198 IMAGE_INSTANCE_MARGIN_WIDTH (i), |
1199 IMAGE_INSTANCE_HEIGHT (i), | 1199 IMAGE_INSTANCE_HEIGHT (i), |
1200 internal_hash (IMAGE_INSTANCE_INSTANTIATOR (i), | 1200 internal_hash (IMAGE_INSTANCE_INSTANTIATOR (i), |
1201 depth + 1)); | 1201 depth + 1)); |
1202 | 1202 |
1203 ERROR_CHECK_IMAGE_INSTANCE (obj); | 1203 ERROR_CHECK_IMAGE_INSTANCE (obj); |
1204 | 1204 |
1205 switch (IMAGE_INSTANCE_TYPE (i)) | 1205 switch (IMAGE_INSTANCE_TYPE (i)) |
1206 { | 1206 { |
2584 | 2584 |
2585 Lisp_Object | 2585 Lisp_Object |
2586 bitmap_to_lisp_data (Lisp_Object name, int *xhot, int *yhot, | 2586 bitmap_to_lisp_data (Lisp_Object name, int *xhot, int *yhot, |
2587 int ok_if_data_invalid) | 2587 int ok_if_data_invalid) |
2588 { | 2588 { |
2589 unsigned int w, h; | 2589 int w, h; |
2590 Extbyte *data; | 2590 Extbyte *data; |
2591 int result; | 2591 int result; |
2592 const char *filename_ext; | 2592 const char *filename_ext; |
2593 | 2593 |
2594 LISP_STRING_TO_EXTERNAL (name, filename_ext, Qfile_name); | 2594 LISP_STRING_TO_EXTERNAL (name, filename_ext, Qfile_name); |
3086 instantiator_eq_equal (XCDR (obj1), XCDR (obj2)); | 3086 instantiator_eq_equal (XCDR (obj1), XCDR (obj2)); |
3087 } | 3087 } |
3088 return 0; | 3088 return 0; |
3089 } | 3089 } |
3090 | 3090 |
3091 static hashcode_t | 3091 static Hash_Code |
3092 instantiator_eq_hash (Lisp_Object obj) | 3092 instantiator_eq_hash (Lisp_Object obj) |
3093 { | 3093 { |
3094 if (CONSP (obj)) | 3094 if (CONSP (obj)) |
3095 { | 3095 { |
3096 /* no point in worrying about tail recursion, since we're not | 3096 /* no point in worrying about tail recursion, since we're not |
3608 internal_equal (g1->baseline, g2->baseline, depth) && | 3608 internal_equal (g1->baseline, g2->baseline, depth) && |
3609 internal_equal (g1->face, g2->face, depth) && | 3609 internal_equal (g1->face, g2->face, depth) && |
3610 !plists_differ (g1->plist, g2->plist, 0, 0, depth + 1)); | 3610 !plists_differ (g1->plist, g2->plist, 0, 0, depth + 1)); |
3611 } | 3611 } |
3612 | 3612 |
3613 static unsigned long | 3613 static Hash_Code |
3614 glyph_hash (Lisp_Object obj, int depth) | 3614 glyph_hash (Lisp_Object obj, int depth) |
3615 { | 3615 { |
3616 depth++; | 3616 depth++; |
3617 | 3617 |
3618 /* No need to hash all of the elements; that would take too long. | 3618 /* No need to hash all of the elements; that would take too long. |
4425 { | 4425 { |
4426 Blocktype_declare (struct expose_ignore); | 4426 Blocktype_declare (struct expose_ignore); |
4427 } *the_expose_ignore_blocktype; | 4427 } *the_expose_ignore_blocktype; |
4428 | 4428 |
4429 int | 4429 int |
4430 check_for_ignored_expose (struct frame* f, unsigned int x, unsigned int y, | 4430 check_for_ignored_expose (struct frame* f, int x, int y, int width, int height) |
4431 unsigned int width, unsigned int height) | |
4432 { | 4431 { |
4433 struct expose_ignore *ei, *prev; | 4432 struct expose_ignore *ei, *prev; |
4434 /* the ignore list is FIFO so we should generally get a match with | 4433 /* the ignore list is FIFO so we should generally get a match with |
4435 the first element in the list */ | 4434 the first element in the list */ |
4436 for (ei = f->subwindow_exposures, prev = 0; ei; ei = ei->next) | 4435 for (ei = f->subwindow_exposures, prev = 0; ei; ei = ei->next) |
4498 find_matching_subwindow | 4497 find_matching_subwindow |
4499 | 4498 |
4500 See if there is a subwindow that completely encloses the requested | 4499 See if there is a subwindow that completely encloses the requested |
4501 area. | 4500 area. |
4502 ****************************************************************************/ | 4501 ****************************************************************************/ |
4503 int find_matching_subwindow (struct frame* f, unsigned int x, | 4502 int |
4504 unsigned int y, unsigned int width, | 4503 find_matching_subwindow (struct frame* f, int x, int y, int width, int height) |
4505 unsigned int height) | |
4506 { | 4504 { |
4507 Lisp_Object rest; | 4505 Lisp_Object rest; |
4508 | 4506 |
4509 LIST_LOOP (rest, XWEAK_LIST_LIST (FRAME_SUBWINDOW_CACHE (f))) | 4507 LIST_LOOP (rest, XWEAK_LIST_LIST (FRAME_SUBWINDOW_CACHE (f))) |
4510 { | 4508 { |