comparison src/macterm.c @ 83067:b44978264e1d

Merged in changes from CVS HEAD Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-118 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-119 src/keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-120 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-107

83066:887bb2eb4a89

}

/* Emacs calls this whenever it wants to read an input event from the
   user. */
int
XTread_socket (struct input_event *bufp, int numchars, int expected)
{
  int count = 0;
#if USE_CARBON_EVENTS
  OSStatus rneResult;
  EventRef eventRef;
  EventMouseButton mouseBtn;

  interrupt_input_pending = 0;
  BLOCK_INPUT;

  /* So people can tell when we have read the available input.  */
  input_signal_count++;

  if (numchars <= 0)
    abort ();

  /* Don't poll for events to process (specifically updateEvt) if
     window update currently already in progress.  A call to redisplay
     (in do_window_update) can be preempted by another call to
     redisplay, causing blank regions to be left on the screen and the

  /* It is necessary to set this (additional) argument slot of an
     event to nil because keyboard.c protects incompletely processed
     event from being garbage collected by placing them in the
     kbd_buffer_gcpro vector.  */
  bufp->arg = Qnil;

  event_mask = everyEvent;
  if (NILP (Fboundp (Qmac_ready_for_drag_n_drop)))
    event_mask -= highLevelEventMask;

				  typeSInt32, NULL, sizeof (SInt32),
				  NULL, &delta);
		GetEventParameter(eventRef, kEventParamMouseLocation,
				  typeQDPoint, NULL, sizeof (Point),
				  NULL, &point);
		bufp->kind = WHEEL_EVENT;
		bufp->code = 0;
		bufp->modifiers = (mac_event_to_emacs_modifiers(eventRef)
				   | ((delta < 0) ? down_modifier
				                  : up_modifier));
		SetPort (GetWindowPort (window_ptr));
		GlobalToLocal (&point);
		XSETINT (bufp->x, point.h);
		XSETINT (bufp->y, point.v);
		XSETFRAME (bufp->frame_or_window, mwp->mFP);
		bufp->timestamp = EventTimeToTicks (GetEventTime (eventRef))*(1000/60);
		count++;
	      }
	    else
	      SendEventToEventTarget (eventRef, GetEventDispatcherTarget ());

	    break;

#endif

	      GlobalToLocal (&mouse_loc);

#if USE_CARBON_EVENTS
	      bufp->code = mac_get_mouse_btn (eventRef);
#else
	      bufp_.code = mac_get_emulate_btn (er.modifiers);
#endif
              bufp->kind = SCROLL_BAR_CLICK_EVENT;
              bufp->frame_or_window = tracked_scroll_bar->window;
              bufp->part = scroll_bar_handle;
#if USE_CARBON_EVENTS
	      bufp->modifiers = mac_event_to_emacs_modifiers (eventRef);
#else
	      bufp->modifiers = mac_to_emacs_modifiers (er.modifiers);
#endif
              bufp->modifiers |= up_modifier;
	      bufp->timestamp = er.when * (1000 / 60);
	        /* ticks to milliseconds */

              XSETINT (bufp->x, tracked_scroll_bar->left + 2);
              XSETINT (bufp->y, mouse_loc.v - 24);
              tracked_scroll_bar->dragging = Qnil;
              mouse_tracking_in_progress = mouse_tracking_none;
              tracked_scroll_bar = NULL;
              count++;
              break;
            }

	  part_code = FindWindow (er.where, &window_ptr);

	      if (er.what == mouseDown)  
		{
		  struct frame *f = ((mac_output *)
				     GetWRefCon (FrontWindow ()))->mFP;
		  saved_menu_event_location = er.where;
		  bufp->kind = MENU_BAR_ACTIVATE_EVENT;
		  XSETFRAME (bufp->frame_or_window, f);
		  count++;
		}
	      break;

	    case inContent:
	      if (window_ptr != FrontWindow ())

#else
		  control_part_code = FindControl (mouse_loc, window_ptr, &ch);
#endif

#if USE_CARBON_EVENTS
		  bufp->code = mac_get_mouse_btn (eventRef);
#else
		  bufp_.code = mac_get_emulate_btn (er.modifiers);
#endif
		  XSETINT (bufp->x, mouse_loc.h);
		  XSETINT (bufp->y, mouse_loc.v);
		  bufp->timestamp = er.when * (1000 / 60);
		    /* ticks to milliseconds */

