emacs: src/macterm.c comparison

comparison src/macterm.c @ 59146:9bde7721ad0f

* dispextern.h: Change HAVE_CARBON to MAC_OS. (struct glyph_string): Likewise. * emacs.c (main) [MAC_OS8]: Call mac_term_init instead of mac_initialize. * fileio.c (Fnext_read_file_uses_dialog_p, Fread_file_name): Change TARGET_API_MAC_CARBON to HAVE_CARBON. * fns.c (vector): Change MAC_OSX to MAC_OS. * frame.c (x_set_frame_parameters, x_report_frame_params) (x_set_fullscreen): Remove #ifndef HAVE_CARBON. (x_set_border_width, Vdefault_frame_scroll_bars): Change HAVE_CARBON to MAC_OS. * image.c [MAC_OS]: Include sys/stat.h. [MAC_OS && !MAC_OSX]: Include sys/param.h, ImageCompression.h, and QuickTimeComponents.h. * mac.c [!MAC_OSX] (mac_wait_next_event): Add extern. [!MAC_OSX] (select): Use mac_wait_next_event. [!MAC_OSX] (run_mac_command): Change EXEC_SUFFIXES to Vexec_suffixes. [!MAC_OSX] (select, run_mac_command): Change `#ifdef TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'. (mac_clear_font_name_table): Add extern. (Fmac_clear_font_name_table): New defun. (syms_of_mac): Defsubr it. [MAC_OSX] (SELECT_POLLING_PERIOD_USEC): New define. [MAC_OSX] (select_and_poll_event): New function. [MAC_OSX] (sys_select): Use it. [MAC_OSX && SELECT_USE_CFSOCKET] (socket_callback): New function. [MAC_OSX && SELECT_USE_CFSOCKET] (SELECT_TIMEOUT_THRESHOLD_RUNLOOP, EVENT_CLASS_SOCK): New defines. [MAC_OSX] (sys_select) [SELECT_USE_CFSOCKET]: Use CFSocket and RunLoop for simultaneously monitoring two kinds of inputs, window events and process outputs, without periodically polling. * macfns.c (mac_initialized): Remove extern. (stricmp): Put in #if 0. All callers changed to use xstricmp in xfaces.c. (strnicmp): Decrement `n' at the end of each loop, not the beginning. (check_mac): Use the term "Mac native windows" instead of "Mac OS". (check_x_display_info, x_display_info_for_name): Sync with xfns.c. (mac_get_rdb_resource): New function (from w32reg.c). (x_get_string_resource): Use it. (install_window_handler): Add extern. (mac_window): New function. (Fx_create_frame): Use it instead of make_mac_frame. Set parameter for Qfullscreen. Call x_wm_set_size_hint. (Fx_open_connection, Fx_close_connection): New defuns. (syms_of_macfns): Defsubr them. (x_create_tip_frame) [TARGET_API_MAC_CARBON]: Add kWindowNoUpdatesAttribute to the window attribute. (x_create_tip_frame) [!TARGET_API_MAC_CARBON]: Use NewCWindow. (x_create_tip_frame): Don't call ShowWindow. (Fx_show_tip): Call ShowWindow. (Fx_file_dialog): Change `#ifdef TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'. (mac_frame_parm_handlers): Set handlers for Qfullscreen. (syms_of_macfns) [MAC_OSX]: Initialize mac_in_use to 0. * macgui.h [!MAC_OSX]: Don't include Controls.h. Include Windows.h. (Window): Typedef to WindowPtr and move outside `#if TARGET_API_MAC_CARBON'. (XSizeHints): New struct. * macterm.c (x_update_begin, x_update_end) [TARGET_API_MAC_CARBON]: Disable screen updates during update of a frame. (x_draw_glyph_string_background, x_draw_glyph_string_foreground) [MAC_OS8]: Use XDrawImageString/XDrawImageString16. (construct_mouse_click): Put in #if 0. (x_check_fullscreen, x_check_fullscreen_move): Remove decls. (x_scroll_bar_create, x_scroll_bar_handle_click): Change `#ifdef TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'. (activate_scroll_bars, deactivate_scroll_bars) [!TARGET_API_MAC_CARBON]: Use ActivateControl/DeactivateControl. (x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window if the position is neither user-specified nor program-specified. (x_free_frame_resources): Free size_hints. (x_wm_set_size_hint): Allocate size_hints if needed. Set size_hints. (mac_clear_font_name_table): New function. (mac_do_list_fonts): Initialize font_name_table if needed. (x_list_fonts): Don't initialize font_name_table. Add BLOCK_INPUT around mac_do_list_fonts. (mac_unload_font): New function. (x_load_font): Add BLOCK_INPUT around XLoadQueryFont. (init_mac_drag_n_drop, mac_do_receive_drag): Enclose declarations and definitions with #if TARGET_API_MAC_CARBON. [USE_CARBON_EVENTS] (mac_handle_window_event): Add decl. (install_window_handler): Add decl. (do_window_update): Add BeginUpdate/EndUpdate for the tooltip window. Use UpdateControls. Get the rectangle that should be updated and restrict the target of expose_frame to it. (do_grow_window): Set minimum height/width according to size_hints. (do_grow_window) [TARGET_API_MAC_CARBON]: Use ResizeWindow. (do_zoom_window): Don't use x_set_window_size. [USE_CARBON_EVENTS] (mac_handle_window_event): New function. (install_window_handler): New function. [!USE_CARBON_EVENTS] (mouse_region): New variable. [!USE_CARBON_EVENTS] (mac_wait_next_event): New function. (XTread_socket) [USE_CARBON_EVENTS]: Move call to GetEventDispatcherTarget inside BLOCK_INPUT. (XTread_socket) [!USE_CARBON_EVENTS]: Use mac_wait_next_event. Update mouse_region when mouse is moved. (make_mac_frame): Remove. (make_mac_terminal_frame): Put in #ifdef MAC_OS8. Initialize mouse pointer shapes. Change values of f->left_pos and f->top_pos. Don't use make_mac_frame. Use NewCWindow. Don't call ShowWindow. (mac_initialize_display_info) [MAC_OSX]: Create mac_id_name from Vinvocation_name and Vsystem_name. (mac_make_rdb): New function (from w32term.c). (mac_term_init): Use it. Add BLOCK_INPUT. Error if display has already been opened. Don't pass argument to mac_initialize_display_info. Don't set dpyinfo->height/width. Add entries to x_display_list and x_display_name_list. (x_delete_display): New function. (mac_initialize): Don't call mac_initialize_display_info. (syms_of_macterm) [!MAC_OSX]: Don't call Fprovide. * macterm.h (check_mac): Add extern. (struct mac_output): New member size_hints. (FRAME_SIZE_HINTS): New macro. (mac_unload_font): Add extern. * xdisp.c (expose_window, expose_frame): Remove kludges for Mac. * xfaces.c (clear_font_table) [MAC_OS]: call mac_unload_font.

