Mercurial > hg > xemacs-beta

comparison src/glyphs-x.c @ 2286:04bc9d2f42c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-09-20 19:18:55 by james] Mark all unused parameters as unused. Also eliminate some unneeded local variables.
author james
date Mon, 20 Sep 2004 19:20:08 +0000
parents 7473844a83d3
children ecf1ebac70d8
comparison
equal deleted inserted replaced
2285:914c5afaac33 2286:04bc9d2f42c7
354 354
355 355
356 static void 356 static void
357 x_print_image_instance (Lisp_Image_Instance *p, 357 x_print_image_instance (Lisp_Image_Instance *p,
358 Lisp_Object printcharfun, 358 Lisp_Object printcharfun,
359 int escapeflag) 359 int UNUSED (escapeflag))
360 { 360 {
361 switch (IMAGE_INSTANCE_TYPE (p)) 361 switch (IMAGE_INSTANCE_TYPE (p))
362 { 362 {
363 case IMAGE_MONO_PIXMAP: 363 case IMAGE_MONO_PIXMAP:
364 case IMAGE_COLOR_PIXMAP: 364 case IMAGE_COLOR_PIXMAP:
474 p->data = 0; 474 p->data = 0;
475 } 475 }
476 476
477 static int 477 static int
478 x_image_instance_equal (Lisp_Image_Instance *p1, 478 x_image_instance_equal (Lisp_Image_Instance *p1,
479 Lisp_Image_Instance *p2, int depth) 479 Lisp_Image_Instance *p2, int UNUSED (depth))
480 { 480 {
481 switch (IMAGE_INSTANCE_TYPE (p1)) 481 switch (IMAGE_INSTANCE_TYPE (p1))
482 { 482 {
483 case IMAGE_MONO_PIXMAP: 483 case IMAGE_MONO_PIXMAP:
484 case IMAGE_COLOR_PIXMAP: 484 case IMAGE_COLOR_PIXMAP:
493 493
494 return 1; 494 return 1;
495 } 495 }
496 496
497 static Hashcode 497 static Hashcode
498 x_image_instance_hash (Lisp_Image_Instance *p, int depth) 498 x_image_instance_hash (Lisp_Image_Instance *p, int UNUSED (depth))
499 { 499 {
500 switch (IMAGE_INSTANCE_TYPE (p)) 500 switch (IMAGE_INSTANCE_TYPE (p))
501 { 501 {
502 case IMAGE_MONO_PIXMAP: 502 case IMAGE_MONO_PIXMAP:
503 case IMAGE_COLOR_PIXMAP: 503 case IMAGE_COLOR_PIXMAP:
844 int width, int height, 844 int width, int height,
845 int slices, 845 int slices,
846 UChar_Binary *eimage, 846 UChar_Binary *eimage,
847 int dest_mask, 847 int dest_mask,
848 Lisp_Object instantiator, 848 Lisp_Object instantiator,
849 Lisp_Object domain) 849 Lisp_Object UNUSED (domain))
850 { 850 {
851 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); 851 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
852 Colormap cmap = DEVICE_X_COLORMAP (XDEVICE(device)); 852 Colormap cmap = DEVICE_X_COLORMAP (XDEVICE(device));
853 unsigned long *pixtbl = NULL; 853 unsigned long *pixtbl = NULL;
854 int npixels = 0; 854 int npixels = 0;
912 Lisp_Object instantiator, 912 Lisp_Object instantiator,
913 Lisp_Object pointer_fg, 913 Lisp_Object pointer_fg,
914 Lisp_Object pointer_bg, 914 Lisp_Object pointer_bg,
915 int dest_mask, 915 int dest_mask,
916 Pixmap mask, 916 Pixmap mask,
917 Lisp_Object mask_filename) 917 Lisp_Object UNUSED (mask_filename))
918 { 918 {
919 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); 919 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
920 Lisp_Object foreground = find_keyword_in_vector (instantiator, Q_foreground); 920 Lisp_Object foreground = find_keyword_in_vector (instantiator, Q_foreground);
921 Lisp_Object background = find_keyword_in_vector (instantiator, Q_background); 921 Lisp_Object background = find_keyword_in_vector (instantiator, Q_background);
922 Display *dpy; 922 Display *dpy;
1072 /* Instantiate method for XBM's. */ 1072 /* Instantiate method for XBM's. */
1073 1073
1074 static void 1074 static void
1075 x_xbm_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, 1075 x_xbm_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
1076 Lisp_Object pointer_fg, Lisp_Object pointer_bg, 1076 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
1077 int dest_mask, Lisp_Object domain) 1077 int dest_mask, Lisp_Object UNUSED (domain))
1078 { 1078 {
1079 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 1079 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
1080 Char_Binary *ext_data; 1080 Char_Binary *ext_data;
1081 1081
1082 assert (!NILP (data)); 1082 assert (!NILP (data));
1556 #undef SYSV32 1556 #undef SYSV32
1557 1557
1558 static void 1558 static void
1559 x_xface_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, 1559 x_xface_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
1560 Lisp_Object pointer_fg, Lisp_Object pointer_bg, 1560 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
1561 int dest_mask, Lisp_Object domain) 1561 int dest_mask, Lisp_Object UNUSED (domain))
1562 { 1562 {
1563 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 1563 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
1564 int i, stattis; 1564 int i, stattis;
1565 UChar_Binary *p, *bits, *bp; 1565 UChar_Binary *p, *bits, *bp;
1566 const CIbyte * volatile emsg = 0; 1566 const CIbyte * volatile emsg = 0;
1633 } 1633 }
1634 1634
1635 static Lisp_Object 1635 static Lisp_Object
1636 autodetect_normalize (Lisp_Object instantiator, 1636 autodetect_normalize (Lisp_Object instantiator,
1637 Lisp_Object console_type, 1637 Lisp_Object console_type,
1638 Lisp_Object dest_mask) 1638 Lisp_Object UNUSED (dest_mask))
1639 { 1639 {
1640 Lisp_Object file = find_keyword_in_vector (instantiator, Q_data); 1640 Lisp_Object file = find_keyword_in_vector (instantiator, Q_data);
1641 Lisp_Object filename = Qnil; 1641 Lisp_Object filename = Qnil;
1642 Lisp_Object data = Qnil; 1642 Lisp_Object data = Qnil;
1643 struct gcpro gcpro1, gcpro2, gcpro3; 1643 struct gcpro gcpro1, gcpro2, gcpro3;
1794 /* Duplicate the behavior of XmuCvtStringToCursor() to bypass its bogusness. */ 1794 /* Duplicate the behavior of XmuCvtStringToCursor() to bypass its bogusness. */
1795 1795
1796 static int XLoadFont_got_error; 1796 static int XLoadFont_got_error;
1797 1797
1798 static int 1798 static int
1799 XLoadFont_error_handler (Display *dpy, XErrorEvent *xerror) 1799 XLoadFont_error_handler (Display *UNUSED (dpy), XErrorEvent *UNUSED (xerror))
1800 { 1800 {
1801 XLoadFont_got_error = 1; 1801 XLoadFont_got_error = 1;
1802 return 0; 1802 return 0;
1803 } 1803 }
1804 1804
1827 } 1827 }
1828 1828
1829 static void 1829 static void
1830 font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, 1830 font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
1831 Lisp_Object pointer_fg, Lisp_Object pointer_bg, 1831 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
1832 int dest_mask, Lisp_Object domain) 1832 int dest_mask, Lisp_Object UNUSED (domain))
1833 { 1833 {
1834 /* This function can GC */ 1834 /* This function can GC */
1835 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 1835 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
1836 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 1836 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
1837 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); 1837 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
1925 } 1925 }
1926 1926
1927 static void 1927 static void
1928 cursor_font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, 1928 cursor_font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
1929 Lisp_Object pointer_fg, Lisp_Object pointer_bg, 1929 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
1930 int dest_mask, Lisp_Object domain) 1930 int dest_mask, Lisp_Object UNUSED (domain))
1931 { 1931 {
1932 /* This function can GC */ 1932 /* This function can GC */
1933 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 1933 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
1934 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 1934 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
1935 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); 1935 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
2203 #endif 2203 #endif
2204 } 2204 }
2205 2205
2206 /* instantiate and x type subwindow */ 2206 /* instantiate and x type subwindow */
2207 static void 2207 static void
2208 x_subwindow_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, 2208 x_subwindow_instantiate (Lisp_Object image_instance,
2209 Lisp_Object pointer_fg, Lisp_Object pointer_bg, 2209 Lisp_Object UNUSED (instantiator),
2210 int dest_mask, Lisp_Object domain) 2210 Lisp_Object UNUSED (pointer_fg),
2211 Lisp_Object UNUSED (pointer_bg),
2212 int UNUSED (dest_mask), Lisp_Object domain)
2211 { 2213 {
2212 /* This function can GC */ 2214 /* This function can GC */
2213 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 2215 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
2214 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); 2216 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
2215 Lisp_Object frame = DOMAIN_FRAME (domain); 2217 Lisp_Object frame = DOMAIN_FRAME (domain);
2372 } 2374 }
2373 } 2375 }
2374 } 2376 }
2375 2377
2376 static void 2378 static void
2377 x_widget_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, 2379 x_widget_instantiate (Lisp_Object image_instance,
2378 Lisp_Object pointer_fg, Lisp_Object pointer_bg, 2380 Lisp_Object UNUSED (instantiator),
2379 int dest_mask, Lisp_Object domain, 2381 Lisp_Object UNUSED (pointer_fg),
2382 Lisp_Object UNUSED (pointer_bg),
2383 int UNUSED (dest_mask), Lisp_Object domain,
2380 const char* type, widget_value* wv) 2384 const char* type, widget_value* wv)
2381 { 2385 {
2382 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 2386 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
2383 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii), pixel; 2387 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii), pixel;
2384 struct device* d = XDEVICE (device); 2388 struct device* d = XDEVICE (device);