#if TARGET_API_MAC_CARBON
		  if (ch != 0)
#else

#endif
		    {
		      struct scroll_bar *bar = (struct scroll_bar *)
			GetControlReference (ch);
		      x_scroll_bar_handle_click (bar, control_part_code, &er,
						 bufp);
		      if (er.what == mouseDown
			  && control_part_code == kControlIndicatorPart)
		        {
		          mouse_tracking_in_progress
			    = mouse_tracking_scroll_bar;

		        }
		    }
		  else
	            {
		      Lisp_Object window;
		      
		      bufp->kind = MOUSE_CLICK_EVENT;
		      XSETFRAME (bufp->frame_or_window, mwp->mFP);
		      if (er.what == mouseDown)
			mouse_tracking_in_progress
			  = mouse_tracking_mouse_movement;
		      else
			mouse_tracking_in_progress = mouse_tracking_none;
		      window = window_from_coordinates (mwp->mFP, bufp->x, bufp->y, 0, 0, 0, 1);
		      
		      if (EQ (window, mwp->mFP->tool_bar_window))
			{
			  if (er.what == mouseDown)
			    handle_tool_bar_click (mwp->mFP, bufp->x, bufp->y, 1, 0);
			  else
			    handle_tool_bar_click (mwp->mFP, bufp->x, bufp->y, 0,
#if USE_CARBON_EVENTS
						   mac_event_to_emacs_modifiers (eventRef)
#else
						   er.modifiers
#endif

			  break;
			}
		    }

#if USE_CARBON_EVENTS
		  bufp->modifiers = mac_event_to_emacs_modifiers (eventRef);
#else
		  bufp->modifiers = mac_to_emacs_modifiers (er.modifiers);
#endif

	          switch (er.what)
		    {
		    case mouseDown:
		      bufp->modifiers |= down_modifier;
		      break;
		    case mouseUp:
		      bufp->modifiers |= up_modifier;
		      break;
		    }

	          count++;
	        }
	      break;

	    case inDrag:
#if TARGET_API_MAC_CARBON

	      break;

	    case inGoAway:
	      if (TrackGoAway (window_ptr, er.where))
	        {
	          bufp->kind = DELETE_WINDOW_EVENT;
	          XSETFRAME (bufp->frame_or_window,
			     ((mac_output *) GetWRefCon (window_ptr))->mFP);
 	          count++;
	        }
	      break;

	    /* window resize handling added --ben */
	    case inGrow:

	  ObscureCursor ();

	  if (keycode_to_xkeysym (keycode, &xkeysym))
	    {
	      bufp->code = 0xff00 | xkeysym;
	      bufp->kind = NON_ASCII_KEYSTROKE_EVENT;
	    }
	  else
	    {
	      if (er.modifiers & (controlKey |
				  (NILP (Vmac_command_key_is_meta) ? optionKey

		  int new_modifiers = er.modifiers & 0xe600;
		  /* mask off option and command */
		  int new_keycode = keycode | new_modifiers;
		  Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache);
		  unsigned long some_state = 0;
		  bufp->code = KeyTranslate (kchr_ptr, new_keycode,
					     &some_state) & 0xff;
		}
	      else
		bufp->code = er.message & charCodeMask;
	      bufp->kind = ASCII_KEYSTROKE_EVENT;
	    }
	}

	/* If variable mac-convert-keyboard-input-to-latin-1 is non-nil,
	   convert non-ASCII characters typed at the Mac keyboard
	   (presumed to be in the Mac Roman encoding) to iso-latin-1
	   encoding before they are passed to Emacs.  This enables the
	   Mac keyboard to be used to enter non-ASCII iso-latin-1
	   characters directly.  */
	if (mac_keyboard_text_encoding != kTextEncodingMacRoman
	    && bufp->kind == ASCII_KEYSTROKE_EVENT && bufp->code >= 128)
	  {
	    static TECObjectRef converter = NULL;
	    OSStatus the_err = noErr;
	    OSStatus convert_status = noErr;

		  = mac_keyboard_text_encoding;
	      }

	    if (the_err == noErr)
	      {
		unsigned char ch = bufp->code;
		ByteCount actual_input_length, actual_output_length;
		unsigned char outch;

		convert_status = TECConvertText (converter, &ch, 1,
						 &actual_input_length,
						 &outch, 1,
						 &actual_output_length);
		if (convert_status == noErr
		    && actual_input_length == 1
		    && actual_output_length == 1)
		  bufp->code = outch;
	      }
	  }