author	Steven Tamm <steventamm@mac.com>
date	Mon, 27 Dec 2004 17:27:30 +0000
parents	b978ab01b88e
children	60ffced08532 223c12363c0c

comparison

equal deleted inserted replaced

-:c331d9c412f2
+:9bde7721ad0f
 static void
 x_update_begin (f)
 struct frame *f;
 {
-/* Nothing to do.  */
+#if TARGET_API_MAC_CARBON
+/* During update of a frame, availability of input events is
+periodically checked with ReceiveNextEvent if
+redisplay-dont-pause is nil.  That normally flushes window buffer
+changes for every check, and thus screen update looks waving even
+if no input is available.  So we disable screen updates during
+update of a frame.  */
+BLOCK_INPUT;
+DisableScreenUpdates ();
+UNBLOCK_INPUT;
+#endif
 }
 /* Start update of window W.  Set the global variable updated_window
 to the window being updated and set output_cursor to the cursor
 MOUSE_FACE_OVERWRITTEN_P non-zero means that some row containing
 glyphs in mouse-face were overwritten.  In that case we have to
 make sure that the mouse-highlight is properly redrawn.
 W may be a menu bar pseudo-window in case we don't have X toolkit
-support. Such windows don't have a cursor, so don't display it
+support.  Such windows don't have a cursor, so don't display it
 here. */
 static void
 x_update_window_end (w, cursor_on_p, mouse_face_overwritten_p)
 struct window *w;
 an update event is generated.  */
 SetPortWindowPort (FRAME_MAC_WINDOW (f));
 mac_set_backcolor (FRAME_BACKGROUND_PIXEL (f));
+#if TARGET_API_MAC_CARBON
+EnableScreenUpdates ();
+#endif
 XFlush (FRAME_MAC_DISPLAY (f));
 UNBLOCK_INPUT;
 }
 	  XSetFillStyle (s->display, s->gc, FillSolid);
 	  s->background_filled_p = 1;
 	}
 else
 #endif
-#if 0 /* defined(MAC_OS8)*/
+#ifdef MAC_OS8
 if (FONT_HEIGHT (s->font) < s->height - 2 * box_line_width
 	       || s->font_not_found_p
 	       || s->extends_to_end_of_line_p
 	       || force_p)
 #endif
 /* If we can use 8-bit functions, condense S->char2b.  */
 if (!s->two_byte_p)
 	for (i = 0; i < s->nchars; ++i)
 	  char1b[i] = s->char2b[i].byte2;
-#if 0 /* defined(MAC_OS8) */
+#ifdef MAC_OS8
 /* Draw text with XDrawString if background has already been
 	 filled.  Otherwise, use XDrawImageString.  (Note that
 	 XDrawImageString is usually faster than XDrawString.)  Always
 	 use XDrawImageString when drawing the cursor so that there is
 	 no chance that characters under a box cursor are invisible.  */
 			   s->ybase - boff, s->char2b, s->nchars);
 	  else
 	    XDrawString (s->display, s->window, s->gc, x,
 			 s->ybase - boff, char1b, s->nchars);
 	}
-#if 0 /* defined(MAC_OS8)*/
+#ifdef MAC_OS8
 else
 	{
 	  if (s->two_byte_p)
 	    XDrawImageString16 (s->display, s->window, s->gc, x,
 			        s->ybase - boff, s->char2b, s->nchars);
 return value;
 }
+#if 0
 /* Mouse clicks and mouse movement.  Rah.  */
 /* Prepare a mouse-event in *RESULT for placement in the input queue.
 If the event is a button press, then note that we have grabbed
 XSETFRAME (result->frame_or_window, f);
 result->arg = Qnil;
 return Qnil;
 }
+#endif
 /* Function to report a mouse movement to the mainstream Emacs code.
 The input handler calls this.
 			      Mouse Face
 ************************************************************************/
 static struct scroll_bar *x_window_to_scroll_bar ();
 static void x_scroll_bar_report_motion ();
-static void x_check_fullscreen P_ ((struct frame *));
-static void x_check_fullscreen_move P_ ((struct frame *));
 static int glyph_rect P_ ((struct frame *f, int, int, Rect *));
 /* MAC TODO:  This should be called from somewhere (or removed)  ++KFS */
 r.left = left;
 r.top = disp_top;
 r.right = left + width;
 r.bottom = disp_top + disp_height;
