Mercurial > hg > xemacs-beta

comparison src/glyphs-x.c @ 5581:56144c8593a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mechanically change INT to FIXNUM in our sources. src/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT (where it refers to non-bignum Lisp integers) to FIXNUM in our sources. Done for the following functions, enums, and macros: Lisp_Type_Int_Even, Lisp_Type_Int_Odd, INT_GCBITS, INT_VALBITS, make_int(), INTP(), XINT(), CHECK_INT(), XREALINT(), INT_PLUS(), INT_MINUS(), EMACS_INT_MAX (to MOST_POSITIVE_FIXNUM), EMACS_INT_MIN (to MOST_NEGATIVE_FIXNUM), NUMBER_FITS_IN_AN_EMACS_INT() to NUMBER_FITS_IN_A_FIXNUM(), XFLOATINT, XCHAR_OR_INT, INT_OR_FLOAT. The EMACS_INT typedef was not changed, it does not describe non-bignum Lisp integers. Script that did the change available in http://mid.gmane.org/20067.17650.181273.12014@parhasard.net . modules/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers. See the src/ChangeLog entry for more details. man/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> * internals/internals.texi (How Lisp Objects Are Represented in C): * internals/internals.texi (Integers and Characters): Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 09 Oct 2011 09:51:57 +0100
parents 308d34e9f07d
children
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
747 XColor fg, bg; 747 XColor fg, bg;
748 int i; 748 int i;
749 int xhot = 0, yhot = 0; 749 int xhot = 0, yhot = 0;
750 int w, h; 750 int w, h;
751 751
752 if (INTP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii))) 752 if (FIXNUMP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)))
753 xhot = XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)); 753 xhot = XFIXNUM (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii));
754 if (INTP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii))) 754 if (FIXNUMP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)))
755 yhot = XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)); 755 yhot = XFIXNUM (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii));
756 w = IMAGE_INSTANCE_PIXMAP_WIDTH (ii); 756 w = IMAGE_INSTANCE_PIXMAP_WIDTH (ii);
757 h = IMAGE_INSTANCE_PIXMAP_HEIGHT (ii); 757 h = IMAGE_INSTANCE_PIXMAP_HEIGHT (ii);
758 758
759 #if 1 759 #if 1
760 /* Although I haven't found it documented yet, it appears that pointers are 760 /* Although I haven't found it documented yet, it appears that pointers are
1199 find_keyword_in_vector (instantiator, Q_hotspot_y); 1199 find_keyword_in_vector (instantiator, Q_hotspot_y);
1200 IMAGE_INSTANCE_X_CURSOR (ii) = 1200 IMAGE_INSTANCE_X_CURSOR (ii) =
1201 XCreatePixmapCursor 1201 XCreatePixmapCursor
1202 (dpy, source, mask, &fg_color, &bg_color, 1202 (dpy, source, mask, &fg_color, &bg_color,
1203 !NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)) ? 1203 !NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)) ?
1204 XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)) : 0, 1204 XFIXNUM (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)) : 0,
1205 !NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)) ? 1205 !NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)) ?
1206 XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)) : 0); 1206 XFIXNUM (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)) : 0);
1207 } 1207 }
1208 break; 1208 break;
1209 1209
1210 default: 1210 default:
1211 ABORT (); 1211 ABORT ();
1228 CBinbyte *ext_data; 1228 CBinbyte *ext_data;
1229 1229
1230 ext_data = LISP_STRING_TO_EXTERNAL (XCAR (XCDR (XCDR (mask_data))), 1230 ext_data = LISP_STRING_TO_EXTERNAL (XCAR (XCDR (XCDR (mask_data))),
1231 Qbinary); 1231 Qbinary);
1232 mask = pixmap_from_xbm_inline (IMAGE_INSTANCE_DEVICE (ii), 1232 mask = pixmap_from_xbm_inline (IMAGE_INSTANCE_DEVICE (ii),
1233 XINT (XCAR (mask_data)), 1233 XFIXNUM (XCAR (mask_data)),
1234 XINT (XCAR (XCDR (mask_data))), 1234 XFIXNUM (XCAR (XCDR (mask_data))),
1235 ext_data); 1235 ext_data);
1236 } 1236 }
1237 1237
1238 init_image_instance_from_xbm_inline (ii, width, height, bits, 1238 init_image_instance_from_xbm_inline (ii, width, height, bits,
1239 instantiator, pointer_fg, pointer_bg, 1239 instantiator, pointer_fg, pointer_bg,
1253 assert (!NILP (data)); 1253 assert (!NILP (data));
1254 1254
1255 ext_data = LISP_STRING_TO_EXTERNAL (XCAR (XCDR (XCDR (data))), Qbinary); 1255 ext_data = LISP_STRING_TO_EXTERNAL (XCAR (XCDR (XCDR (data))), Qbinary);
1256 1256
1257 xbm_instantiate_1 (image_instance, instantiator, pointer_fg, 1257 xbm_instantiate_1 (image_instance, instantiator, pointer_fg,
1258 pointer_bg, dest_mask, XINT (XCAR (data)), 1258 pointer_bg, dest_mask, XFIXNUM (XCAR (data)),
1259 XINT (XCAR (XCDR (data))), ext_data); 1259 XFIXNUM (XCAR (XCDR (data))), ext_data);
1260 } 1260 }
1261 1261
1262 1262
1263 #ifdef HAVE_XPM 1263 #ifdef HAVE_XPM
1264 1264
1514 default: 1514 default:
1515 { 1515 {
1516 xpm_free (&xpmattrs); 1516 xpm_free (&xpmattrs);
1517 signal_error_2 (Qgui_error, 1517 signal_error_2 (Qgui_error,
1518 "Parsing pixmap data: unknown error code", 1518 "Parsing pixmap data: unknown error code",
1519 make_int (result), data); 1519 make_fixnum (result), data);
1520 } 1520 }
1521 } 1521 }
1522 1522
1523 w = xpmattrs.width; 1523 w = xpmattrs.width;
1524 h = xpmattrs.height; 1524 h = xpmattrs.height;
1555 IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = depth; 1555 IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = depth;
1556 break; 1556 break;
1557 1557
1558 case IMAGE_POINTER: 1558 case IMAGE_POINTER:
1559 if (xpmattrs.valuemask & XpmHotspot) 1559 if (xpmattrs.valuemask & XpmHotspot)
1560 IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = make_int (xpmattrs.x_hotspot); 1560 IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = make_fixnum (xpmattrs.x_hotspot);
1561 if (xpmattrs.valuemask & XpmHotspot) 1561 if (xpmattrs.valuemask & XpmHotspot)
1562 IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = make_int (xpmattrs.y_hotspot); 1562 IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = make_fixnum (xpmattrs.y_hotspot);
1563 1563
1564 image_instance_convert_to_pointer (ii, instantiator, pointer_fg, 1564 image_instance_convert_to_pointer (ii, instantiator, pointer_fg,
1565 pointer_bg); 1565 pointer_bg);
1566 break; 1566 break;
1567 1567
1706 { 1706 {
1707 alist = remassq_no_quit (Q_data, alist); 1707 alist = remassq_no_quit (Q_data, alist);
1708 alist = Fcons (Fcons (Q_file, filename), 1708 alist = Fcons (Fcons (Q_file, filename),
1709 Fcons (Fcons (Q_data, data), alist)); 1709 Fcons (Fcons (Q_data, data), alist));
1710 if (xhot != -1) 1710 if (xhot != -1)
1711 alist = Fcons (Fcons (Q_hotspot_x, make_int (xhot)), 1711 alist = Fcons (Fcons (Q_hotspot_x, make_fixnum (xhot)),
1712 alist); 1712 alist);
1713 if (yhot != -1) 1713 if (yhot != -1)
1714 alist = Fcons (Fcons (Q_hotspot_y, make_int (yhot)), 1714 alist = Fcons (Fcons (Q_hotspot_y, make_fixnum (yhot)),
1715 alist); 1715 alist);
1716 1716
1717 alist = xbm_mask_file_munging (alist, filename, Qt, console_type); 1717 alist = xbm_mask_file_munging (alist, filename, Qt, console_type);
1718 1718
1719 { 1719 {
2677 2677
2678 if (IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (p)) 2678 if (IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (p))
2679 { 2679 {
2680 Lisp_Object val; 2680 Lisp_Object val;
2681 val = XGUI_ITEM (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (p))->value; 2681 val = XGUI_ITEM (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (p))->value;
2682 Xt_SET_VALUE (IMAGE_INSTANCE_X_WIDGET_ID (p), XtNvalue, XINT (val)); 2682 Xt_SET_VALUE (IMAGE_INSTANCE_X_WIDGET_ID (p), XtNvalue, XFIXNUM (val));
2683 } 2683 }
2684 } 2684 }
2685 2685
2686 /* instantiate an edit control */ 2686 /* instantiate an edit control */
2687 static void 2687 static void
3003 { 3003 {
3004 #define BUILD_GLYPH_INST(variable, name) \ 3004 #define BUILD_GLYPH_INST(variable, name) \
3005 Fadd_spec_to_specifier \ 3005 Fadd_spec_to_specifier \
3006 (GLYPH_IMAGE (XGLYPH (variable)), \ 3006 (GLYPH_IMAGE (XGLYPH (variable)), \
3007 vector3 (Qxbm, Q_data, \ 3007 vector3 (Qxbm, Q_data, \
3008 list3 (make_int (name##_width), \ 3008 list3 (make_fixnum (name##_width), \
3009 make_int (name##_height), \ 3009 make_fixnum (name##_height), \
3010 make_extstring ((Extbyte *) name##_bits, \ 3010 make_extstring ((Extbyte *) name##_bits, \
3011 sizeof (name##_bits), \ 3011 sizeof (name##_bits), \
3012 Qbinary))), \ 3012 Qbinary))), \
3013 Qglobal, Qx, Qnil) 3013 Qglobal, Qx, Qnil)
3014 3014