#if USE_CARBON_EVENTS
	bufp->modifiers = mac_event_to_emacs_modifiers (eventRef);
#else
	bufp->modifiers = mac_to_emacs_modifiers (er.modifiers);
#endif

	{
	  mac_output *mwp
	    = (mac_output *) GetWRefCon (FrontNonFloatingWindow ());
	  XSETFRAME (bufp->frame_or_window, mwp->mFP);
	}

	bufp->timestamp = er.when * (1000 / 60);  /* ticks to milliseconds */

	count++;
	break;

      case kHighLevelEvent:
        drag_and_drop_file_list = Qnil;

	      }

            if (wp && is_emacs_window(wp))
	        f = ((mac_output *) GetWRefCon (wp))->mFP;

            bufp->kind = DRAG_N_DROP_EVENT;
            bufp->code = 0;
            bufp->timestamp = er.when * (1000 / 60);
	      /* ticks to milliseconds */
#if USE_CARBON_EVENTS
	    bufp->modifiers = mac_event_to_emacs_modifiers (eventRef);
#else
	    bufp->modifiers = mac_to_emacs_modifiers (er.modifiers);
#endif

            XSETINT (bufp->x, 0);
            XSETINT (bufp->y, 0);

            XSETFRAME (frame, f);
            bufp->frame_or_window = Fcons (frame, drag_and_drop_file_list);

            /* Regardless of whether Emacs was suspended or in the
               foreground, ask it to redraw its entire screen.
               Otherwise parts of the screen can be left in an
               inconsistent state.  */

	        InvalWindowRect (wp, &r);
	      }
#else /* not TARGET_API_MAC_CARBON */
              InvalRect (&(wp->portRect));
#endif /* not TARGET_API_MAC_CARBON */

            count++;
          }
      default:
	break;
      }
#if USE_CARBON_EVENTS

	      }
	  }
      }
  }

  UNBLOCK_INPUT;

  return count;
}


/* Need to override CodeWarrior's input function so no conversion is

83067:b44978264e1d

}

/* Emacs calls this whenever it wants to read an input event from the
   user. */
int
XTread_socket (int sd, int expected, struct input_event *hold_quit)
{
  struct input_event inev;
  int count = 0;
#if USE_CARBON_EVENTS
  OSStatus rneResult;
  EventRef eventRef;
  EventMouseButton mouseBtn;

  interrupt_input_pending = 0;
  BLOCK_INPUT;

  /* So people can tell when we have read the available input.  */
  input_signal_count++;

  /* Don't poll for events to process (specifically updateEvt) if
     window update currently already in progress.  A call to redisplay
     (in do_window_update) can be preempted by another call to
     redisplay, causing blank regions to be left on the screen and the

  /* It is necessary to set this (additional) argument slot of an
     event to nil because keyboard.c protects incompletely processed
     event from being garbage collected by placing them in the
     kbd_buffer_gcpro vector.  */
  EVENT_INIT (inev);
  inev.kind = NO_EVENT;
  inev.arg = Qnil;

  event_mask = everyEvent;
  if (NILP (Fboundp (Qmac_ready_for_drag_n_drop)))
    event_mask -= highLevelEventMask;

				  typeSInt32, NULL, sizeof (SInt32),
				  NULL, &delta);
		GetEventParameter(eventRef, kEventParamMouseLocation,
				  typeQDPoint, NULL, sizeof (Point),
				  NULL, &point);
		inev.kind = WHEEL_EVENT;
		inev.code = 0;
		inev.modifiers = (mac_event_to_emacs_modifiers(eventRef)
				  | ((delta < 0) ? down_modifier
				     : up_modifier));
		SetPort (GetWindowPort (window_ptr));
		GlobalToLocal (&point);
		XSETINT (inev.x, point.h);
		XSETINT (inev.y, point.v);
		XSETFRAME (inev.frame_or_window, mwp->mFP);
		inev.timestamp = EventTimeToTicks (GetEventTime (eventRef))*(1000/60);
	      }
	    else
	      SendEventToEventTarget (eventRef, GetEventDispatcherTarget ());

	    break;

