comparison src/macterm.c @ 70563:fc3c18e2c3b9

(Qservice) [MAC_OSX]: Rename from Qservices. All uses changed. [MAC_OSX] (mac_store_service_event): Rename from mac_store_services_event. All callers changed. [USE_MAC_FONT_PANEL] (mac_set_font_info_for_selection): Add args FACE_ID and C. All callers changed. (x_free_frame_resources) [USE_MAC_FONT_PANEL]: Call mac_set_font_info_for_selection when focus frame is destroyed. (XTread_socket): Revert to FrontNonFloatingWindow/FrontWindow.

70562:e2bd086e6902

      else
	pending_autoraise_frame = 0;

#if USE_MAC_FONT_PANEL
      if (frame)
	mac_set_font_info_for_selection (frame);
#endif
    }

  x_frame_rehighlight (dpyinfo);
}

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

  if (f == dpyinfo->x_focus_frame)
    dpyinfo->x_focus_frame = 0;
  if (f == dpyinfo->x_focus_event_frame)
    dpyinfo->x_focus_event_frame = 0;
  if (f == dpyinfo->x_highlight_frame)
    dpyinfo->x_highlight_frame = 0;

    }
}

#if USE_MAC_FONT_PANEL
OSStatus
mac_set_font_info_for_selection (f)
     struct frame *f;
{
  OSStatus err;

  if (f == NULL)
    err = SetFontInfoForSelection (kFontSelectionATSUIType, 0, NULL, NULL);
  else
    {
      struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
      XFontStruct *ascii_font = default_face->ascii_face->font;
      EventTargetRef target = GetWindowEventTarget (FRAME_MAC_WINDOW (f));

      if (ascii_font->mac_fontnum != -1)
	{
	  FontSelectionQDStyle qd_style;

	  qd_style.version = kFontSelectionQDStyleVersionZero;
	  qd_style.instance.fontFamily = ascii_font->mac_fontnum;
	  qd_style.instance.fontStyle = ascii_font->mac_fontface;
	  qd_style.size = ascii_font->mac_fontsize;
	  qd_style.hasColor = false;

	  err = SetFontInfoForSelection (kFontSelectionQDType,
					 1, &qd_style, target);
	}
      else
	err = SetFontInfoForSelection (kFontSelectionATSUIType,
				       1, &ascii_font->mac_style, target);
    }

  return err;
}
#endif

void remove_drag_handler P_ ((WindowRef));

#if USE_CARBON_EVENTS
#ifdef MAC_OSX
extern void init_service_handler ();
static Lisp_Object Qservices, Qpaste, Qperform;
#endif
/* Window Event Handler */
static pascal OSStatus mac_handle_window_event (EventHandlerCallRef,
						EventRef, void *);
#endif

}
#endif

#ifdef MAC_OSX
OSStatus
mac_store_services_event (event)
     EventRef event;
{
  OSStatus err;
  Lisp_Object id_key;
  int num_params;

    default:
      abort ();
    }

  err = mac_store_event_ref_as_apple_event (0, 0, Qservices, id_key,
					    event, num_params,
					    names, types);

  return err;
}

		inev.kind = MENU_BAR_ACTIVATE_EVENT;
		XSETFRAME (inev.frame_or_window, f);
		break;

	      case inContent:
		if (dpyinfo->x_focus_frame == NULL
		    || window_ptr != FRAME_MAC_WINDOW (dpyinfo->x_focus_frame))
		  SelectWindow (window_ptr);
		else
		  {
		    ControlPartCode control_part_code;
		    ControlHandle ch;

#if USE_MAC_FONT_PANEL
  Qpanel_closed = intern ("panel-closed");  staticpro (&Qpanel_closed);
  Qselection    = intern ("selection");     staticpro (&Qselection);
#endif

  Qservices    = intern ("services");	  staticpro (&Qservices);
  Qpaste       = intern ("paste");	  staticpro (&Qpaste);
  Qperform     = intern ("perform");	  staticpro (&Qperform);
#endif
#endif

70563:fc3c18e2c3b9

      else
	pending_autoraise_frame = 0;

#if USE_MAC_FONT_PANEL
      if (frame)
	mac_set_font_info_for_selection (frame, DEFAULT_FACE_ID, 0);
#endif
    }

  x_frame_rehighlight (dpyinfo);
}

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

  if (f == dpyinfo->x_focus_frame)
    {
      dpyinfo->x_focus_frame = 0;
#if USE_MAC_FONT_PANEL
      mac_set_font_info_for_selection (NULL, DEFAULT_FACE_ID, 0);
#endif
    }
  if (f == dpyinfo->x_focus_event_frame)
    dpyinfo->x_focus_event_frame = 0;
  if (f == dpyinfo->x_highlight_frame)
    dpyinfo->x_highlight_frame = 0;

    }
}