-#ifdef TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_CARBON
 ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p", 1, 0, 0, 0,
 		   kControlScrollBarProc, 0L);
 #else
 ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p", 1, 0, 0, 0, scrollBarProc,
 		   0L);
 bar = FRAME_SCROLL_BARS (frame);
 while (! NILP (bar))
 {
 ch = SCROLL_BAR_CONTROL_HANDLE (XSCROLL_BAR (bar));
-#ifdef TARGET_API_MAC_CARBON
+#if 1 /* TARGET_API_MAC_CARBON */
 ActivateControl (ch);
 #else
 SetControlMaximum (ch,
 			 VERTICAL_SCROLL_BAR_TOP_RANGE (frame,
 							XINT (XSCROLL_BAR (bar)
 bar = FRAME_SCROLL_BARS (frame);
 while (! NILP (bar))
 {
 ch = SCROLL_BAR_CONTROL_HANDLE (XSCROLL_BAR (bar));
-#ifdef TARGET_API_MAC_CARBON
+#if 1 /* TARGET_API_MAC_CARBON */
 DeactivateControl (ch);
 #else
-SetControlMaximum (ch, XINT (-1));
+SetControlMaximum (ch, -1);
 #endif
 bar = XSCROLL_BAR (bar)->next;
 }
 }
 bufp->part = scroll_bar_above_handle;
 break;
 case kControlPageDownPart:
 bufp->part = scroll_bar_below_handle;
 break;
-#ifdef TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_CARBON
 default:
 #else
 case kControlIndicatorPart:
 #endif
 if (er->what == mouseDown)
 XSetFont (FRAME_MAC_DISPLAY (f), f->output_data.mac->reverse_gc,
 		FRAME_FONT (f));
 XSetFont (FRAME_MAC_DISPLAY (f), f->output_data.mac->cursor_gc,
 		FRAME_FONT (f));
+/* Don't change the size of a tip frame; there's no point in
+	 doing it because it's done in Fx_show_tip, and it leads to
+	 problems because the tip frame has no widget.  */
 if (NILP (tip_frame) || XFRAME (tip_frame) != f)
 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
 }
 return build_string (fontp->full_name);
 }
 /* Give frame F the fontset named FONTSETNAME as its default font, and
 return the full name of that fontset.  FONTSETNAME may be a wildcard
 pattern; in that case, we choose some fontset that fits the pattern.
 The return value shows which fontset we chose.  */
 	  && ! f->output_data.mac->asked_for_visible)
 	x_set_offset (f, f->left_pos, f->top_pos, 0);
 f->output_data.mac->asked_for_visible = 1;
+#if TARGET_API_MAC_CARBON
+if (!(FRAME_SIZE_HINTS (f)->flags & (USPosition | PPosition)))
+	{
+	  struct frame *sf = SELECTED_FRAME ();
+	  if (!FRAME_MAC_P (sf))
+	    RepositionWindow (FRAME_MAC_WINDOW (f), NULL,
+			      kWindowCenterOnMainScreen);
+	  else
+	    RepositionWindow (FRAME_MAC_WINDOW (f),
+			      FRAME_MAC_WINDOW (sf),
+#ifdef MAC_OS_X_VERSION_10_2
+			      kWindowCascadeStartAtParentWindowScreen
+#else
+			      kWindowCascadeOnParentWindowScreen
+#endif
+			      );
+	  x_real_positions (f, &f->left_pos, &f->top_pos);
+	}
+#endif
 ShowWindow (FRAME_MAC_WINDOW (f));
 }
 XFlush (FRAME_MAC_DISPLAY (f));
 if (FRAME_FACE_CACHE (f))
 free_frame_faces (f);
 x_free_gcs (f);
+if (FRAME_SIZE_HINTS (f))
+xfree (FRAME_SIZE_HINTS (f));
 xfree (f->output_data.mac);
 f->output_data.mac = NULL;
 if (f == dpyinfo->x_focus_frame)
 dpyinfo->x_focus_frame = 0;
 x_wm_set_size_hint (f, flags, user_position)
 struct frame *f;
 long flags;
 int user_position;
 {
-#if 0 /* MAC_TODO: connect this to the Appearance Manager */
+int base_width, base_height, width_inc, height_inc;
-XSizeHints size_hints;
+int min_rows = 0, min_cols = 0;
+XSizeHints *size_hints;
-#ifdef USE_X_TOOLKIT
-Arg al[2];
+base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0);
-int ac = 0;
+base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0);
-Dimension widget_width, widget_height;
+width_inc = FRAME_COLUMN_WIDTH (f);
-Window window = XtWindow (f->output_data.x->widget);
+height_inc = FRAME_LINE_HEIGHT (f);
-#else /* not USE_X_TOOLKIT */
-Window window = FRAME_X_WINDOW (f);
+check_frame_size (f, &min_rows, &min_cols);
-#endif /* not USE_X_TOOLKIT */
+size_hints = FRAME_SIZE_HINTS (f);
-/* Setting PMaxSize caused various problems.  */
+if (size_hints == NULL)
-size_hints.flags = PResizeInc | PMinSize /* | PMaxSize */;
+{
+size_hints = FRAME_SIZE_HINTS (f) = xmalloc (sizeof (XSizeHints));
-size_hints.x = f->left_pos;
+bzero (size_hints, sizeof (XSizeHints));
-size_hints.y = f->top_pos;
+}
-#ifdef USE_X_TOOLKIT
+size_hints->flags |= PResizeInc | PMinSize | PBaseSize ;
-XtSetArg (al[ac], XtNwidth, &widget_width); ac++;
+size_hints->width_inc  = width_inc;
-XtSetArg (al[ac], XtNheight, &widget_height); ac++;
+size_hints->height_inc = height_inc;
-XtGetValues (f->output_data.x->widget, al, ac);
+size_hints->min_width  = base_width + min_cols * width_inc;
-size_hints.height = widget_height;
+size_hints->min_height = base_height + min_rows * height_inc;
-size_hints.width = widget_width;
+size_hints->base_width  = base_width;
-#else /* not USE_X_TOOLKIT */
+size_hints->base_height = base_height;
-size_hints.height = FRAME_PIXEL_HEIGHT (f);
-size_hints.width = FRAME_PIXEL_WIDTH (f);
-#endif /* not USE_X_TOOLKIT */
-size_hints.width_inc = FRAME_COLUMN_WIDTH (f);
-size_hints.height_inc = FRAME_LINE_HEIGHT (f);
-size_hints.max_width
-= FRAME_X_DISPLAY_INFO (f)->width - FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0);
-size_hints.max_height
-= FRAME_X_DISPLAY_INFO (f)->height - FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0);
-/* Calculate the base and minimum sizes.
-(When we use the X toolkit, we don't do it here.
-Instead we copy the values that the widgets are using, below.)  */
-#ifndef USE_X_TOOLKIT
-{
-int base_width, base_height;
-int min_rows = 0, min_cols = 0;
-base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0);
-base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0);
-check_frame_size (f, &min_rows, &min_cols);
-/* The window manager uses the base width hints to calculate the
-current number of rows and columns in the frame while
-resizing; min_width and min_height aren't useful for this
-purpose, since they might not give the dimensions for a
-zero-row, zero-column frame.
-We use the base_width and base_height members if we have
-them; otherwise, we set the min_width and min_height members
-to the size for a zero x zero frame.  */
-#ifdef HAVE_X11R4
-size_hints.flags |= PBaseSize;
-size_hints.base_width = base_width;
-size_hints.base_height = base_height;
-size_hints.min_width  = base_width + min_cols * size_hints.width_inc;
-size_hints.min_height = base_height + min_rows * size_hints.height_inc;
-#else
-size_hints.min_width = base_width;
-size_hints.min_height = base_height;
-#endif
-}
-/* If we don't need the old flags, we don't need the old hint at all.  */
 if (flags)
