comparison src/macterm.c @ 83218:47f53c5c9620

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-608 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-609 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-610 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-45 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-258
author Karoly Lorentey <lorentey@elte.hu>
date Tue, 12 Oct 2004 07:52:25 +0000
parents 4f2f1522636c 0867872551d9
children 4056279af756
comparison
equal deleted inserted replaced
83217:8131adf4ac7b 83218:47f53c5c9620
5315 void 5315 void
5316 x_raise_frame (f) 5316 x_raise_frame (f)
5317 struct frame *f; 5317 struct frame *f;
5318 { 5318 {
5319 if (f->async_visible) 5319 if (f->async_visible)
5320 SelectWindow (FRAME_MAC_WINDOW (f)); 5320 {
5321 BLOCK_INPUT;
5322 SelectWindow (FRAME_MAC_WINDOW (f));
5323 UNBLOCK_INPUT;
5324 }
5321 } 5325 }
5322 5326
5323 /* Lower frame F. */ 5327 /* Lower frame F. */
5324 void 5328 void
5325 x_lower_frame (f) 5329 x_lower_frame (f)
5326 struct frame *f; 5330 struct frame *f;
5327 { 5331 {
5328 if (f->async_visible) 5332 if (f->async_visible)
5329 SendBehind (FRAME_MAC_WINDOW (f), nil); 5333 {
5334 BLOCK_INPUT;
5335 SendBehind (FRAME_MAC_WINDOW (f), nil);
5336 UNBLOCK_INPUT;
5337 }
5330 } 5338 }
5331 5339
5332 static void 5340 static void
5333 XTframe_raise_lower (f, raise_flag) 5341 XTframe_raise_lower (f, raise_flag)
5334 FRAME_PTR f; 5342 FRAME_PTR f;
8755 static int making_terminal_window = 1; 8763 static int making_terminal_window = 1;
8756 #endif 8764 #endif
8757 8765
8758 mwp = fp->output_data.mac; 8766 mwp = fp->output_data.mac;
8759 8767
8768 BLOCK_INPUT;
8760 if (making_terminal_window) 8769 if (making_terminal_window)
8761 { 8770 {
8762 if (!(mwp->mWP = GetNewCWindow (TERM_WINDOW_RESOURCE, NULL, 8771 if (!(mwp->mWP = GetNewCWindow (TERM_WINDOW_RESOURCE, NULL,
8763 (WindowPtr) -1))) 8772 (WindowPtr) -1)))
8764 abort (); 8773 abort ();
8782 8791
8783 SetWRefCon (mwp->mWP, (long) mwp); 8792 SetWRefCon (mwp->mWP, (long) mwp);
8784 /* so that update events can find this mac_output struct */ 8793 /* so that update events can find this mac_output struct */
8785 mwp->mFP = fp; /* point back to emacs frame */ 8794 mwp->mFP = fp; /* point back to emacs frame */
8786 8795
8787 SetPortWindowPort (mwp->mWP);
8788
8789 SizeWindow (mwp->mWP, FRAME_PIXEL_WIDTH (fp), FRAME_PIXEL_HEIGHT (fp), false); 8796 SizeWindow (mwp->mWP, FRAME_PIXEL_WIDTH (fp), FRAME_PIXEL_HEIGHT (fp), false);
8797 UNBLOCK_INPUT;
8790 } 8798 }
8791 8799
8792 8800
8793 void 8801 void
8794 make_mac_terminal_frame (struct frame *f) 8802 make_mac_terminal_frame (struct frame *f)
9208 #endif /* ! defined (SIGWINCH) */ 9216 #endif /* ! defined (SIGWINCH) */
9209 9217
9210 signal (SIGPIPE, x_connection_signal); 9218 signal (SIGPIPE, x_connection_signal);
9211 #endif 9219 #endif
9212 9220
9221 BLOCK_INPUT;
9213 mac_initialize_display_info (); 9222 mac_initialize_display_info ();
9214 9223
9215 #if TARGET_API_MAC_CARBON 9224 #if TARGET_API_MAC_CARBON
9216 init_required_apple_events (); 9225 init_required_apple_events ();
9217 9226
9226 DisableMenuCommand (NULL, kHICommandQuit); 9235 DisableMenuCommand (NULL, kHICommandQuit);
9227 9236
9228 if (!inhibit_window_system) 9237 if (!inhibit_window_system)
9229 MakeMeTheFrontProcess (); 9238 MakeMeTheFrontProcess ();
9230 #endif 9239 #endif
9240 UNBLOCK_INPUT;
9231 } 9241 }
9232 9242
9233 9243
9234 void 9244 void
9235 syms_of_macterm () 9245 syms_of_macterm ()