#if USE_MAC_FONT_PANEL
OSStatus
mac_set_font_info_for_selection (f, face_id, c)
     struct frame *f;
     int face_id, c;
{
  OSStatus err;
  EventTargetRef target = NULL;
  XFontStruct *font = NULL;

  if (f)
    {
      target = GetWindowEventTarget (FRAME_MAC_WINDOW (f));

      if (FRAME_FACE_CACHE (f) && CHAR_VALID_P (c, 0))
	{
	  struct face *face;

	  face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c);
	  face = FACE_FROM_ID (f, face_id);
	  font = face->font;
	}
    }

  if (font == NULL)
    err = SetFontInfoForSelection (kFontSelectionATSUIType, 0, NULL, target);
  else
    {
      if (font->mac_fontnum != -1)
	{
	  FontSelectionQDStyle qd_style;

	  qd_style.version = kFontSelectionQDStyleVersionZero;
	  qd_style.instance.fontFamily = font->mac_fontnum;
	  qd_style.instance.fontStyle = font->mac_fontface;
	  qd_style.size = font->mac_fontsize;
	  qd_style.hasColor = false;

	  err = SetFontInfoForSelection (kFontSelectionQDType,
					 1, &qd_style, target);
	}
      else
	err = SetFontInfoForSelection (kFontSelectionATSUIType,
				       1, &font->mac_style, target);
    }

  return err;
}
#endif

void remove_drag_handler P_ ((WindowRef));

#if USE_CARBON_EVENTS
#ifdef MAC_OSX
extern void init_service_handler ();
static Lisp_Object Qservice, Qpaste, Qperform;
#endif
/* Window Event Handler */
static pascal OSStatus mac_handle_window_event (EventHandlerCallRef,
						EventRef, void *);
#endif

}
#endif

#ifdef MAC_OSX
OSStatus
mac_store_service_event (event)
     EventRef event;
{
  OSStatus err;
  Lisp_Object id_key;
  int num_params;

    default:
      abort ();
    }

  err = mac_store_event_ref_as_apple_event (0, 0, Qservice, id_key,
					    event, num_params,
					    names, types);

  return err;
}

		inev.kind = MENU_BAR_ACTIVATE_EVENT;
		XSETFRAME (inev.frame_or_window, f);
		break;

	      case inContent:
		if (
#if TARGET_API_MAC_CARBON
		    FrontNonFloatingWindow ()
#else
		    FrontWindow ()
#endif
		    != window_ptr)
		  SelectWindow (window_ptr);
		else
		  {
		    ControlPartCode control_part_code;
		    ControlHandle ch;

#if USE_MAC_FONT_PANEL
  Qpanel_closed = intern ("panel-closed");  staticpro (&Qpanel_closed);
  Qselection    = intern ("selection");     staticpro (&Qselection);
#endif

  Qservice     = intern ("service");	  staticpro (&Qservice);
  Qpaste       = intern ("paste");	  staticpro (&Qpaste);
  Qperform     = intern ("perform");	  staticpro (&Qperform);
#endif
#endif