-{
+size_hints->flags = flags;
-size_hints.flags |= flags;
+else if (user_position)
-goto no_read;
+{
-}
+size_hints->flags &= ~ PPosition;
-#endif /* not USE_X_TOOLKIT */
+size_hints->flags |= USPosition;
+}
-{
-XSizeHints hints;		/* Sometimes I hate X Windows... */
-long supplied_return;
-int value;
-#ifdef HAVE_X11R4
-value = XGetWMNormalHints (FRAME_X_DISPLAY (f), window, &hints,
-			       &supplied_return);
-#else
-value = XGetNormalHints (FRAME_X_DISPLAY (f), window, &hints);
-#endif
-#ifdef USE_X_TOOLKIT
-size_hints.base_height = hints.base_height;
-size_hints.base_width = hints.base_width;
-size_hints.min_height = hints.min_height;
-size_hints.min_width = hints.min_width;
-#endif
-if (flags)
-size_hints.flags |= flags;
-else
-{
-	if (value == 0)
-	  hints.flags = 0;
-	if (hints.flags & PSize)
-	  size_hints.flags |= PSize;
-	if (hints.flags & PPosition)
-	  size_hints.flags |= PPosition;
-	if (hints.flags & USPosition)
-	  size_hints.flags |= USPosition;
-	if (hints.flags & USSize)
-	  size_hints.flags |= USSize;
-}
-}
-#ifndef USE_X_TOOLKIT
-no_read:
-#endif
-#ifdef PWinGravity
-size_hints.win_gravity = f->win_gravity;
-size_hints.flags |= PWinGravity;
-if (user_position)
-{
-size_hints.flags &= ~ PPosition;
-size_hints.flags |= USPosition;
-}
-#endif /* PWinGravity */
-#ifdef HAVE_X11R4
-XSetWMNormalHints (FRAME_X_DISPLAY (f), window, &size_hints);
-#else
-XSetNormalHints (FRAME_X_DISPLAY (f), window, &size_hints);
-#endif
-#endif /* MAC_TODO */
 }
 #if 0 /* MAC_TODO: hide application instead of iconify? */
 /* Used for IconicState or NormalState */
 	  if (FMGetFontFamilyTextEncoding (ff, &encoding) != noErr)
 	    break;
 	  sc = GetTextEncodingBase (encoding);
 	  decode_mac_font_name (name, sizeof (name), sc);
 	  /* Point the instance iterator at the current font family.  */
 	  if (FMResetFontFamilyInstanceIterator (ff, &ffii) != noErr)
 	    break;
 	  while (FMGetNextFontFamilyInstance (&ffii, &font, &style, &size)
 }
 #endif  /* TARGET_API_MAC_CARBON */
 }
+void
+mac_clear_font_name_table ()
+{
+int i;
+for (i = 0; i < font_name_count; i++)
+xfree (font_name_table[i]);
+xfree (font_name_table);
+font_name_table = NULL;
+font_name_table_size = font_name_count = 0;
+}
 enum xlfd_scalable_field_index
 {
 XLFD_SCL_PIXEL_SIZE,
 XLFD_SCL_POINT_SIZE,
 XLFD_SCL_AVGWIDTH,
 char scaled[256];
 char *ptr;
 int scl_val[XLFD_SCL_LAST], *field, *val;
 char *longest_start, *cur_start, *nonspecial;
 int longest_len, cur_len, exact;
+if (font_name_table == NULL)  /* Initialize when first used.  */
+init_font_name_table ();
 for (i = 0; i < XLFD_SCL_LAST; i++)
 scl_val[i] = -1;
 /* If the pattern contains 14 dashes and one of PIXEL_SIZE,
 int maxnames)
 {
 Lisp_Object newlist = Qnil, tem, key;
 struct mac_display_info *dpyinfo = f ? FRAME_MAC_DISPLAY_INFO (f) : NULL;
-if (font_name_table == NULL)  /* Initialize when first used.  */
-init_font_name_table ();
 if (dpyinfo)
 {
 tem = XCDR (dpyinfo->name_list_element);
 key = Fcons (pattern, make_number (maxnames));
 	  newlist = Fcdr_safe (newlist);
 	  goto label_cached;
 	}
 }
+BLOCK_INPUT;
 newlist = mac_do_list_fonts (SDATA (pattern), maxnames);
+UNBLOCK_INPUT;
 /* MAC_TODO: add code for matching outline fonts here */
 if (dpyinfo)
 {
 return font;
 }
+void
+mac_unload_font (dpyinfo, font)
+struct mac_display_info *dpyinfo;
+XFontStruct *font;
+{
+xfree (font->fontname);
+if (font->per_char)
+xfree (font->per_char);
+xfree (font);
+}
 /* Load font named FONTNAME of the size SIZE for frame F, and return a
 pointer to the structure font_info while allocating it dynamically.
 If SIZE is 0, load any size of font.
 If loading is failed, return NULL.  */
 a bug of not finding a font even if the font surely exists and
 is loadable by XLoadQueryFont.  */
 if (size > 0 && !NILP (font_names))
 fontname = (char *) SDATA (XCAR (font_names));
+BLOCK_INPUT;
 font = (MacFontStruct *) XLoadQueryFont (FRAME_MAC_DISPLAY (f), fontname);
+UNBLOCK_INPUT;
 if (!font)
 return NULL;
 /* Find a free slot in the font table.  */
 for (i = 0; i < dpyinfo->n_fonts; ++i)
 static pascal OSErr
 do_ae_print_documents (const AppleEvent *, AppleEvent *, long);
 static pascal OSErr do_ae_open_documents (AppleEvent *, AppleEvent *, long);
 static pascal OSErr do_ae_quit_application (AppleEvent *, AppleEvent *, long);
