comparison src/macterm.c @ 81656:fb6a1213c5e8

[USE_MAC_TSM] (mac_handle_text_input_event): Check WINDOWP before using XWINDOW. Consolidate return statements.

81655:170a5ecefd82

mac_handle_text_input_event (next_handler, event, data)
     EventHandlerCallRef next_handler;
     EventRef event;
     void *data;
{
  OSStatus result, err = noErr;
  Lisp_Object id_key = Qnil;
  int num_params;
  const EventParamName *names;
  const EventParamType *types;
  static UInt32 seqno_uaia = 0;

      names = names_uaia;
      types = types_uaia;
      SetEventParameter (event, EVENT_PARAM_TEXT_INPUT_SEQUENCE_NUMBER,
			 typeUInt32, sizeof (UInt32), &seqno_uaia);
      seqno_uaia++;
      break;

    case kEventTextInputUnicodeForKeyEvent:
      {
	EventRef kbd_event;

				   typeUInt32, NULL,
				   sizeof (UInt32), NULL, &modifiers);
	if (err == noErr && mac_mapped_modifiers (modifiers))
	  /* There're mapped modifier keys.  Process it in
	     do_keystroke.  */
	  return eventNotHandledErr;
	if (err == noErr)
	  err = GetEventParameter (kbd_event, kEventParamKeyUnicodes,
				   typeUnicodeText, NULL, 0, &actual_size,
				   NULL);
	if (err == noErr && actual_size == sizeof (UniChar))

			   & (meta_modifier | alt_modifier
			      | hyper_modifier | super_modifier));
			XSETFRAME (read_socket_inev->frame_or_window, f);
		      }
		  }
		return eventNotHandledErr;
	      }
	  }
      }
      /* Non-ASCII keystrokes without mapped modifiers are processed
	 at the Lisp level.  */
      id_key = Qunicode_for_key_event;
      num_params = sizeof (names_ufke) / sizeof (names_ufke[0]);
      names = names_ufke;
      types = types_ufke;
      break;

    case kEventTextInputOffsetToPos:
      {
	struct frame *f;
	struct window *w;
	Point p;

	if (!OVERLAYP (Vmac_ts_active_input_overlay))
	  return eventNotHandledErr;

	/* Strictly speaking, this is not always correct because
	   previous events may change some states about display.  */
	if (NILP (Foverlay_get (Vmac_ts_active_input_overlay, Qbefore_string)))
	  {
	    /* Active input area is displayed in the echo area.  */
	    w = XWINDOW (echo_area_window);
	    f = WINDOW_XFRAME (w);
	  }
	else
	  {
	    /* Active input area is displayed around the current point.  */
	    f = SELECTED_FRAME ();
	    w = XWINDOW (f->selected_window);
	  }

	p.h = (WINDOW_TO_FRAME_PIXEL_X (w, w->cursor.x)
	       + WINDOW_LEFT_FRINGE_WIDTH (w)
	       + f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f));
	p.v = (WINDOW_TO_FRAME_PIXEL_Y (w, w->cursor.y)
	       + FONT_BASE (FRAME_FONT (f))
	       + f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f));
	err = SetEventParameter (event, kEventParamTextInputReplyPoint,
				 typeQDPoint, sizeof (typeQDPoint), &p);
      }
      break;

    default:
      abort ();

  if (!NILP (id_key))
    err = mac_store_event_ref_as_apple_event (0, 0, Qtext_input, id_key,
					      event, num_params,
					      names, types);
  if (err == noErr)
    result = noErr;

  return result;
}
#endif
#endif	/* TARGET_API_MAC_CARBON */

81656:fb6a1213c5e8

mac_handle_text_input_event (next_handler, event, data)
     EventHandlerCallRef next_handler;
     EventRef event;
     void *data;
{
  OSStatus err, result;
  Lisp_Object id_key = Qnil;
  int num_params;
  const EventParamName *names;
  const EventParamType *types;
  static UInt32 seqno_uaia = 0;

      names = names_uaia;
      types = types_uaia;
      SetEventParameter (event, EVENT_PARAM_TEXT_INPUT_SEQUENCE_NUMBER,
			 typeUInt32, sizeof (UInt32), &seqno_uaia);
      seqno_uaia++;
      result = noErr;
      break;

    case kEventTextInputUnicodeForKeyEvent:
      {
	EventRef kbd_event;

				   typeUInt32, NULL,
				   sizeof (UInt32), NULL, &modifiers);
	if (err == noErr && mac_mapped_modifiers (modifiers))
	  /* There're mapped modifier keys.  Process it in
	     do_keystroke.  */
	  break;
	if (err == noErr)
	  err = GetEventParameter (kbd_event, kEventParamKeyUnicodes,
				   typeUnicodeText, NULL, 0, &actual_size,
				   NULL);
	if (err == noErr && actual_size == sizeof (UniChar))

			   & (meta_modifier | alt_modifier
			      | hyper_modifier | super_modifier));
			XSETFRAME (read_socket_inev->frame_or_window, f);
		      }
		  }
		break;
	      }
	  }
	if (err == noErr)
	  {
	    /* Non-ASCII keystrokes without mapped modifiers are
	       processed at the Lisp level.  */
	    id_key = Qunicode_for_key_event;
	    num_params = sizeof (names_ufke) / sizeof (names_ufke[0]);
	    names = names_ufke;
	    types = types_ufke;
	    result = noErr;
	  }
      }
      break;

    case kEventTextInputOffsetToPos:
      {
	struct frame *f;
	struct window *w;
	Point p;

	if (!OVERLAYP (Vmac_ts_active_input_overlay))
	  break;

	/* Strictly speaking, this is not always correct because
	   previous events may change some states about display.  */
	if (!NILP (Foverlay_get (Vmac_ts_active_input_overlay, Qbefore_string)))
	  {
	    /* Active input area is displayed around the current point.  */
	    f = SELECTED_FRAME ();
	    w = XWINDOW (f->selected_window);
	  }
	else if (WINDOWP (echo_area_window))
	  {
	    /* Active input area is displayed in the echo area.  */
	    w = XWINDOW (echo_area_window);
	    f = WINDOW_XFRAME (w);
	  }
	else
	  break;

	p.h = (WINDOW_TO_FRAME_PIXEL_X (w, w->cursor.x)
	       + WINDOW_LEFT_FRINGE_WIDTH (w)
	       + f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f));
	p.v = (WINDOW_TO_FRAME_PIXEL_Y (w, w->cursor.y)
	       + FONT_BASE (FRAME_FONT (f))
	       + f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f));
	err = SetEventParameter (event, kEventParamTextInputReplyPoint,
				 typeQDPoint, sizeof (typeQDPoint), &p);
	if (err == noErr)
	  result = noErr;
      }
      break;

    default:
      abort ();

  if (!NILP (id_key))
    err = mac_store_event_ref_as_apple_event (0, 0, Qtext_input, id_key,
					      event, num_params,
					      names, types);
  return result;
}
#endif
#endif	/* TARGET_API_MAC_CARBON */