Mercurial > hg > xemacs-beta
comparison src/glyphs-x.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 |
---|---|
504 } | 504 } |
505 | 505 |
506 return 1; | 506 return 1; |
507 } | 507 } |
508 | 508 |
509 static unsigned long | 509 static Hash_Code |
510 x_image_instance_hash (Lisp_Image_Instance *p, int depth) | 510 x_image_instance_hash (Lisp_Image_Instance *p, int depth) |
511 { | 511 { |
512 switch (IMAGE_INSTANCE_TYPE (p)) | 512 switch (IMAGE_INSTANCE_TYPE (p)) |
513 { | 513 { |
514 case IMAGE_MONO_PIXMAP: | 514 case IMAGE_MONO_PIXMAP: |
702 #endif | 702 #endif |
703 | 703 |
704 /* Get the data while doing the conversion */ | 704 /* Get the data while doing the conversion */ |
705 while (1) | 705 while (1) |
706 { | 706 { |
707 Lstream_data_count size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf)); | 707 Lstream_Data_Count size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf)); |
708 if (!size_in_bytes) | 708 if (!size_in_bytes) |
709 break; | 709 break; |
710 /* It does seem the flushes are necessary... */ | 710 /* It does seem the flushes are necessary... */ |
711 #ifdef FILE_CODING | 711 #ifdef FILE_CODING |
712 Lstream_write (costr, tempbuf, size_in_bytes); | 712 Lstream_write (costr, tempbuf, size_in_bytes); |
754 /* Check that this server supports cursors of size WIDTH * HEIGHT. If | 754 /* Check that this server supports cursors of size WIDTH * HEIGHT. If |
755 not, signal an error. INSTANTIATOR is only used in the error | 755 not, signal an error. INSTANTIATOR is only used in the error |
756 message. */ | 756 message. */ |
757 | 757 |
758 static void | 758 static void |
759 check_pointer_sizes (Screen *xs, unsigned int width, unsigned int height, | 759 check_pointer_sizes (Screen *xs, int width, int height, |
760 Lisp_Object instantiator) | 760 Lisp_Object instantiator) |
761 { | 761 { |
762 unsigned int best_width, best_height; | 762 unsigned int best_width, best_height; |
763 if (! XQueryBestCursor (DisplayOfScreen (xs), RootWindowOfScreen (xs), | 763 if (! XQueryBestCursor (DisplayOfScreen (xs), RootWindowOfScreen (xs), |
764 width, height, &best_width, &best_height)) | 764 width, height, &best_width, &best_height)) |
765 /* this means that an X error of some sort occurred (we trap | 765 /* this means that an X error of some sort occurred (we trap |
766 these so they're not fatal). */ | 766 these so they're not fatal). */ |
767 gui_error ("XQueryBestCursor() failed?", instantiator); | 767 gui_error ("XQueryBestCursor() failed?", instantiator); |
768 | 768 |
769 if (width > best_width || height > best_height) | 769 if (width > (int) best_width || height > (int) best_height) |
770 signal_ferror_with_frob (Qgui_error, instantiator, | 770 signal_ferror_with_frob (Qgui_error, instantiator, |
771 "pointer too large (%dx%d): " | 771 "pointer too large (%dx%d): " |
772 "server requires %dx%d or smaller", | 772 "server requires %dx%d or smaller", |
773 width, height, best_width, best_height); | 773 width, height, best_width, best_height); |
774 } | 774 } |
1311 XpmColorSymbol *color_symbols; | 1311 XpmColorSymbol *color_symbols; |
1312 Lisp_Object color_symbol_alist = find_keyword_in_vector (instantiator, | 1312 Lisp_Object color_symbol_alist = find_keyword_in_vector (instantiator, |
1313 Q_color_symbols); | 1313 Q_color_symbols); |
1314 enum image_instance_type type; | 1314 enum image_instance_type type; |
1315 int force_mono; | 1315 int force_mono; |
1316 unsigned int w, h; | 1316 int w, h; |
1317 | 1317 |
1318 if (!DEVICE_X_P (XDEVICE (device))) | 1318 if (!DEVICE_X_P (XDEVICE (device))) |
1319 gui_error ("Not an X device", device); | 1319 gui_error ("Not an X device", device); |
1320 | 1320 |
1321 dpy = DEVICE_X_DISPLAY (XDEVICE (device)); | 1321 dpy = DEVICE_X_DISPLAY (XDEVICE (device)); |
2291 Display *dpy; | 2291 Display *dpy; |
2292 Screen *xs; | 2292 Screen *xs; |
2293 Window pw, win; | 2293 Window pw, win; |
2294 XSetWindowAttributes xswa; | 2294 XSetWindowAttributes xswa; |
2295 Mask valueMask = 0; | 2295 Mask valueMask = 0; |
2296 unsigned int w = IMAGE_INSTANCE_WIDTH (ii), | 2296 int w = IMAGE_INSTANCE_WIDTH (ii), h = IMAGE_INSTANCE_HEIGHT (ii); |
2297 h = IMAGE_INSTANCE_HEIGHT (ii); | |
2298 | 2297 |
2299 if (!DEVICE_X_P (XDEVICE (device))) | 2298 if (!DEVICE_X_P (XDEVICE (device))) |
2300 gui_error ("Not an X device", device); | 2299 gui_error ("Not an X device", device); |
2301 | 2300 |
2302 dpy = DEVICE_X_DISPLAY (XDEVICE (device)); | 2301 dpy = DEVICE_X_DISPLAY (XDEVICE (device)); |