+#if TARGET_API_MAC_CARBON
 /* Drag and Drop */
 static OSErr init_mac_drag_n_drop ();
 static pascal OSErr mac_do_receive_drag (WindowPtr, void*, DragReference);
+#endif
 #if USE_CARBON_EVENTS
 /* Preliminary Support for the OSX Services Menu */
 static OSStatus mac_handle_service_event (EventHandlerCallRef,EventRef,void*);
 static void init_service_handler ();
-#endif
+/* Window Event Handler */
+static pascal OSStatus mac_handle_window_event (EventHandlerCallRef,
+						EventRef, void *);
+#endif
+void install_window_handler (WindowPtr);
 extern void init_emacs_passwd_dir ();
 extern int emacs_main (int, char **, char **);
 extern void check_alarm ();
 static void
 do_window_update (WindowPtr win)
 {
 struct frame *f = mac_window_to_frame (win);
-if (win == tip_window)
+BeginUpdate (win);
-/* The tooltip has been drawn already.  Avoid the
-SET_FRAME_GARBAGED below.  */
+/* The tooltip has been drawn already.  Avoid the SET_FRAME_GARBAGED
-return;
+below.  */
+if (win != tip_window)
-if (f)
 {
 if (f->async_visible == 0)
 {
 f->async_visible = 1;
 f->async_iconified = 0;
 frame titles in case this is the second frame.  */
 record_asynch_buffer_change ();
 }
 else
 {
-BeginUpdate (win);
+	  Rect r;
 handling_window_update = 1;
-	  XClearWindow (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f));
+#if TARGET_API_MAC_CARBON
+	  {
-expose_frame (f, 0, 0, 0, 0);
+	    RgnHandle region = NewRgn ();
+	    GetPortVisibleRegion (GetWindowPort (win), region);
+	    UpdateControls (win, region);
+	    GetRegionBounds (region, &r);
+	    DisposeRgn (region);
+	  }
+#else
+	  UpdateControls (win, win->visRgn);
+	  r = (*win->visRgn)->rgnBBox;
+#endif
+	  expose_frame (f, r.left, r.top, r.right - r.left, r.bottom - r.top);
 handling_window_update = 0;
-EndUpdate (win);
 }
 }
+EndUpdate (win);
 }
 static int
 is_emacs_window (WindowPtr win)
 {
 Mesander and IM - Window Manager A.  */
 static void
 do_grow_window (WindowPtr w, EventRecord *e)
 {
+Rect limit_rect;
+int rows, columns, width, height;
+struct frame *f = mac_window_to_frame (w);
+XSizeHints *size_hints = FRAME_SIZE_HINTS (f);
+int min_width = MIN_DOC_SIZE, min_height = MIN_DOC_SIZE;
+#if TARGET_API_MAC_CARBON
+Rect new_rect;
+#else
 long grow_size;
-Rect limit_rect;
+#endif
-int rows, columns;
-struct frame *f = mac_window_to_frame (w);
+if (size_hints->flags & PMinSize)
+{
-SetRect(&limit_rect, MIN_DOC_SIZE, MIN_DOC_SIZE, MAX_DOC_SIZE, MAX_DOC_SIZE);
+min_width  = size_hints->min_width;
+min_height = size_hints->min_height;
+}
+SetRect (&limit_rect, min_width, min_height, MAX_DOC_SIZE, MAX_DOC_SIZE);
+#if TARGET_API_MAC_CARBON
+if (!ResizeWindow (w, e->where, &limit_rect, &new_rect))
+return;
+height = new_rect.bottom - new_rect.top;
+width = new_rect.right - new_rect.left;
+#else
 grow_size = GrowWindow (w, e->where, &limit_rect);
 /* see if it really changed size */
-if (grow_size != 0)
+if (grow_size == 0)
-{
+return;
-rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, HiWord (grow_size));
+height = HiWord (grow_size);
-columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, LoWord (grow_size));
+width = LoWord (grow_size);
+#endif
+if (width != FRAME_PIXEL_WIDTH (f)
+|| height != FRAME_PIXEL_HEIGHT (f))
+{
+rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, height);
+columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, width);
 x_set_window_size (f, 0, columns, rows);
 }
 }
 do_zoom_window (WindowPtr w, int zoom_in_or_out)
 {
 GrafPtr save_port;
 Rect zoom_rect, port_rect;
 Point top_left;
-int w_title_height, columns, rows;
+int w_title_height, columns, rows, width, height;
 struct frame *f = mac_window_to_frame (w);
 #if TARGET_API_MAC_CARBON
 {
 Point standard_size;
 #if TARGET_API_MAC_CARBON
 GetWindowPortBounds (w, &port_rect);
 #else
 port_rect = w->portRect;
 #endif
-rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, port_rect.bottom - port_rect.top);
+height = port_rect.bottom - port_rect.top;
-columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, port_rect.right - port_rect.left);
+width = port_rect.right - port_rect.left;
-x_set_window_size (f, 0, columns, rows);
+if (width != FRAME_PIXEL_WIDTH (f)
+|| height != FRAME_PIXEL_HEIGHT (f))
+{
+rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, height);
+columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, width);
+change_frame_size (f, rows, columns, 0, 1, 0);
+SET_FRAME_GARBAGED (f);
+cancel_mouse_face (f);
+FRAME_PIXEL_WIDTH (f) = width;
+FRAME_PIXEL_HEIGHT (f) = height;
+}
 x_real_positions (f, &f->left_pos, &f->top_pos);
 }
+#if TARGET_API_MAC_CARBON
 /* Initialize Drag And Drop to allow files to be dropped onto emacs frames */
 static OSErr
 init_mac_drag_n_drop ()
 {
 OSErr result = InstallReceiveHandler (mac_do_receive_drag, 0L, NULL);
 return result;
 }
+#endif
 /* Intialize AppleEvent dispatcher table for the required events.  */
 void
 init_required_apple_events ()
 {
 */
 }
 }
 return err;
 }
