comparison src/macterm.c @ 72545:171c891be45d

(mac_draw_string_common, mac_query_char_extents) (x_iconify_frame, XLoadQueryFont, install_window_handler) (mac_handle_command_event, init_command_handler, init_menu_bar): Use OSStatus instead of OSErr. (x_free_frame_resources) [TARGET_API_MAC_CARBON]: Don't use FRAME_FILE_NAME. (x_query_font): Apply 2006-08-04 change for xterm.c. (Qhi_command): Rename from Qhicommand. All uses changed.

72544:f8ade754466c

  SetPortWindowPort (FRAME_MAC_WINDOW (f));

#if USE_ATSUI
  if (GC_FONT (gc)->mac_style)
    {
      OSErr err;
      ATSUTextLayout text_layout;

      xassert (bytes_per_char == 2);

#ifndef WORDS_BIG_ENDIAN

/* Mac replacement for XQueryTextExtents, but takes a character.  If
   STYLE is NULL, measurement is done by QuickDraw Text routines for
   the font of the current graphics port.  If CG_GLYPH is not NULL,
   *CG_GLYPH is set to the glyph ID or 0 if it cannot be obtained.  */

static OSErr
mac_query_char_extents (style, c,
			font_ascent_return, font_descent_return,
			overall_return, cg_glyph)
#if USE_ATSUI
     ATSUStyle style;

     CGGlyph *cg_glyph;
#else
     void *cg_glyph;
#endif
{
  OSErr err = noErr;
  int width;
  Rect char_bounds;

#if USE_ATSUI
  if (style)

	  if (err == noErr)
	    STORE_XCHARSTRUCT (*overall_return, width, char_bounds);
#if USE_CG_TEXT_DRAWING
	  if (err == noErr && cg_glyph)
	    {
	      OSErr err1;
	      ATSUGlyphInfoArray glyph_info_array;
	      ByteCount count = sizeof (ATSUGlyphInfoArray);

	      err1 = ATSUMatchFontsToText (text_layout, kATSUFromTextBeginning,
					   kATSUToTextEnd, NULL, NULL, NULL);

void
x_iconify_frame (f)
     struct frame *f;
{
  OSErr err;

  /* A deactivate event does not occur when the last visible frame is
     iconified.  So if we clear the highlight here, it will not be
     rehighlighted when it is deiconified.  */
#if 0

  x_free_gcs (f);

  if (FRAME_SIZE_HINTS (f))
    xfree (FRAME_SIZE_HINTS (f));

#if TARGET_API_MAC_CARBON
  if (FRAME_FILE_NAME (f))
    xfree (FRAME_FILE_NAME (f));
#endif

  xfree (f->output_data.mac);
  f->output_data.mac = NULL;

  if (f == dpyinfo->x_focus_frame)

  init_cg_text_anti_aliasing_threshold ();
#endif
  if (!NILP (assq_no_quit (make_number (kTextEncodingMacUnicode),
			   text_encoding_info_alist)))
    {
      OSErr err;
      struct Lisp_Hash_Table *h;
      unsigned hash_code;
      ItemCount nfonts, i;
      ATSUFontID *font_ids = NULL;
      Ptr name;

    return NULL;

#if USE_ATSUI
  if (strcmp (charset, "iso10646-1") == 0) /* XXX */
    {
      OSErr err;
      ATSUAttributeTag tags[] = {kATSUFontTag, kATSUSizeTag,
				 kATSUQDBoldfaceTag, kATSUQDItalicTag};
      ByteCount sizes[] = {sizeof (ATSUFontID), sizeof (Fixed),
			   sizeof (Boolean), sizeof (Boolean)};
      static Fixed size_fixed;

  font->full_name = mac_to_x_fontname (family, size, fontface, charset);

#if USE_ATSUI
  if (font->mac_style)
    {
      OSErr err;
      UniChar c;

      font->min_byte1 = 0;
      font->max_byte1 = 0xff;
      font->min_char_or_byte2 = 0;

  struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
  int i;

  for (i = 0; i < dpyinfo->n_fonts; i++)
    if (dpyinfo->font_table[i].name
	&& (!strcmp (dpyinfo->font_table[i].name, fontname)
	    || !strcmp (dpyinfo->font_table[i].full_name, fontname)))
      return (dpyinfo->font_table + i);
  return NULL;
}

Point saved_menu_event_location;

/* Apple Events */
#if USE_CARBON_EVENTS
static Lisp_Object Qhicommand;
#ifdef MAC_OSX
extern Lisp_Object Qwindow;
static Lisp_Object Qtoolbar_switch_mode;
#endif
#if USE_MAC_FONT_PANEL

#endif
/* Window Event Handler */
static pascal OSStatus mac_handle_window_event (EventHandlerCallRef,
						EventRef, void *);
#endif
OSErr install_window_handler (WindowPtr);

extern void init_emacs_passwd_dir ();
extern int emacs_main (int, char **, char **);

extern void initialize_applescript();

			   NULL, sizeof (HICommand), NULL, &command);

  if (err != noErr || command.commandID == 0)
    return eventNotHandledErr;

  /* A HICommand event is mapped to an Apple event whose event class
     symbol is `hicommand' and event ID is its command ID.  */
  err = mac_store_event_ref_as_apple_event (0, command.commandID,
					    Qhicommand, Qnil,
					    event, num_params, names, types);
  return err == noErr ? noErr : eventNotHandledErr;
}

static OSErr
init_command_handler ()
{
  EventTypeSpec specs[] = {{kEventClassCommand, kEventCommandProcess}};
  static EventHandlerUPP handle_command_eventUPP = NULL;

}
#endif	/* MAC_OSX */
#endif	/* USE_CARBON_EVENTS */


OSErr
install_window_handler (window)
     WindowPtr window;
{
  OSErr err = noErr;
#if USE_CARBON_EVENTS
  EventTypeSpec specs_window[] =
    {{kEventClassWindow, kEventWindowUpdate},
     {kEventClassWindow, kEventWindowBoundsChanging},
     {kEventClassWindow, kEventWindowShown},

static void
init_menu_bar ()
{
#ifdef MAC_OSX
  OSErr err;
  MenuRef menu;
  MenuItemIndex menu_index;

  err = GetIndMenuItemWithCommandID (NULL, kHICommandQuit, 1,
				     &menu, &menu_index);

  Fput (Qalt,     Qmodifier_value, make_number (alt_modifier));
  Fput (Qhyper,   Qmodifier_value, make_number (hyper_modifier));
  Fput (Qsuper,   Qmodifier_value, make_number (super_modifier));

#if USE_CARBON_EVENTS
  Qhicommand   = intern ("hicommand");    staticpro (&Qhicommand);
#ifdef MAC_OSX
  Qtoolbar_switch_mode = intern ("toolbar-switch-mode");
  staticpro (&Qtoolbar_switch_mode);
#if USE_MAC_FONT_PANEL
  Qpanel_closed = intern ("panel-closed");  staticpro (&Qpanel_closed);

72545:171c891be45d

  SetPortWindowPort (FRAME_MAC_WINDOW (f));

#if USE_ATSUI
  if (GC_FONT (gc)->mac_style)
    {
      OSStatus err;
      ATSUTextLayout text_layout;

      xassert (bytes_per_char == 2);

#ifndef WORDS_BIG_ENDIAN

/* Mac replacement for XQueryTextExtents, but takes a character.  If
   STYLE is NULL, measurement is done by QuickDraw Text routines for
   the font of the current graphics port.  If CG_GLYPH is not NULL,
   *CG_GLYPH is set to the glyph ID or 0 if it cannot be obtained.  */

static OSStatus
mac_query_char_extents (style, c,
			font_ascent_return, font_descent_return,
			overall_return, cg_glyph)
#if USE_ATSUI
     ATSUStyle style;

     CGGlyph *cg_glyph;
#else
     void *cg_glyph;
#endif
{
  OSStatus err = noErr;
  int width;
  Rect char_bounds;

#if USE_ATSUI
  if (style)

	  if (err == noErr)
	    STORE_XCHARSTRUCT (*overall_return, width, char_bounds);
#if USE_CG_TEXT_DRAWING
	  if (err == noErr && cg_glyph)
	    {
	      OSStatus err1;
	      ATSUGlyphInfoArray glyph_info_array;
	      ByteCount count = sizeof (ATSUGlyphInfoArray);

	      err1 = ATSUMatchFontsToText (text_layout, kATSUFromTextBeginning,
					   kATSUToTextEnd, NULL, NULL, NULL);

void
x_iconify_frame (f)
     struct frame *f;
{
  OSStatus err;

  /* A deactivate event does not occur when the last visible frame is
     iconified.  So if we clear the highlight here, it will not be
     rehighlighted when it is deiconified.  */
#if 0

  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)

  init_cg_text_anti_aliasing_threshold ();
#endif
  if (!NILP (assq_no_quit (make_number (kTextEncodingMacUnicode),
			   text_encoding_info_alist)))
    {
      OSStatus err;
      struct Lisp_Hash_Table *h;
      unsigned hash_code;
      ItemCount nfonts, i;
      ATSUFontID *font_ids = NULL;
      Ptr name;

    return NULL;

#if USE_ATSUI
  if (strcmp (charset, "iso10646-1") == 0) /* XXX */
    {
      OSStatus err;
      ATSUAttributeTag tags[] = {kATSUFontTag, kATSUSizeTag,
				 kATSUQDBoldfaceTag, kATSUQDItalicTag};
      ByteCount sizes[] = {sizeof (ATSUFontID), sizeof (Fixed),
			   sizeof (Boolean), sizeof (Boolean)};
      static Fixed size_fixed;

  font->full_name = mac_to_x_fontname (family, size, fontface, charset);

#if USE_ATSUI
  if (font->mac_style)
    {
      OSStatus err;
      UniChar c;

      font->min_byte1 = 0;
      font->max_byte1 = 0xff;
      font->min_char_or_byte2 = 0;

  struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
  int i;

  for (i = 0; i < dpyinfo->n_fonts; i++)
    if (dpyinfo->font_table[i].name
	&& (!xstricmp (dpyinfo->font_table[i].name, fontname)
	    || !xstricmp (dpyinfo->font_table[i].full_name, fontname)))
      return (dpyinfo->font_table + i);
  return NULL;
}

Point saved_menu_event_location;

/* Apple Events */
#if USE_CARBON_EVENTS
static Lisp_Object Qhi_command;
#ifdef MAC_OSX
extern Lisp_Object Qwindow;
static Lisp_Object Qtoolbar_switch_mode;
#endif
#if USE_MAC_FONT_PANEL

#endif
/* Window Event Handler */
static pascal OSStatus mac_handle_window_event (EventHandlerCallRef,
						EventRef, void *);
#endif
OSStatus install_window_handler (WindowPtr);

extern void init_emacs_passwd_dir ();
extern int emacs_main (int, char **, char **);

extern void initialize_applescript();

			   NULL, sizeof (HICommand), NULL, &command);

  if (err != noErr || command.commandID == 0)
    return eventNotHandledErr;

  /* A HI command event is mapped to an Apple event whose event class
     symbol is `hi-command' and event ID is its command ID.  */
  err = mac_store_event_ref_as_apple_event (0, command.commandID,
					    Qhi_command, Qnil,
					    event, num_params, names, types);
  return err == noErr ? noErr : eventNotHandledErr;
}

static OSStatus
init_command_handler ()
{
  EventTypeSpec specs[] = {{kEventClassCommand, kEventCommandProcess}};
  static EventHandlerUPP handle_command_eventUPP = NULL;

}
#endif	/* MAC_OSX */
#endif	/* USE_CARBON_EVENTS */


OSStatus
install_window_handler (window)
     WindowPtr window;
{
  OSStatus err = noErr;
#if USE_CARBON_EVENTS
  EventTypeSpec specs_window[] =
    {{kEventClassWindow, kEventWindowUpdate},
     {kEventClassWindow, kEventWindowBoundsChanging},
     {kEventClassWindow, kEventWindowShown},

static void
init_menu_bar ()
{
#ifdef MAC_OSX
  OSStatus err;
  MenuRef menu;
  MenuItemIndex menu_index;

  err = GetIndMenuItemWithCommandID (NULL, kHICommandQuit, 1,
				     &menu, &menu_index);

  Fput (Qalt,     Qmodifier_value, make_number (alt_modifier));
  Fput (Qhyper,   Qmodifier_value, make_number (hyper_modifier));
  Fput (Qsuper,   Qmodifier_value, make_number (super_modifier));

#if USE_CARBON_EVENTS
  Qhi_command   = intern ("hi-command");    staticpro (&Qhi_command);
#ifdef MAC_OSX
  Qtoolbar_switch_mode = intern ("toolbar-switch-mode");
  staticpro (&Qtoolbar_switch_mode);
#if USE_MAC_FONT_PANEL
  Qpanel_closed = intern ("panel-closed");  staticpro (&Qpanel_closed);