# HG changeset patch # User YAMAMOTO Mitsuharu # Date 1206751538 0 # Node ID 3fdc60eb4014afca18a8e9c420dc758678a35532 # Parent 79a78354b1ddc699e938596e65a72797c5c66725 (xrm_get_preference_database): Remove BLOCK_INPUT. [TARGET_API_MAC_CARBON] (cfdate_to_lisp): Obtain microsec value. Use kCFAbsoluteTimeIntervalSince1970. (wakeup_from_rne_enabled_p) [MAC_OSX]: Remove variable. (ENABLE_WAKEUP_FROM_RNE, DISABLE_WAKEUP_FROM_RNE) [MAC_OSX]: Remove macros. [MAC_OSX] (socket_callback): Do nothing. [MAC_OSX] (select_and_poll_event): Use CFRunLoopRunInMode instead of ReceiveNextEvent. [MAC_OSX] (sys_select): Likewise. Don't set context as argument to socket_callback. (mac_wakeup_from_rne) [MAC_OSX]: Do nothing. diff -r 79a78354b1dd -r 3fdc60eb4014 src/mac.c --- a/src/mac.c Sat Mar 29 00:45:27 2008 +0000 +++ b/src/mac.c Sat Mar 29 00:45:38 2008 +0000 @@ -79,6 +79,7 @@ /* The single script context used for all script executions. */ static OSAID as_script_context; +#ifndef MAC_OSX #if TARGET_API_MAC_CARBON static int wakeup_from_rne_enabled_p = 0; #define ENABLE_WAKEUP_FROM_RNE (wakeup_from_rne_enabled_p = 1) @@ -87,6 +88,7 @@ #define ENABLE_WAKEUP_FROM_RNE 0 #define DISABLE_WAKEUP_FROM_RNE 0 #endif +#endif #ifndef MAC_OSX static OSErr posix_pathname_to_fsspec P_ ((const char *, FSSpec *)); @@ -1127,18 +1129,15 @@ cfdate_to_lisp (date) CFDateRef date; { - static const CFGregorianDate epoch_gdate = {1970, 1, 1, 0, 0, 0.0}; - static CFAbsoluteTime epoch = 0.0, sec; - int high, low; - - if (epoch == 0.0) - epoch = CFGregorianDateGetAbsoluteTime (epoch_gdate, NULL); - - sec = CFDateGetAbsoluteTime (date) - epoch; + CFTimeInterval sec; + int high, low, microsec; + + sec = CFDateGetAbsoluteTime (date) + kCFAbsoluteTimeIntervalSince1970; high = sec / 65536.0; low = sec - high * 65536.0; - - return list3 (make_number (high), make_number (low), make_number (0)); + microsec = (sec - floor (sec)) * 1000000.0; + + return list3 (make_number (high), make_number (low), make_number (microsec)); } @@ -1826,8 +1825,6 @@ GCPRO3 (database, quarks, value); - BLOCK_INPUT; - app_id = kCFPreferencesCurrentApplication; if (application) { @@ -1879,8 +1876,6 @@ CFRelease (key_set); CFRelease (app_id); - UNBLOCK_INPUT; - UNGCPRO; return database; @@ -4994,8 +4989,8 @@ SELECT_TIMEOUT_THRESHOLD_RUNLOOP seconds). -> Create CFSocket for each socket and add it into the current event RunLoop so that the current event loop gets quit when - the socket becomes ready. Then ReceiveNextEvent can wait for - both kinds of inputs. + the socket becomes ready. Then CFRunLoopRunInMode can wait + for both kinds of inputs. 4. Otherwise. -> Periodically poll the window input channel while repeatedly executing `select' with a short timeout @@ -5024,12 +5019,6 @@ const void *data; void *info; { - int fd = CFSocketGetNative (s); - SELECT_TYPE *ofds = (SELECT_TYPE *)info; - - if ((type == kCFSocketReadCallBack && FD_ISSET (fd, &ofds[0])) - || (type == kCFSocketConnectCallBack && FD_ISSET (fd, &ofds[1]))) - QuitEventLoop (GetCurrentEventLoop ()); } #endif /* SELECT_USE_CFSOCKET */ @@ -5039,42 +5028,64 @@ SELECT_TYPE *rfds, *wfds, *efds; EMACS_TIME *timeout; { - OSStatus err = noErr; + int timedout_p = 0; int r = 0; - - /* Try detect_input_pending before ReceiveNextEvent in the same + EMACS_TIME select_timeout; + EventTimeout timeoutval = + (timeout + ? (EMACS_SECS (*timeout) * kEventDurationSecond + + EMACS_USECS (*timeout) * kEventDurationMicrosecond) + : kEventDurationForever); + SELECT_TYPE orfds, owfds, oefds; + + if (timeout == NULL) + { + if (rfds) orfds = *rfds; + if (wfds) owfds = *wfds; + if (efds) oefds = *efds; + } + + /* Try detect_input_pending before CFRunLoopRunInMode in the same BLOCK_INPUT block, in case that some input has already been read asynchronously. */ BLOCK_INPUT; - ENABLE_WAKEUP_FROM_RNE; - if (!detect_input_pending ()) + while (1) { - EMACS_TIME select_timeout; - EventTimeout timeoutval = - (timeout - ? (EMACS_SECS (*timeout) * kEventDurationSecond - + EMACS_USECS (*timeout) * kEventDurationMicrosecond) - : kEventDurationForever); + if (detect_input_pending ()) + break; EMACS_SET_SECS_USECS (select_timeout, 0, 0); r = select (nfds, rfds, wfds, efds, &select_timeout); + if (r != 0) + break; + if (timeoutval == 0.0) - err = eventLoopTimedOutErr; - else if (r == 0) + timedout_p = 1; + else { #if USE_CG_DRAWING mac_prepare_for_quickdraw (NULL); #endif - err = ReceiveNextEvent (0, NULL, timeoutval, - kEventLeaveInQueue, NULL); + if (CFRunLoopRunInMode (kCFRunLoopDefaultMode, + timeoutval >= 0 ? timeoutval : 100000, true) + == kCFRunLoopRunTimedOut) + timedout_p = 1; } + + if (timeout == NULL && timedout_p) + { + if (rfds) *rfds = orfds; + if (wfds) *wfds = owfds; + if (efds) *efds = oefds; + } + else + break; } - DISABLE_WAKEUP_FROM_RNE; UNBLOCK_INPUT; if (r != 0) return r; - else if (err == noErr) + else if (!timedout_p) { /* Pretend that `select' is interrupted by a signal. */ detect_input_pending (); @@ -5128,25 +5139,25 @@ SELECT_TYPE *rfds, *wfds, *efds; EMACS_TIME *timeout; { - OSStatus err = noErr; + int timedout_p = 0; int r; EMACS_TIME select_timeout; - static SELECT_TYPE ofds[3]; + SELECT_TYPE orfds, owfds, oefds; if (inhibit_window_system || noninteractive || nfds < 1 || rfds == NULL || !FD_ISSET (0, rfds)) return select (nfds, rfds, wfds, efds, timeout); FD_CLR (0, rfds); - ofds[0] = *rfds; + orfds = *rfds; if (wfds) - ofds[1] = *wfds; + owfds = *wfds; else - FD_ZERO (&ofds[1]); + FD_ZERO (&owfds); if (efds) - ofds[2] = *efds; + oefds = *efds; else { EventTimeout timeoutval = @@ -5174,25 +5185,23 @@ if (r != 0 || timeoutval == 0.0) return r; - *rfds = ofds[0]; + *rfds = orfds; if (wfds) - *wfds = ofds[1]; + *wfds = owfds; #if SELECT_USE_CFSOCKET if (timeoutval > 0 && timeoutval <= SELECT_TIMEOUT_THRESHOLD_RUNLOOP) goto poll_periodically; - /* Try detect_input_pending before ReceiveNextEvent in the same - BLOCK_INPUT block, in case that some input has already been - read asynchronously. */ + /* Try detect_input_pending before CFRunLoopRunInMode in the + same BLOCK_INPUT block, in case that some input has already + been read asynchronously. */ BLOCK_INPUT; - ENABLE_WAKEUP_FROM_RNE; if (!detect_input_pending ()) { int minfd, fd; CFRunLoopRef runloop = (CFRunLoopRef) GetCFRunLoopFromEventLoop (GetCurrentEventLoop ()); - static const CFSocketContext context = {0, ofds, NULL, NULL, NULL}; static CFMutableDictionaryRef sources; if (sources == NULL) @@ -5222,7 +5231,7 @@ CFSocketCreateWithNative (NULL, fd, (kCFSocketReadCallBack | kCFSocketConnectCallBack), - socket_callback, &context); + socket_callback, NULL); if (socket == NULL) continue; @@ -5240,8 +5249,10 @@ #if USE_CG_DRAWING mac_prepare_for_quickdraw (NULL); #endif - err = ReceiveNextEvent (0, NULL, timeoutval, - kEventLeaveInQueue, NULL); + if (CFRunLoopRunInMode (kCFRunLoopDefaultMode, + timeoutval >= 0 ? timeoutval : 100000, true) + == kCFRunLoopRunTimedOut) + timedout_p = 1; for (fd = minfd; fd < nfds; fd++) if (FD_ISSET (fd, rfds) || (wfds && FD_ISSET (fd, wfds))) @@ -5253,10 +5264,9 @@ CFRunLoopRemoveSource (runloop, source, kCFRunLoopDefaultMode); } } - DISABLE_WAKEUP_FROM_RNE; UNBLOCK_INPUT; - if (err == noErr || err == eventLoopQuitErr) + if (!timedout_p) { EMACS_SET_SECS_USECS (select_timeout, 0, 0); return select_and_poll_event (nfds, rfds, wfds, efds, @@ -5292,11 +5302,11 @@ if (r != 0) return r; - *rfds = ofds[0]; + *rfds = orfds; if (wfds) - *wfds = ofds[1]; + *wfds = owfds; if (efds) - *efds = ofds[2]; + *efds = oefds; if (timeout) { @@ -5461,10 +5471,12 @@ void mac_wakeup_from_rne () { +#ifndef MAC_OSX if (wakeup_from_rne_enabled_p) /* Post a harmless event so as to wake up from ReceiveNextEvent. */ mac_post_mouse_moved_event (); +#endif } #endif