-#endif
+static pascal OSStatus
+mac_handle_window_event (next_handler, event, data)
+EventHandlerCallRef next_handler;
+EventRef event;
+void *data;
+{
+extern Lisp_Object Qcontrol;
+WindowPtr wp;
+OSStatus result;
+UInt32 attributes;
+XSizeHints *size_hints;
+GetEventParameter (event, kEventParamDirectObject, typeWindowRef,
+		     NULL, sizeof (WindowPtr), NULL, &wp);
+switch (GetEventKind (event))
+{
+case kEventWindowBoundsChanging:
+result = CallNextEventHandler (next_handler, event);
+if (result != eventNotHandledErr)
+	return result;
+GetEventParameter (event, kEventParamAttributes, typeUInt32,
+			 NULL, sizeof (UInt32), NULL, &attributes);
+size_hints = FRAME_SIZE_HINTS (mac_window_to_frame (wp));
+if ((attributes & kWindowBoundsChangeUserResize)
+	  && ((size_hints->flags & (PResizeInc | PBaseSize | PMinSize))
+	      == (PResizeInc | PBaseSize | PMinSize)))
+	{
+	  Rect bounds;
+	  int width, height;
+	  GetEventParameter (event, kEventParamCurrentBounds,
+			     typeQDRectangle,
+			     NULL, sizeof (Rect), NULL, &bounds);
+	  width = bounds.right - bounds.left;
+	  height = bounds.bottom - bounds.top;
+	  if (width < size_hints->min_width)
+	    width = size_hints->min_width;
+	  else
+	    width = size_hints->base_width
+	      + (int) ((width - size_hints->base_width)
+		       / (float) size_hints->width_inc + .5)
+	      * size_hints->width_inc;
+	  if (height < size_hints->min_height)
+	    height = size_hints->min_height;
+	  else
+	    height = size_hints->base_height
+	      + (int) ((height - size_hints->base_height)
+		       / (float) size_hints->height_inc + .5)
+	      * size_hints->height_inc;
+	  bounds.right = bounds.left + width;
+	  bounds.bottom = bounds.top + height;
+	  SetEventParameter (event, kEventParamCurrentBounds,
+			     typeQDRectangle, sizeof (Rect), &bounds);
+	  return noErr;
+	}
+break;
+}
+return eventNotHandledErr;
+}
+#endif	/* USE_CARBON_EVENTS */
+void
+install_window_handler (window)
+WindowPtr window;
+{
+#if USE_CARBON_EVENTS
+EventTypeSpec specs[] = {{kEventClassWindow, kEventWindowBoundsChanging}};
+static EventHandlerUPP handle_window_event_UPP = NULL;
+if (handle_window_event_UPP == NULL)
+handle_window_event_UPP = NewEventHandlerUPP (mac_handle_window_event);
+InstallWindowEventHandler (window, handle_window_event_UPP,
+			     GetEventTypeCount (specs), specs, NULL, NULL);
+#endif
+}
 /* Open Application Apple Event */
 static pascal OSErr
 do_ae_open_application(const AppleEvent *pae, AppleEvent *preply, long prefcon)
 {
 /* InvalRect(&(gFrontMacWindowP->mWP->portRect)); */
 return err;
 }
+#if TARGET_API_MAC_CARBON
 static pascal OSErr
 mac_do_receive_drag (WindowPtr window, void *handlerRefCon,
 		     DragReference theDrag)
 {
 short items;
 	GetCurrentProcess (&psn);
 	SetFrontProcess (&psn);
 }
 }
 }
+#endif
 /* Print Document Apple Event */
 static pascal OSErr
 do_ae_print_documents (const AppleEvent *pAE, AppleEvent *reply, long refcon)
 {
 *xKeySym = keycode_to_xkeysym_table [keyCode & 0x7f];
 return *xKeySym != 0;
 }
+#if !USE_CARBON_EVENTS
+static RgnHandle mouse_region = NULL;
+Boolean
+mac_wait_next_event (er, sleep_time, dequeue)
+EventRecord *er;
+UInt32 sleep_time;
+Boolean dequeue;
+{
+static EventRecord er_buf = {nullEvent};
+UInt32 target_tick, current_tick;
+EventMask event_mask;
+if (mouse_region == NULL)
+mouse_region = NewRgn ();
+event_mask = everyEvent;
+if (NILP (Fboundp (Qmac_ready_for_drag_n_drop)))
+event_mask -= highLevelEventMask;
+current_tick = TickCount ();
+target_tick = current_tick + sleep_time;
+if (er_buf.what == nullEvent)
+while (!WaitNextEvent (event_mask, &er_buf,
+			   target_tick - current_tick, mouse_region))
+{
+	current_tick = TickCount ();
+	if (target_tick <= current_tick)
+	  return false;
+}
+*er = er_buf;
+if (dequeue)
+er_buf.what = nullEvent;
+return true;
+}
+#endif /* not USE_CARBON_EVENTS */
 /* Emacs calls this whenever it wants to read an input event from the
 user. */
 int
 XTread_socket (sd, expected, hold_quit)
 int sd, expected;
 {
 struct input_event inev;
 int count = 0;
 #if USE_CARBON_EVENTS
 EventRef eventRef;
-EventTargetRef toolbox_dispatcher = GetEventDispatcherTarget ();
+EventTargetRef toolbox_dispatcher;
-#else
-EventMask event_mask;
 #endif
 EventRecord er;
 struct mac_display_info *dpyinfo = &one_mac_display_info;
 if (interrupt_input_blocked)
 }
 if (terminate_flag)
 Fkill_emacs (make_number (1));
-#if !USE_CARBON_EVENTS
+#if USE_CARBON_EVENTS
-event_mask = everyEvent;
+toolbox_dispatcher = GetEventDispatcherTarget ();
-if (NILP (Fboundp (Qmac_ready_for_drag_n_drop)))
-event_mask -= highLevelEventMask;
-while (WaitNextEvent (event_mask, &er, 0L, NULL))
-#else /* USE_CARBON_EVENTS */
 while (!ReceiveNextEvent (0, NULL, kEventDurationNoWait,
 			    kEventRemoveFromQueue, &eventRef))
