Mercurial > hg > xemacs-beta
comparison src/glyphs-msw.c @ 2286:04bc9d2f42c7
[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 | ba4677f54a05 |
comparison
equal
deleted
inserted
replaced
2285:914c5afaac33 | 2286:04bc9d2f42c7 |
---|---|
937 } | 937 } |
938 | 938 |
939 static void | 939 static void |
940 mswindows_xpm_instantiate (Lisp_Object image_instance, | 940 mswindows_xpm_instantiate (Lisp_Object image_instance, |
941 Lisp_Object instantiator, | 941 Lisp_Object instantiator, |
942 Lisp_Object pointer_fg, Lisp_Object pointer_bg, | 942 Lisp_Object UNUSED (pointer_fg), |
943 Lisp_Object UNUSED (pointer_bg), | |
943 int dest_mask, Lisp_Object domain) | 944 int dest_mask, Lisp_Object domain) |
944 { | 945 { |
945 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); | 946 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); |
946 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); | 947 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); |
947 const Extbyte *bytes; | 948 const Extbyte *bytes; |
1016 file_or_data_must_be_present (instantiator); | 1017 file_or_data_must_be_present (instantiator); |
1017 } | 1018 } |
1018 | 1019 |
1019 static Lisp_Object | 1020 static Lisp_Object |
1020 bmp_normalize (Lisp_Object inst, Lisp_Object console_type, | 1021 bmp_normalize (Lisp_Object inst, Lisp_Object console_type, |
1021 Lisp_Object dest_mask) | 1022 Lisp_Object UNUSED (dest_mask)) |
1022 { | 1023 { |
1023 return simple_image_type_normalize (inst, console_type, Qbmp); | 1024 return simple_image_type_normalize (inst, console_type, Qbmp); |
1024 } | 1025 } |
1025 | 1026 |
1026 static int | 1027 static int |
1029 return IMAGE_COLOR_PIXMAP_MASK; | 1030 return IMAGE_COLOR_PIXMAP_MASK; |
1030 } | 1031 } |
1031 | 1032 |
1032 static void | 1033 static void |
1033 bmp_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, | 1034 bmp_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, |
1034 Lisp_Object pointer_fg, Lisp_Object pointer_bg, | 1035 Lisp_Object UNUSED (pointer_fg), |
1035 int dest_mask, Lisp_Object domain) | 1036 Lisp_Object UNUSED (pointer_bg), |
1037 int dest_mask, Lisp_Object UNUSED (domain)) | |
1036 { | 1038 { |
1037 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); | 1039 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); |
1038 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); | 1040 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); |
1039 const Extbyte *bytes; | 1041 const Extbyte *bytes; |
1040 Bytecount len; | 1042 Bytecount len; |
1196 } | 1198 } |
1197 | 1199 |
1198 static void | 1200 static void |
1199 mswindows_resource_instantiate (Lisp_Object image_instance, | 1201 mswindows_resource_instantiate (Lisp_Object image_instance, |
1200 Lisp_Object instantiator, | 1202 Lisp_Object instantiator, |
1201 Lisp_Object pointer_fg, Lisp_Object pointer_bg, | 1203 Lisp_Object UNUSED (pointer_fg), |
1202 int dest_mask, Lisp_Object domain) | 1204 Lisp_Object UNUSED (pointer_bg), |
1205 int dest_mask, Lisp_Object UNUSED (domain)) | |
1203 { | 1206 { |
1204 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); | 1207 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); |
1205 int type = 0; | 1208 int type = 0; |
1206 HANDLE himage = NULL; | 1209 HANDLE himage = NULL; |
1207 Extbyte *resid = 0; | 1210 Extbyte *resid = 0; |
1429 Lisp_Object instantiator, | 1432 Lisp_Object instantiator, |
1430 Lisp_Object pointer_fg, | 1433 Lisp_Object pointer_fg, |
1431 Lisp_Object pointer_bg, | 1434 Lisp_Object pointer_bg, |
1432 int dest_mask, | 1435 int dest_mask, |
1433 HBITMAP mask, | 1436 HBITMAP mask, |
1434 Lisp_Object mask_filename) | 1437 Lisp_Object UNUSED (mask_filename)) |
1435 { | 1438 { |
1436 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); | 1439 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); |
1437 Lisp_Object foreground = find_keyword_in_vector (instantiator, Q_foreground); | 1440 Lisp_Object foreground = find_keyword_in_vector (instantiator, Q_foreground); |
1438 Lisp_Object background = find_keyword_in_vector (instantiator, Q_background); | 1441 Lisp_Object background = find_keyword_in_vector (instantiator, Q_background); |
1439 enum image_instance_type type; | 1442 enum image_instance_type type; |
1586 | 1589 |
1587 static void | 1590 static void |
1588 mswindows_xbm_instantiate (Lisp_Object image_instance, | 1591 mswindows_xbm_instantiate (Lisp_Object image_instance, |
1589 Lisp_Object instantiator, | 1592 Lisp_Object instantiator, |
1590 Lisp_Object pointer_fg, Lisp_Object pointer_bg, | 1593 Lisp_Object pointer_fg, Lisp_Object pointer_bg, |
1591 int dest_mask, Lisp_Object domain) | 1594 int dest_mask, Lisp_Object UNUSED (domain)) |
1592 { | 1595 { |
1593 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); | 1596 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); |
1594 const UChar_Binary *ext_data; | 1597 const UChar_Binary *ext_data; |
1595 | 1598 |
1596 assert (!NILP (data)); | 1599 assert (!NILP (data)); |
1627 | 1630 |
1628 static void | 1631 static void |
1629 mswindows_xface_instantiate (Lisp_Object image_instance, | 1632 mswindows_xface_instantiate (Lisp_Object image_instance, |
1630 Lisp_Object instantiator, | 1633 Lisp_Object instantiator, |
1631 Lisp_Object pointer_fg, Lisp_Object pointer_bg, | 1634 Lisp_Object pointer_fg, Lisp_Object pointer_bg, |
1632 int dest_mask, Lisp_Object domain) | 1635 int dest_mask, Lisp_Object UNUSED (domain)) |
1633 { | 1636 { |
1634 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); | 1637 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); |
1635 int i, stattis; | 1638 int i, stattis; |
1636 UChar_Binary *p, *bits, *bp; | 1639 UChar_Binary *p, *bits, *bp; |
1637 const CIbyte * volatile emsg = 0; | 1640 const CIbyte * volatile emsg = 0; |
1697 /************************************************************************/ | 1700 /************************************************************************/ |
1698 | 1701 |
1699 static void | 1702 static void |
1700 mswindows_print_image_instance (Lisp_Image_Instance *p, | 1703 mswindows_print_image_instance (Lisp_Image_Instance *p, |
1701 Lisp_Object printcharfun, | 1704 Lisp_Object printcharfun, |
1702 int escapeflag) | 1705 int UNUSED (escapeflag)) |
1703 { | 1706 { |
1704 switch (IMAGE_INSTANCE_TYPE (p)) | 1707 switch (IMAGE_INSTANCE_TYPE (p)) |
1705 { | 1708 { |
1706 case IMAGE_MONO_PIXMAP: | 1709 case IMAGE_MONO_PIXMAP: |
1707 case IMAGE_COLOR_PIXMAP: | 1710 case IMAGE_COLOR_PIXMAP: |
1795 /************************************************************************/ | 1798 /************************************************************************/ |
1796 /* subwindow and widget support */ | 1799 /* subwindow and widget support */ |
1797 /************************************************************************/ | 1800 /************************************************************************/ |
1798 | 1801 |
1799 static Lisp_Object | 1802 static Lisp_Object |
1800 charset_of_text (Lisp_Object text) | 1803 charset_of_text (Lisp_Object |
1804 #ifdef MULE | |
1805 text | |
1806 #else | |
1807 UNUSED (text) | |
1808 #endif | |
1809 ) | |
1801 { | 1810 { |
1802 #ifdef MULE | 1811 #ifdef MULE |
1803 Ibyte *p; | 1812 Ibyte *p; |
1804 | 1813 |
1805 if (NILP (text)) | 1814 if (NILP (text)) |
2083 domain); | 2092 domain); |
2084 } | 2093 } |
2085 | 2094 |
2086 static void | 2095 static void |
2087 mswindows_subwindow_instantiate (Lisp_Object image_instance, | 2096 mswindows_subwindow_instantiate (Lisp_Object image_instance, |
2088 Lisp_Object instantiator, | 2097 Lisp_Object UNUSED (instantiator), |
2089 Lisp_Object pointer_fg, | 2098 Lisp_Object UNUSED (pointer_fg), |
2090 Lisp_Object pointer_bg, | 2099 Lisp_Object UNUSED (pointer_bg), |
2091 int dest_mask, Lisp_Object domain) | 2100 int UNUSED (dest_mask), Lisp_Object domain) |
2092 { | 2101 { |
2093 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); | 2102 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); |
2094 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); | 2103 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); |
2095 Lisp_Object frame = DOMAIN_FRAME (domain); | 2104 Lisp_Object frame = DOMAIN_FRAME (domain); |
2096 HWND wnd; | 2105 HWND wnd; |
2141 | 2150 |
2142 #endif /* HAVE_WIDGETS */ | 2151 #endif /* HAVE_WIDGETS */ |
2143 | 2152 |
2144 static int | 2153 static int |
2145 mswindows_image_instance_equal (Lisp_Image_Instance *p1, | 2154 mswindows_image_instance_equal (Lisp_Image_Instance *p1, |
2146 Lisp_Image_Instance *p2, int depth) | 2155 Lisp_Image_Instance *p2, int UNUSED (depth)) |
2147 { | 2156 { |
2148 switch (IMAGE_INSTANCE_TYPE (p1)) | 2157 switch (IMAGE_INSTANCE_TYPE (p1)) |
2149 { | 2158 { |
2150 case IMAGE_MONO_PIXMAP: | 2159 case IMAGE_MONO_PIXMAP: |
2151 case IMAGE_COLOR_PIXMAP: | 2160 case IMAGE_COLOR_PIXMAP: |
2161 | 2170 |
2162 return 1; | 2171 return 1; |
2163 } | 2172 } |
2164 | 2173 |
2165 static Hashcode | 2174 static Hashcode |
2166 mswindows_image_instance_hash (Lisp_Image_Instance *p, int depth) | 2175 mswindows_image_instance_hash (Lisp_Image_Instance *p, int UNUSED (depth)) |
2167 { | 2176 { |
2168 switch (IMAGE_INSTANCE_TYPE (p)) | 2177 switch (IMAGE_INSTANCE_TYPE (p)) |
2169 { | 2178 { |
2170 case IMAGE_MONO_PIXMAP: | 2179 case IMAGE_MONO_PIXMAP: |
2171 case IMAGE_COLOR_PIXMAP: | 2180 case IMAGE_COLOR_PIXMAP: |
2207 /************************************************************************/ | 2216 /************************************************************************/ |
2208 /* widgets */ | 2217 /* widgets */ |
2209 /************************************************************************/ | 2218 /************************************************************************/ |
2210 static void | 2219 static void |
2211 mswindows_widget_instantiate (Lisp_Object image_instance, | 2220 mswindows_widget_instantiate (Lisp_Object image_instance, |
2212 Lisp_Object instantiator, | 2221 Lisp_Object UNUSED (instantiator), |
2213 Lisp_Object pointer_fg, Lisp_Object pointer_bg, | 2222 Lisp_Object UNUSED (pointer_fg), |
2214 int dest_mask, Lisp_Object domain, | 2223 Lisp_Object UNUSED (pointer_bg), |
2224 int UNUSED (dest_mask), Lisp_Object domain, | |
2215 const CIbyte *class_, int flags, int exflags) | 2225 const CIbyte *class_, int flags, int exflags) |
2216 { | 2226 { |
2217 /* this function can call lisp */ | 2227 /* this function can call lisp */ |
2218 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); | 2228 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); |
2219 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii), style; | 2229 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii), style; |