Mercurial > hg > xemacs-beta

comparison src/glyphs-msw.c @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-05 09:54:39 by ben] Textual renaming: text/char names abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization. [a] distinguish between "charptr" when it refers to operations on the pointer itself and when it refers to operations on text; and [b] use consistent naming for everything referring to internal format, i.e. Itext == text in internal format Ibyte == a byte in such text Ichar == a char as represented in internal character format thus e.g. set_charptr_emchar -> set_itext_ichar The pre and post tags on either side of this change are: pre-internal-format-textual-renaming post-internal-format-textual-renaming See the Internals Manual for details of exactly how this was done, how to handle the change in your workspace, etc.
author ben
date Wed, 05 Jun 2002 09:58:45 +0000
parents 42375619fa45
children 79c6ff3eef26
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
718 718
719 #ifdef HAVE_XPM 719 #ifdef HAVE_XPM
720 720
721 struct color_symbol 721 struct color_symbol
722 { 722 {
723 Intbyte * name; 723 Ibyte * name;
724 COLORREF color; 724 COLORREF color;
725 }; 725 };
726 726
727 static struct color_symbol * 727 static struct color_symbol *
728 extract_xpm_color_names (Lisp_Object device, 728 extract_xpm_color_names (Lisp_Object device,
897 } 897 }
898 /* finally pick up a normal color spec */ 898 /* finally pick up a normal color spec */
899 if (xpmimage.colorTable[i].c_color) 899 if (xpmimage.colorTable[i].c_color)
900 { 900 {
901 colortbl[i]= 901 colortbl[i]=
902 mswindows_string_to_color ((Intbyte *) 902 mswindows_string_to_color ((Ibyte *)
903 xpmimage.colorTable[i].c_color); 903 xpmimage.colorTable[i].c_color);
904 goto label_found_color; 904 goto label_found_color;
905 } 905 }
906 906
907 label_no_color: 907 label_no_color:
1092 return IMAGE_POINTER_MASK | IMAGE_COLOR_PIXMAP_MASK; 1092 return IMAGE_POINTER_MASK | IMAGE_COLOR_PIXMAP_MASK;
1093 } 1093 }
1094 1094
1095 typedef struct 1095 typedef struct
1096 { 1096 {
1097 CIntbyte *name; 1097 CIbyte *name;
1098 int resource_id; 1098 int resource_id;
1099 } resource_t; 1099 } resource_t;
1100 1100
1101 static const resource_t bitmap_table[] = 1101 static const resource_t bitmap_table[] =
1102 { 1102 {
1173 else if (!STRINGP (name)) 1173 else if (!STRINGP (name))
1174 invalid_argument ("invalid resource identifier", name); 1174 invalid_argument ("invalid resource identifier", name);
1175 1175
1176 do 1176 do
1177 { 1177 {
1178 if (!qxestrcasecmp_i18n ((Intbyte *) res->name, XSTRING_DATA (name))) 1178 if (!qxestrcasecmp_i18n ((Ibyte *) res->name, XSTRING_DATA (name)))
1179 return res->resource_id; 1179 return res->resource_id;
1180 } 1180 }
1181 while ((++res)->name); 1181 while ((++res)->name);
1182 return 0; 1182 return 0;
1183 } 1183 }
1635 int dest_mask, Lisp_Object domain) 1635 int dest_mask, Lisp_Object domain)
1636 { 1636 {
1637 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 1637 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
1638 int i, stattis; 1638 int i, stattis;
1639 UChar_Binary *p, *bits, *bp; 1639 UChar_Binary *p, *bits, *bp;
1640 const CIntbyte * volatile emsg = 0; 1640 const CIbyte * volatile emsg = 0;
1641 const UChar_Binary * volatile dstring; 1641 const UChar_Binary * volatile dstring;
1642 1642
1643 assert (!NILP (data)); 1643 assert (!NILP (data));
1644 1644
1645 TO_EXTERNAL_FORMAT (LISP_STRING, data, 1645 TO_EXTERNAL_FORMAT (LISP_STRING, data,
1801 1801
1802 static Lisp_Object 1802 static Lisp_Object
1803 charset_of_text (Lisp_Object text) 1803 charset_of_text (Lisp_Object text)
1804 { 1804 {
1805 #ifdef MULE 1805 #ifdef MULE
1806 Intbyte *p; 1806 Ibyte *p;
1807 1807
1808 if (NILP (text)) 1808 if (NILP (text))
1809 return Vcharset_ascii; 1809 return Vcharset_ascii;
1810 for (p = XSTRING_DATA (text); *p;) 1810 for (p = XSTRING_DATA (text); *p;)
1811 { 1811 {
1812 Emchar c = charptr_emchar (p); 1812 Ichar c = itext_ichar (p);
1813 if (!EQ (emchar_charset (c), Vcharset_ascii)) 1813 if (!EQ (ichar_charset (c), Vcharset_ascii))
1814 return emchar_charset (c); 1814 return ichar_charset (c);
1815 INC_CHARPTR (p); 1815 INC_IBYTEPTR (p);
1816 } 1816 }
1817 #endif /* MULE */ 1817 #endif /* MULE */
1818 1818
1819 return Vcharset_ascii; 1819 return Vcharset_ascii;
1820 } 1820 }
2211 static void 2211 static void
2212 mswindows_widget_instantiate (Lisp_Object image_instance, 2212 mswindows_widget_instantiate (Lisp_Object image_instance,
2213 Lisp_Object instantiator, 2213 Lisp_Object instantiator,
2214 Lisp_Object pointer_fg, Lisp_Object pointer_bg, 2214 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
2215 int dest_mask, Lisp_Object domain, 2215 int dest_mask, Lisp_Object domain,
2216 const CIntbyte *class, int flags, int exflags) 2216 const CIbyte *class, int flags, int exflags)
2217 { 2217 {
2218 /* this function can call lisp */ 2218 /* this function can call lisp */
2219 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 2219 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
2220 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii), style; 2220 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii), style;
2221 Lisp_Object frame = DOMAIN_FRAME (domain); 2221 Lisp_Object frame = DOMAIN_FRAME (domain);