-#endif /* USE_CARBON_EVENTS */
+#else /* !USE_CARBON_EVENTS */
+while (mac_wait_next_event (&er, 0, true))
+#endif /* !USE_CARBON_EVENTS */
 {
 int do_help = 0;
 struct frame *f;
 /* It is necessary to set this (additional) argument slot of an
 	      }
 	    else
 	      SendEventToEventTarget (eventRef, toolbox_dispatcher);
 	    break;
 	  default:
 	    /* Send the event to the appropriate receiver.  */
 	    SendEventToEventTarget (eventRef, toolbox_dispatcher);
 	  }
 else
 	      else
 		do_app_suspend ();
 	      break;
 	    case mouseMovedMessage:
+#if !USE_CARBON_EVENTS
+	      SetRectRgn (mouse_region, er.where.h, er.where.v,
+			  er.where.h + 1, er.where.v + 1);
+#endif
 	      previous_help_echo_string = help_echo_string;
 	      help_echo_string = help_echo_object = help_echo_window = Qnil;
 	      help_echo_pos = -1;
 	      do_mouse_moved (er.where, &f);
 	      if (the_err == noErr)
 		{
 		  unsigned char ch = inev.code;
 		  ByteCount actual_input_length, actual_output_length;
 		  unsigned char outbuf[32];
-convert_status = TECConvertText (converter, &ch, 1,
+		  convert_status = TECConvertText (converter, &ch, 1,
-&actual_input_length,
+						   &actual_input_length,
 						   outbuf, 1,
-&actual_output_length);
+						   &actual_output_length);
-if (convert_status == noErr
+		  if (convert_status == noErr
-&& actual_input_length == 1
+		      && actual_input_length == 1
-&& actual_output_length == 1)
+		      && actual_output_length == 1)
 		    inev.code = *outbuf;
 		  /* Reset internal states of the converter object.
-If it fails, create another one. */
+		     If it fails, create another one. */
 		  convert_status = TECFlushText (converter, outbuf,
 						 sizeof (outbuf),
-&actual_output_length);
+						 &actual_output_length);
 		  if (convert_status != noErr)
 		    {
 		      TECDisposeConverter (converter);
 		      TECCreateConverter (&converter,
 					  kTextEncodingMacRoman,
 					  mac_keyboard_text_encoding);
 		    }
-}
+		}
 	    }
 #if USE_CARBON_EVENTS
 	  inev.modifiers = mac_event_to_emacs_modifiers (eventRef);
 #else
 {
 #pragma unused(p,n)
 }
 #endif
+#ifdef MAC_OS8
-/* Initialize the struct pointed to by MW to represent a new COLS x
-ROWS Macintosh window, using font with name FONTNAME and size
-FONTSIZE.  */
-void
-make_mac_frame (FRAME_PTR fp)
-{
-mac_output *mwp;
-#if TARGET_API_MAC_CARBON
-static int making_terminal_window = 0;
-#else
-static int making_terminal_window = 1;
-#endif
-mwp = fp->output_data.mac;
-BLOCK_INPUT;
-if (making_terminal_window)
-{
-if (!(mwp->mWP = GetNewCWindow (TERM_WINDOW_RESOURCE, NULL,
-				      (WindowPtr) -1)))
-abort ();
-making_terminal_window = 0;
-}
-else
-{
-#if TARGET_API_MAC_CARBON
-Rect r;
-SetRect (&r, 0, 0, 1, 1);
-if (CreateNewWindow (kDocumentWindowClass,
-			   kWindowStandardDocumentAttributes
-			   /* | kWindowToolbarButtonAttribute */,
-			   &r, &mwp->mWP) != noErr)
-#else
-if (!(mwp->mWP = GetNewCWindow (WINDOW_RESOURCE, NULL, (WindowPtr) -1)))
-#endif
-	abort ();
-}
-SetWRefCon (mwp->mWP, (long) mwp);
-/* so that update events can find this mac_output struct */
-mwp->mFP = fp;  /* point back to emacs frame */
-SizeWindow (mwp->mWP, FRAME_PIXEL_WIDTH (fp), FRAME_PIXEL_HEIGHT (fp), false);
-UNBLOCK_INPUT;
-}
 void
 make_mac_terminal_frame (struct frame *f)
 {
 Lisp_Object frame;
+Rect r;
 XSETFRAME (frame, f);
 f->output_method = output_mac;
 f->output_data.mac = (struct mac_output *)
 f->output_data.mac->cursor_pixel = 0;
 f->output_data.mac->border_pixel = 0x00ff00;
 f->output_data.mac->mouse_pixel = 0xff00ff;
 f->output_data.mac->cursor_foreground_pixel = 0x0000ff;
+f->output_data.mac->text_cursor = GetCursor (iBeamCursor);
+f->output_data.mac->nontext_cursor = &arrow_cursor;
+f->output_data.mac->modeline_cursor = &arrow_cursor;
+f->output_data.mac->hand_cursor = &arrow_cursor;
+f->output_data.mac->hourglass_cursor = GetCursor (watchCursor);
+f->output_data.mac->horizontal_drag_cursor = &arrow_cursor;
 FRAME_FONTSET (f) = -1;
 f->output_data.mac->explicit_parent = 0;
-f->left_pos = 4;
+f->left_pos = 8;
-f->top_pos = 4;
+f->top_pos = 32;
 f->border_width = 0;
 f->internal_border_width = 0;
 f->auto_raise = 1;
 f->auto_lower = 1;
 f->new_text_cols = 0;
 f->new_text_lines = 0;
-make_mac_frame (f);
+SetRect (&r, f->left_pos, f->top_pos,
+f->left_pos + FRAME_PIXEL_WIDTH (f),
+f->top_pos + FRAME_PIXEL_HEIGHT (f));
+BLOCK_INPUT;
+if (!(FRAME_MAC_WINDOW (f) =
+	NewCWindow (NULL, &r, "\p", true, dBoxProc,
+		    (WindowPtr) -1, 1, (long) f->output_data.mac)))
+abort ();
+/* so that update events can find this mac_output struct */
+f->output_data.mac->mFP = f;  /* point back to emacs frame */
+UNBLOCK_INPUT;
 x_make_gc (f);
 /* Need to be initialized for unshow_buffer in window.c.  */
 selected_window = f->selected_window;
 Fcons (Fcons (Qforeground_color,
 build_string ("black")), Qnil));
 Fmodify_frame_parameters (frame,
 Fcons (Fcons (Qbackground_color,
 build_string ("white")), Qnil));
