Mercurial > emacs
comparison src/xfaces.c @ 97043:9592c50233ab remove-carbon
Remove support for Mac Carbon.
* mactoolbox.c:
* macterm.h:
* macterm.c:
* macselect.c:
* macmenu.c:
* macgui.h:
* macfns.c:
* mac.c: Remove file.
* s/darwin.h:
* m/intel386.h:
* xfaces.c:
* xdisp.c:
* window.c:
* tparam.c:
* termhooks.h:
* termcap.c:
* term.c:
* syssignal.h:
* sysselect.h:
* sysdep.c:
* process.c:
* lread.c:
* lisp.h:
* keyboard.c:
* image.c:
* fringe.c:
* frame.h:
* frame.c:
* fontset.c:
* font.h:
* font.c:
* fns.c:
* fileio.c:
* emacs.c:
* dispnew.c:
* dispextern.h:
* config.in:
* atimer.c:
* Makefile.in: Remove code for Carbon
* erc.el: Remove code for Carbon.
Remove support for Mac Carbon.
* term/mac-win.el: Remove file
* international/mule-cmds.el:
* version.el:
* startup.el:
* simple.el:
* mwheel.el:
* mouse.el:
* loadup.el:
* isearch.el:
* info.el:
* frame.el:
* faces.el:
* disp-table.el:
* cus-start.el:
* cus-face.el:
* cus-edit.el:
* Makefile.in: Remove code for Carbon.
Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.
* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.
* ns-emacs.texi:
* faq.texi: Remove mentions of Mac Carbon.
* os.texi:
* frames.texi:
* display.texi: Remove mentions of Mac Carbon.
* xresources.texi: Remove mentions of Mac Carbon.
* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.
Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL: Remove code for Carbon.
* configure: Regenerate.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sun, 27 Jul 2008 18:24:48 +0000 |
parents | d45acf0c8d23 |
children | d45e07b45d86 |
comparison
equal
deleted
inserted
replaced
97042:0ac199626cb9 | 97043:9592c50233ab |
---|---|
235 #define FRAME_X_FONT_TABLE FRAME_W32_FONT_TABLE | 235 #define FRAME_X_FONT_TABLE FRAME_W32_FONT_TABLE |
236 #define check_x check_w32 | 236 #define check_x check_w32 |
237 #define x_list_fonts w32_list_fonts | 237 #define x_list_fonts w32_list_fonts |
238 #define GCGraphicsExposures 0 | 238 #define GCGraphicsExposures 0 |
239 #endif /* WINDOWSNT */ | 239 #endif /* WINDOWSNT */ |
240 | |
241 #ifdef MAC_OS | |
242 #include "macterm.h" | |
243 #define x_display_info mac_display_info | |
244 #define check_x check_mac | |
245 #endif /* MAC_OS */ | |
246 | 240 |
247 #ifdef HAVE_NS | 241 #ifdef HAVE_NS |
248 #include "nsterm.h" | 242 #include "nsterm.h" |
249 #undef FRAME_X_DISPLAY_INFO | 243 #undef FRAME_X_DISPLAY_INFO |
250 #define FRAME_X_DISPLAY_INFO FRAME_NS_DISPLAY_INFO | 244 #define FRAME_X_DISPLAY_INFO FRAME_NS_DISPLAY_INFO |
804 if (gc) | 798 if (gc) |
805 xfree (gc); | 799 xfree (gc); |
806 } | 800 } |
807 #endif /* HAVE_NS */ | 801 #endif /* HAVE_NS */ |
808 | 802 |
809 #ifdef MAC_OS | |
810 /* Mac OS emulation of GCs */ | |
811 | |
812 static INLINE GC | |
813 x_create_gc (f, mask, xgcv) | |
814 struct frame *f; | |
815 unsigned long mask; | |
816 XGCValues *xgcv; | |
817 { | |
818 GC gc; | |
819 BLOCK_INPUT; | |
820 gc = XCreateGC (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), mask, xgcv); | |
821 UNBLOCK_INPUT; | |
822 IF_DEBUG (++ngcs); | |
823 return gc; | |
824 } | |
825 | |
826 static INLINE void | |
827 x_free_gc (f, gc) | |
828 struct frame *f; | |
829 GC gc; | |
830 { | |
831 eassert (interrupt_input_blocked); | |
832 IF_DEBUG (xassert (--ngcs >= 0)); | |
833 XFreeGC (FRAME_MAC_DISPLAY (f), gc); | |
834 } | |
835 | |
836 #endif /* MAC_OS */ | |
837 | |
838 /* Like strcasecmp/stricmp. Used to compare parts of font names which | 803 /* Like strcasecmp/stricmp. Used to compare parts of font names which |
839 are in ISO8859-1. */ | 804 are in ISO8859-1. */ |
840 | 805 |
841 int | 806 int |
842 xstrcasecmp (s1, s2) | 807 xstrcasecmp (s1, s2) |
906 #ifdef HAVE_X_WINDOWS | 871 #ifdef HAVE_X_WINDOWS |
907 if (!FRAME_X_P (f) || FRAME_X_WINDOW (f)) | 872 if (!FRAME_X_P (f) || FRAME_X_WINDOW (f)) |
908 #endif | 873 #endif |
909 #ifdef WINDOWSNT | 874 #ifdef WINDOWSNT |
910 if (!FRAME_WINDOW_P (f) || FRAME_W32_WINDOW (f)) | 875 if (!FRAME_WINDOW_P (f) || FRAME_W32_WINDOW (f)) |
911 #endif | |
912 #ifdef MAC_OS | |
913 if (!FRAME_MAC_P (f) || FRAME_MAC_WINDOW (f)) | |
914 #endif | 876 #endif |
915 #ifdef HAVE_NS | 877 #ifdef HAVE_NS |
916 if (!FRAME_NS_P (f) || FRAME_NS_WINDOW (f)) | 878 if (!FRAME_NS_P (f) || FRAME_NS_WINDOW (f)) |
917 #endif | 879 #endif |
918 if (!realize_basic_faces (f)) | 880 if (!realize_basic_faces (f)) |
1305 return x_defined_color (f, color_name, color_def, alloc); | 1267 return x_defined_color (f, color_name, color_def, alloc); |
1306 #endif | 1268 #endif |
1307 #ifdef WINDOWSNT | 1269 #ifdef WINDOWSNT |
1308 else if (FRAME_W32_P (f)) | 1270 else if (FRAME_W32_P (f)) |
1309 return w32_defined_color (f, color_name, color_def, alloc); | 1271 return w32_defined_color (f, color_name, color_def, alloc); |
1310 #endif | |
1311 #ifdef MAC_OS | |
1312 else if (FRAME_MAC_P (f)) | |
1313 return mac_defined_color (f, color_name, color_def, alloc); | |
1314 #endif | 1272 #endif |
1315 #ifdef HAVE_NS | 1273 #ifdef HAVE_NS |
1316 else if (FRAME_NS_P (f)) | 1274 else if (FRAME_NS_P (f)) |
1317 return ns_defined_color (f, color_name, color_def, alloc, 1); | 1275 return ns_defined_color (f, color_name, color_def, alloc, 1); |
1318 #endif | 1276 #endif |
1734 /* Order by which font selection chooses fonts. The default values | 1692 /* Order by which font selection chooses fonts. The default values |
1735 mean `first, find a best match for the font width, then for the | 1693 mean `first, find a best match for the font width, then for the |
1736 font height, then for weight, then for slant.' This variable can be | 1694 font height, then for weight, then for slant.' This variable can be |
1737 set via set-face-font-sort-order. */ | 1695 set via set-face-font-sort-order. */ |
1738 | 1696 |
1739 #ifdef MAC_OS | |
1740 static int font_sort_order[4] = { | |
1741 XLFD_SWIDTH, XLFD_POINT_SIZE, XLFD_WEIGHT, XLFD_SLANT | |
1742 }; | |
1743 #else | |
1744 static int font_sort_order[4]; | 1697 static int font_sort_order[4]; |
1745 #endif | |
1746 | |
1747 | 1698 |
1748 #ifdef HAVE_WINDOW_SYSTEM | 1699 #ifdef HAVE_WINDOW_SYSTEM |
1749 | 1700 |
1750 /* Return a rescaling ratio of a font of NAME. */ | 1701 /* Return a rescaling ratio of a font of NAME. */ |
1751 | 1702 |
2382 { | 2333 { |
2383 int i; | 2334 int i; |
2384 | 2335 |
2385 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) | 2336 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
2386 if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX) | 2337 if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX) |
2387 if ((UNSPECIFIEDP (attrs[i]) || IGNORE_DEFFACE_P (attrs[i])) | 2338 if ((UNSPECIFIEDP (attrs[i]) || IGNORE_DEFFACE_P (attrs[i]))) |
2388 #ifdef MAC_OS | |
2389 /* MAC_TODO: No stipple support on Mac OS yet, this index is | |
2390 always unspecified. */ | |
2391 && i != LFACE_STIPPLE_INDEX | |
2392 #endif | |
2393 ) | |
2394 break; | 2339 break; |
2395 | 2340 |
2396 return i == LFACE_VECTOR_SIZE; | 2341 return i == LFACE_VECTOR_SIZE; |
2397 } | 2342 } |
2398 | 2343 |