Mercurial > emacs
comparison src/mac.c @ 90602:b5c13d1564a9
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 437-446)
- Update from CVS
- lisp/url/url-methods.el: Fix format error when http_proxy is empty string
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 137-140)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-111
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 20 Sep 2006 06:04:23 +0000 |
parents | a1a25ac6c88a ddc3ec9e715f |
children | 7eeafaaa9eab |
comparison
equal
deleted
inserted
replaced
90601:a1a25ac6c88a | 90602:b5c13d1564a9 |
---|---|
2414 | 2414 |
2415 | 2415 |
2416 extern Boolean mac_wait_next_event P_ ((EventRecord *, UInt32, Boolean)); | 2416 extern Boolean mac_wait_next_event P_ ((EventRecord *, UInt32, Boolean)); |
2417 | 2417 |
2418 int | 2418 int |
2419 select (n, rfds, wfds, efds, timeout) | 2419 select (nfds, rfds, wfds, efds, timeout) |
2420 int nfds; | 2420 int nfds; |
2421 SELECT_TYPE *rfds, *wfds, *efds; | 2421 SELECT_TYPE *rfds, *wfds, *efds; |
2422 EMACS_TIME *timeout; | 2422 EMACS_TIME *timeout; |
2423 { | 2423 { |
2424 OSStatus err = noErr; | 2424 OSStatus err = noErr; |
4973 4. Otherwise. | 4973 4. Otherwise. |
4974 -> Periodically poll the window input channel while repeatedly | 4974 -> Periodically poll the window input channel while repeatedly |
4975 executing `select' with a short timeout | 4975 executing `select' with a short timeout |
4976 (SELECT_POLLING_PERIOD_USEC microseconds). */ | 4976 (SELECT_POLLING_PERIOD_USEC microseconds). */ |
4977 | 4977 |
4978 #ifndef SELECT_USE_CFSOCKET | |
4979 #define SELECT_USE_CFSOCKET 1 | |
4980 #endif | |
4981 | |
4978 #define SELECT_POLLING_PERIOD_USEC 100000 | 4982 #define SELECT_POLLING_PERIOD_USEC 100000 |
4979 #if SELECT_USE_CFSOCKET | 4983 #if SELECT_USE_CFSOCKET |
4980 #define SELECT_TIMEOUT_THRESHOLD_RUNLOOP 0.2 | 4984 #define SELECT_TIMEOUT_THRESHOLD_RUNLOOP 0.2 |
4981 | 4985 |
4982 static void | 4986 static void |
5113 if (!detect_input_pending ()) | 5117 if (!detect_input_pending ()) |
5114 { | 5118 { |
5115 int minfd, fd; | 5119 int minfd, fd; |
5116 CFRunLoopRef runloop = | 5120 CFRunLoopRef runloop = |
5117 (CFRunLoopRef) GetCFRunLoopFromEventLoop (GetCurrentEventLoop ()); | 5121 (CFRunLoopRef) GetCFRunLoopFromEventLoop (GetCurrentEventLoop ()); |
5118 static CFSocketContext context = {0, &ofds, NULL, NULL, NULL}; | 5122 static CFSocketContext context = {0, ofds, NULL, NULL, NULL}; |
5119 static CFMutableDictionaryRef sources; | 5123 static CFMutableDictionaryRef sources; |
5120 | 5124 |
5121 if (sources == NULL) | 5125 if (sources == NULL) |
5122 sources = | 5126 sources = |
5123 CFDictionaryCreateMutable (NULL, 0, NULL, | 5127 CFDictionaryCreateMutable (NULL, 0, NULL, |