+}
-ShowWindow (f->output_data.mac->mWP);
+#endif
-}
 /***********************************************************************
 			    Initialization
 ***********************************************************************/
 struct mac_display_info *dpyinfo = &one_mac_display_info;
 GDHandle main_device_handle;
 bzero (dpyinfo, sizeof (*dpyinfo));
-/* Put it on x_display_name_list.  */
+#ifdef MAC_OSX
-x_display_name_list = Fcons (Fcons (build_string ("Mac"), Qnil),
-x_display_name_list);
-dpyinfo->name_list_element = XCAR (x_display_name_list);
-#if 0
 dpyinfo->mac_id_name
 = (char *) xmalloc (SCHARS (Vinvocation_name)
 			+ SCHARS (Vsystem_name)
 			+ 2);
 sprintf (dpyinfo->mac_id_name, "%s@%s",
 dpyinfo->mouse_face_window = Qnil;
 dpyinfo->mouse_face_overlay = Qnil;
 dpyinfo->mouse_face_hidden = 0;
 }
+/* Create an xrdb-style database of resources to supercede registry settings.
+The database is just a concatenation of C strings, finished by an additional
+\0.  The string are submitted to some basic normalization, so
+[ *]option[ *]:[ *]value...
+becomes
+option:value...
+but any whitespace following value is not removed.  */
+static char *
+mac_make_rdb (xrm_option)
+char *xrm_option;
+{
+char *buffer = xmalloc (strlen (xrm_option) + 2);
+char *current = buffer;
+char ch;
+int in_option = 1;
+int before_value = 0;
+do {
+ch = *xrm_option++;
+if (ch == '\n')
+{
+*current++ = '\0';
+in_option = 1;
+before_value = 0;
+}
+else if (ch != ' ')
+{
+*current++ = ch;
+if (in_option && (ch == ':'))
+{
+in_option = 0;
+before_value = 1;
+}
+else if (before_value)
+{
+before_value = 0;
+}
+}
+else if (!(in_option || before_value))
+{
+*current++ = ch;
+}
+} while (ch);
+*current = '\0';
+return buffer;
+}
 struct mac_display_info *
 mac_term_init (display_name, xrm_option, resource_name)
 Lisp_Object display_name;
 char *xrm_option;
 char *resource_name;
 {
 struct mac_display_info *dpyinfo;
-GDHandle main_device_handle;
+BLOCK_INPUT;
 if (!mac_initialized)
 {
 mac_initialize ();
 mac_initialized = 1;
 }
-mac_initialize_display_info (display_name);
+if (x_display_list)
+error ("Sorry, this version can only handle one display");
+mac_initialize_display_info ();
 dpyinfo = &one_mac_display_info;
-main_device_handle = LMGetMainDevice();
+dpyinfo->xrdb = xrm_option ? mac_make_rdb (xrm_option) : NULL;
-dpyinfo->height = (**main_device_handle).gdRect.bottom;
+/* Put this display on the chain.  */
-dpyinfo->width = (**main_device_handle).gdRect.right;
+dpyinfo->next = x_display_list;
+x_display_list = dpyinfo;
+/* Put it on x_display_name_list.  */
+x_display_name_list = Fcons (Fcons (display_name, Qnil),
+x_display_name_list);
+dpyinfo->name_list_element = XCAR (x_display_name_list);
+UNBLOCK_INPUT;
 return dpyinfo;
 }
+/* Get rid of display DPYINFO, assuming all frames are already gone.  */
+void
+x_delete_display (dpyinfo)
+struct mac_display_info *dpyinfo;
+{
+int i;
+/* Discard this display from x_display_name_list and x_display_list.
+We can't use Fdelq because that can quit.  */
+if (! NILP (x_display_name_list)
+&& EQ (XCAR (x_display_name_list), dpyinfo->name_list_element))
+x_display_name_list = XCDR (x_display_name_list);
+else
+{
+Lisp_Object tail;
+tail = x_display_name_list;
+while (CONSP (tail) && CONSP (XCDR (tail)))
+	{
+	  if (EQ (XCAR (XCDR (tail)), dpyinfo->name_list_element))
+	    {
+	      XSETCDR (tail, XCDR (XCDR (tail)));
+	      break;
+	    }
+	  tail = XCDR (tail);
+	}
+}
+if (x_display_list == dpyinfo)
+x_display_list = dpyinfo->next;
+else
+{
+struct x_display_info *tail;
+for (tail = x_display_list; tail; tail = tail->next)
+	if (tail->next == dpyinfo)
+	  tail->next = tail->next->next;
+}
+/* Free the font names in the font table.  */
+for (i = 0; i < dpyinfo->n_fonts; i++)
+if (dpyinfo->font_table[i].name)
+{
+	if (dpyinfo->font_table[i].name != dpyinfo->font_table[i].full_name)
+	  xfree (dpyinfo->font_table[i].full_name);
+	xfree (dpyinfo->font_table[i].name);
+}
+if (dpyinfo->font_table->font_encoder)
+xfree (dpyinfo->font_table->font_encoder);
+xfree (dpyinfo->font_table);
+xfree (dpyinfo->mac_id_name);
+if (x_display_list == 0)
+{
+mac_clear_font_name_table ();
+bzero (dpyinfo, sizeof (*dpyinfo));
+}
+}
 #ifdef MAC_OSX
 void
 mac_check_bundle()
 {
 signal (SIGPIPE, x_connection_signal);
 #endif
 BLOCK_INPUT;
-mac_initialize_display_info ();
 #if TARGET_API_MAC_CARBON
 init_required_apple_events ();
 init_mac_drag_n_drop ();
 Qhyper = intern ("hyper");
 Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier));
 Qsuper = intern ("super");
 Fput (Qsuper, Qmodifier_value, make_number (super_modifier));
+#ifdef MAC_OSX
 Fprovide (intern ("mac-carbon"), Qnil);
+#endif
 staticpro (&Qreverse);
 Qreverse = intern ("reverse");
 staticpro (&x_display_name_list);

Mercurial > emacs

comparison src/macterm.c @ 59146:9bde7721ad0f