comparison src/glyphs.c @ 122:d2f30a177268 r20-1b14

Import from CVS: tag r20-1b14
author cvs
date Mon, 13 Aug 2007 09:26:03 +0200
parents cca96a509cfe
children 9b50b4588a93
comparison
equal deleted inserted replaced
121:419db647c998 122:d2f30a177268
52 52
53 /* Qtext, Qpointer defined in general.c */ 53 /* Qtext, Qpointer defined in general.c */
54 Lisp_Object Qmono_pixmap, Qcolor_pixmap, Qsubwindow; 54 Lisp_Object Qmono_pixmap, Qcolor_pixmap, Qsubwindow;
55 55
56 Lisp_Object Vcurrent_display_table; 56 Lisp_Object Vcurrent_display_table;
57 Lisp_Object Qdisplay_table; 57 /* Declared in faces.c */
58 extern Lisp_Object Qdisplay_table;
58 59
59 Lisp_Object Vtruncation_glyph, Vcontinuation_glyph, Voctal_escape_glyph; 60 Lisp_Object Vtruncation_glyph, Vcontinuation_glyph, Voctal_escape_glyph;
60 Lisp_Object Vcontrol_arrow_glyph, Vinvisible_text_glyph, Vhscroll_glyph; 61 Lisp_Object Vcontrol_arrow_glyph, Vinvisible_text_glyph, Vhscroll_glyph;
61 Lisp_Object Vxemacs_logo; 62 Lisp_Object Vxemacs_logo;
62 63
144 DEFUN ("valid-image-instantiator-format-p", 145 DEFUN ("valid-image-instantiator-format-p",
145 Fvalid_image_instantiator_format_p, 1, 1, 0, /* 146 Fvalid_image_instantiator_format_p, 1, 1, 0, /*
146 Given an IMAGE-INSTANTIATOR-FORMAT, return non-nil if it is valid. 147 Given an IMAGE-INSTANTIATOR-FORMAT, return non-nil if it is valid.
147 Valid formats are some subset of 'nothing, 'string, 'formatted-string, 148 Valid formats are some subset of 'nothing, 'string, 'formatted-string,
148 'xpm, 'xbm, 'xface, 'gif, 'jpeg, 'png, 'tiff, 'cursor-font, 'font, 149 'xpm, 'xbm, 'xface, 'gif, 'jpeg, 'png, 'tiff, 'cursor-font, 'font,
149 'automatic-conversion, and 'subwindow, depending on how XEmacs was 150 'autodetect, and 'subwindow, depending on how XEmacs was
150 compiled. 151 compiled.
151 */ 152 */
152 (image_instantiator_format)) 153 (image_instantiator_format))
153 { 154 {
154 if (valid_image_instantiator_format_p (image_instantiator_format)) 155 if (valid_image_instantiator_format_p (image_instantiator_format))
1835 of the form \"FONT fontname index [[mask-font] mask-index]\". 1836 of the form \"FONT fontname index [[mask-font] mask-index]\".
1836 Currently can only be instanced as `pointer', although this should 1837 Currently can only be instanced as `pointer', although this should
1837 probably be fixed.) 1838 probably be fixed.)
1838 'subwindow 1839 'subwindow
1839 (An embedded X window; not currently implemented.) 1840 (An embedded X window; not currently implemented.)
1840 'automatic-conversion 1841 'autodetect
1841 (XEmacs tries to guess what format the data is in. If X support 1842 (XEmacs tries to guess what format the data is in. If X support
1842 exists, the data string will be checked to see if it names a filename. 1843 exists, the data string will be checked to see if it names a filename.
1843 If so, and this filename contains XBM or XPM data, the appropriate 1844 If so, and this filename contains XBM or XPM data, the appropriate
1844 sort of pixmap or pointer will be created. [This includes picking up 1845 sort of pixmap or pointer will be created. [This includes picking up
1845 any specified hotspot or associated mask file.] Otherwise, if `pointer' 1846 any specified hotspot or associated mask file.] Otherwise, if `pointer'
1862 If both :data and :file are specified, the image is created from 1863 If both :data and :file are specified, the image is created from
1863 what is specified in :data and the string in :file becomes the 1864 what is specified in :data and the string in :file becomes the
1864 value of the `image-instance-file-name' function when applied to 1865 value of the `image-instance-file-name' function when applied to
1865 the resulting image-instance. This keyword is not valid for 1866 the resulting image-instance. This keyword is not valid for
1866 instantiator formats `nothing', `string', `formatted-string', 1867 instantiator formats `nothing', `string', `formatted-string',
1867 `cursor-font', `font', `automatic-conversion', and `inherit'.) 1868 `cursor-font', `font', `autodetect', and `inherit'.)
1868 :foreground 1869 :foreground
1869 :background 1870 :background
1870 (For `xbm', `xface', `cursor-font', and `font'. These keywords 1871 (For `xbm', `xface', `cursor-font', and `font'. These keywords
1871 allow you to explicitly specify foreground and background colors. 1872 allow you to explicitly specify foreground and background colors.
1872 The argument should be anything acceptable to `make-color-instance'. 1873 The argument should be anything acceptable to `make-color-instance'.