diff options
| author | Steven Tamm <steventamm@mac.com> | 2004-11-30 05:57:27 +0000 |
|---|---|---|
| committer | Steven Tamm <steventamm@mac.com> | 2004-11-30 05:57:27 +0000 |
| commit | fc7a70ccdaaf3dcd7f027c46fb5a6e0e9458fe91 (patch) | |
| tree | e80b40dc0ebbb644b95ef52bc6b7d3f6ce4f8482 /src/s | |
| parent | cdcf58d8eb7602b03aa7530bb533984ee976ac8f (diff) | |
| download | emacs-fc7a70ccdaaf3dcd7f027c46fb5a6e0e9458fe91.tar.gz | |
* keyboard.c: Don't undef SIGIO
* s/darwin.h (NO_SOCK_SIGIO): Define NO_SOCK_SIGIO on carbon
* Makefile.in (mac.o): Depend on blockinput.h and atimer.h.
(macfns.o): Don't depend on ccl.h.
* macfns.c (mac_frame_parm_handlers): Set handlers for
Qleft_fringe and Qright_fringe.
* macterm.c (mac_fill_rectangle_to_pixmap)
(mac_draw_rectangle_to_pixmap, mac_copy_area_to_pixmap)
(mac_copy_area_with_mask_to_pixmap, x_draw_image_foreground_1):
Put in #if 0.
(mac_scroll_area) [TARGET_API_MAC_CARBON]: Use ScrollWindowRect.
(x_flush) [TARGET_API_MAC_CARBON]: Don't traverse frames.
(XFlush) [TARGET_API_MAC_CARBON]: Define to an empty replacement.
(x_draw_glyph_string_background, x_draw_glyph_string_foreground)
[!MAC_OS8]: Added ifdef'd out code for os8. Don't use
XDrawImageString. Always draw background and foreground separately.
(x_draw_image_foreground): Use clipping instead of computing the
intersection rectangle.
(x_draw_image_glyph_string): Don't draw an image with mask to a
pixmap.
(x_redisplay_interface): Set flush_display_optional member to 0.
(XTread_socket): Correctly reset the TEConverter
object.
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/darwin.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/s/darwin.h b/src/s/darwin.h index dd49426d7c3..9f78405a43c 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -217,6 +217,13 @@ Boston, MA 02111-1307, USA. */ /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ #define HAVE_SOCKETS +/* In Carbon, asynchronous I/O (using SIGIO) can't be used for window + events because they don't come from sockets, even though it works + fine on tty's. */ +#ifdef HAVE_CARBON +#define NO_SOCK_SIGIO +#endif + /* Extra initialization calls in main for Mac OS X system type. */ #ifdef HAVE_CARBON #define SYMS_SYSTEM syms_of_mac() |