#endif

	      GlobalToLocal (&mouse_loc);

#if USE_CARBON_EVENTS
	      inev.code = mac_get_mouse_btn (eventRef);
#else
	      inev.code = mac_get_emulate_btn (er.modifiers);
#endif
              inev.kind = SCROLL_BAR_CLICK_EVENT;
              inev.frame_or_window = tracked_scroll_bar->window;
              inev.part = scroll_bar_handle;
#if USE_CARBON_EVENTS
	      inev.modifiers = mac_event_to_emacs_modifiers (eventRef);
#else
	      inev.modifiers = mac_to_emacs_modifiers (er.modifiers);
#endif
              inev.modifiers |= up_modifier;
	      inev.timestamp = er.when * (1000 / 60);
	        /* ticks to milliseconds */

              XSETINT (inev.x, tracked_scroll_bar->left + 2);
              XSETINT (inev.y, mouse_loc.v - 24);
              tracked_scroll_bar->dragging = Qnil;
              mouse_tracking_in_progress = mouse_tracking_none;
              tracked_scroll_bar = NULL;
              break;
            }

	  part_code = FindWindow (er.where, &window_ptr);

	      if (er.what == mouseDown)  
		{
		  struct frame *f = ((mac_output *)
				     GetWRefCon (FrontWindow ()))->mFP;
		  saved_menu_event_location = er.where;
		  inev.kind = MENU_BAR_ACTIVATE_EVENT;
		  XSETFRAME (inev.frame_or_window, f);
		}
	      break;

	    case inContent:
	      if (window_ptr != FrontWindow ())

#else
		  control_part_code = FindControl (mouse_loc, window_ptr, &ch);
#endif

#if USE_CARBON_EVENTS
		  inev.code = mac_get_mouse_btn (eventRef);
#else
		  inev.code = mac_get_emulate_btn (er.modifiers);
#endif
		  XSETINT (inev.x, mouse_loc.h);
		  XSETINT (inev.y, mouse_loc.v);
		  inev.timestamp = er.when * (1000 / 60);
		    /* ticks to milliseconds */

#if TARGET_API_MAC_CARBON
		  if (ch != 0)
#else

#endif
		    {
		      struct scroll_bar *bar = (struct scroll_bar *)
			GetControlReference (ch);
		      x_scroll_bar_handle_click (bar, control_part_code, &er,
						 &inev);
		      if (er.what == mouseDown
			  && control_part_code == kControlIndicatorPart)
		        {
		          mouse_tracking_in_progress
			    = mouse_tracking_scroll_bar;

		        }
		    }
		  else
	            {
		      Lisp_Object window;

	              inev.kind = MOUSE_CLICK_EVENT;
		      XSETFRAME (inev.frame_or_window, mwp->mFP);
		      if (er.what == mouseDown)
			mouse_tracking_in_progress
			  = mouse_tracking_mouse_movement;
		      else
			mouse_tracking_in_progress = mouse_tracking_none;
		      window = window_from_coordinates (mwp->mFP, inev.x, inev.y, 0, 0, 0, 1);
		      
		      if (EQ (window, mwp->mFP->tool_bar_window))
			{
			  if (er.what == mouseDown)
			    handle_tool_bar_click (mwp->mFP, inev.x, inev.y, 1, 0);
			  else
			    handle_tool_bar_click (mwp->mFP, inev.x, inev.y, 0,
#if USE_CARBON_EVENTS
						   mac_event_to_emacs_modifiers (eventRef)
#else
						   er.modifiers
#endif

			  break;
			}
		    }

#if USE_CARBON_EVENTS
		  inev.modifiers = mac_event_to_emacs_modifiers (eventRef);
#else
		  inev.modifiers = mac_to_emacs_modifiers (er.modifiers);
#endif

	          switch (er.what)
		    {
		    case mouseDown:
		      inev.modifiers |= down_modifier;
		      break;
		    case mouseUp:
		      inev.modifiers |= up_modifier;
		      break;
		    }
	        }
	      break;

	    case inDrag:
#if TARGET_API_MAC_CARBON

	      break;

	    case inGoAway:
	      if (TrackGoAway (window_ptr, er.where))
	        {
	          inev.kind = DELETE_WINDOW_EVENT;
	          XSETFRAME (inev.frame_or_window,
			     ((mac_output *) GetWRefCon (window_ptr))->mFP);
	        }
	      break;

	    /* window resize handling added --ben */
	    case inGrow:

	  ObscureCursor ();

	  if (keycode_to_xkeysym (keycode, &xkeysym))
	    {
	      inev.code = 0xff00 | xkeysym;
	      inev.kind = NON_ASCII_KEYSTROKE_EVENT;
	    }
	  else
	    {
	      if (er.modifiers & (controlKey |
				  (NILP (Vmac_command_key_is_meta) ? optionKey

		  int new_modifiers = er.modifiers & 0xe600;
		  /* mask off option and command */
		  int new_keycode = keycode | new_modifiers;
		  Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache);
		  unsigned long some_state = 0;
		  inev.code = KeyTranslate (kchr_ptr, new_keycode,
					    &some_state) & 0xff;
		}
	      else
		inev.code = er.message & charCodeMask;
	      inev.kind = ASCII_KEYSTROKE_EVENT;
	    }
	}

	/* If variable mac-convert-keyboard-input-to-latin-1 is non-nil,
	   convert non-ASCII characters typed at the Mac keyboard
	   (presumed to be in the Mac Roman encoding) to iso-latin-1
	   encoding before they are passed to Emacs.  This enables the
	   Mac keyboard to be used to enter non-ASCII iso-latin-1
	   characters directly.  */
	if (mac_keyboard_text_encoding != kTextEncodingMacRoman
	    && inev.kind == ASCII_KEYSTROKE_EVENT && inev.code >= 128)
	  {
	    static TECObjectRef converter = NULL;
	    OSStatus the_err = noErr;
	    OSStatus convert_status = noErr;

		  = mac_keyboard_text_encoding;
	      }

	    if (the_err == noErr)
	      {
		unsigned char ch = inev.code;
		ByteCount actual_input_length, actual_output_length;
		unsigned char outch;

		convert_status = TECConvertText (converter, &ch, 1,
						 &actual_input_length,
						 &outch, 1,
						 &actual_output_length);
		if (convert_status == noErr
		    && actual_input_length == 1
		    && actual_output_length == 1)
		  inev.code = outch;
	      }
	  }

#if USE_CARBON_EVENTS
	inev.modifiers = mac_event_to_emacs_modifiers (eventRef);
#else
	inev.modifiers = mac_to_emacs_modifiers (er.modifiers);
#endif

	{
	  mac_output *mwp
	    = (mac_output *) GetWRefCon (FrontNonFloatingWindow ());
	  XSETFRAME (inev.frame_or_window, mwp->mFP);
	}

	inev.timestamp = er.when * (1000 / 60);  /* ticks to milliseconds */
	break;

      case kHighLevelEvent:
        drag_and_drop_file_list = Qnil;

	      }

            if (wp && is_emacs_window(wp))
	        f = ((mac_output *) GetWRefCon (wp))->mFP;

            inev.kind = DRAG_N_DROP_EVENT;
            inev.code = 0;
            inev.timestamp = er.when * (1000 / 60);
	      /* ticks to milliseconds */
#if USE_CARBON_EVENTS
	    inev.modifiers = mac_event_to_emacs_modifiers (eventRef);
#else
	    inev.modifiers = mac_to_emacs_modifiers (er.modifiers);
#endif

            XSETINT (inev.x, 0);
            XSETINT (inev.y, 0);

            XSETFRAME (frame, f);
            inev.frame_or_window = Fcons (frame, drag_and_drop_file_list);

            /* Regardless of whether Emacs was suspended or in the
               foreground, ask it to redraw its entire screen.
               Otherwise parts of the screen can be left in an
               inconsistent state.  */

	        InvalWindowRect (wp, &r);
	      }
#else /* not TARGET_API_MAC_CARBON */
              InvalRect (&(wp->portRect));
#endif /* not TARGET_API_MAC_CARBON */
          }
      default:
	break;
      }
#if USE_CARBON_EVENTS

	      }
	  }
      }
  }

  if (inev.kind != NO_EVENT)
    {
      kbd_buffer_store_event_hold (&inev, hold_quit);
      count++;
    }

  UNBLOCK_INPUT;
  return count;
}


/* Need to override CodeWarrior's input function so no conversion is