comparison src/keyboard.c @ 54087:5a946bc3433a

Fix whitespace.

54086:86e93d3ccc6e

	}
      else if (part == ON_LEFT_MARGIN || part == ON_RIGHT_MARGIN)
	{
	  Lisp_Object string;
	  int charpos;
	  
	  posn = (part == ON_LEFT_MARGIN) ? Qleft_margin : Qright_margin;
	  rx = wx, ry = wy;
	  string = marginal_area_string (w, part, &rx, &ry, &charpos,
					 &object, &dx, &dy, &width, &height);
	  if (STRINGP (string))

    case WHEEL_EVENT:
      {
	Lisp_Object position;
	Lisp_Object head;
	
	/* Build the position as appropriate for this mouse click.  */
	struct frame *f = XFRAME (event->frame_or_window);

	/* Ignore wheel events that were made on frame that have been
	   deleted.  */

   Typically, there are just a few available input events to be read
   here, so we really don't need to allocate and initialize a big
   buffer of input_events as we used to do.  Instead, we just allocate
   a small buffer of input events -- and then poll for more input if we
   read a full buffer of input events.  */
#define NREAD_INPUT_EVENTS 8

static int
read_avail_input (expected)
     int expected;

  if (read_socket_hook)
    {
      int discard = 0;
      int nr;

      
      do {
	struct input_event buf[NREAD_INPUT_EVENTS];

	for (i = 0; i < NREAD_INPUT_EVENTS; i++)
	  EVENT_INIT (buf[i]);

	    cbuf[i] &= ~0x80;

	  buf.code = cbuf[i];
	  buf.frame_or_window = selected_frame;
	  buf.arg = Qnil;
	  
	  kbd_buffer_store_event (&buf);
	  /* Don't look at input that follows a C-g too closely.
	     This reduces lossage due to autorepeat on C-g.  */
	  if (buf.kind == ASCII_KEYSTROKE_EVENT
	      && buf.code == quit_char)

access_keymap_keyremap (map, key, prompt, do_funcall)
     Lisp_Object map, key, prompt;
     int do_funcall;
{
  Lisp_Object next;
  
  next = access_keymap (map, key, 1, 0, 1);

  /* Handle symbol with autoload definition.  */
  if (SYMBOLP (next) && !NILP (Ffboundp (next))
      && CONSP (XSYMBOL (next)->function)

     or an array.  */
  if (SYMBOLP (next) && !NILP (Ffboundp (next))
      && (!NILP (Farrayp (XSYMBOL (next)->function))
	  || KEYMAPP (XSYMBOL (next)->function)))
    next = XSYMBOL (next)->function;
	    
  /* If the keymap gives a function, not an
     array, then call the function with one arg and use
     its value instead.  */
  if (SYMBOLP (next) && !NILP (Ffboundp (next)) && do_funcall)
    {

	    {
	      mock_input = diff + max (t, mock_input);
	      /* Adjust the function-key-map counters.  */
	      fkey.end += diff;
	      fkey.start += diff;
	      
	      goto replay_sequence;
	    }
	}

      /* If KEY is not defined in any of the keymaps,

  initial_define_lispy_key (Vspecial_event_map, "make-frame-visible",
			    "ignore-event");
  /* Handling it at such a low-level causes read_key_sequence to get
   * confused because it doesn't realize that the current_buffer was
   * changed by read_char.
   * 
   * initial_define_lispy_key (Vspecial_event_map, "select-window",
   * 			    "handle-select-window"); */
  initial_define_lispy_key (Vspecial_event_map, "save-session",
			    "handle-save-session");
}

54087:5a946bc3433a

	}
      else if (part == ON_LEFT_MARGIN || part == ON_RIGHT_MARGIN)
	{
	  Lisp_Object string;
	  int charpos;

	  posn = (part == ON_LEFT_MARGIN) ? Qleft_margin : Qright_margin;
	  rx = wx, ry = wy;
	  string = marginal_area_string (w, part, &rx, &ry, &charpos,
					 &object, &dx, &dy, &width, &height);
	  if (STRINGP (string))

    case WHEEL_EVENT:
      {
	Lisp_Object position;
	Lisp_Object head;

	/* Build the position as appropriate for this mouse click.  */
	struct frame *f = XFRAME (event->frame_or_window);

	/* Ignore wheel events that were made on frame that have been
	   deleted.  */

   Typically, there are just a few available input events to be read
   here, so we really don't need to allocate and initialize a big
   buffer of input_events as we used to do.  Instead, we just allocate
   a small buffer of input events -- and then poll for more input if we
   read a full buffer of input events.  */

#define NREAD_INPUT_EVENTS 8

static int
read_avail_input (expected)
     int expected;

  if (read_socket_hook)
    {
      int discard = 0;
      int nr;

      do {
	struct input_event buf[NREAD_INPUT_EVENTS];

	for (i = 0; i < NREAD_INPUT_EVENTS; i++)
	  EVENT_INIT (buf[i]);

	    cbuf[i] &= ~0x80;

	  buf.code = cbuf[i];
	  buf.frame_or_window = selected_frame;
	  buf.arg = Qnil;

	  kbd_buffer_store_event (&buf);
	  /* Don't look at input that follows a C-g too closely.
	     This reduces lossage due to autorepeat on C-g.  */
	  if (buf.kind == ASCII_KEYSTROKE_EVENT
	      && buf.code == quit_char)

access_keymap_keyremap (map, key, prompt, do_funcall)
     Lisp_Object map, key, prompt;
     int do_funcall;
{
  Lisp_Object next;

  next = access_keymap (map, key, 1, 0, 1);

  /* Handle symbol with autoload definition.  */
  if (SYMBOLP (next) && !NILP (Ffboundp (next))
      && CONSP (XSYMBOL (next)->function)

     or an array.  */
  if (SYMBOLP (next) && !NILP (Ffboundp (next))
      && (!NILP (Farrayp (XSYMBOL (next)->function))
	  || KEYMAPP (XSYMBOL (next)->function)))
    next = XSYMBOL (next)->function;

  /* If the keymap gives a function, not an
     array, then call the function with one arg and use
     its value instead.  */
  if (SYMBOLP (next) && !NILP (Ffboundp (next)) && do_funcall)
    {

	    {
	      mock_input = diff + max (t, mock_input);
	      /* Adjust the function-key-map counters.  */
	      fkey.end += diff;
	      fkey.start += diff;

	      goto replay_sequence;
	    }
	}

      /* If KEY is not defined in any of the keymaps,

  initial_define_lispy_key (Vspecial_event_map, "make-frame-visible",
			    "ignore-event");
  /* Handling it at such a low-level causes read_key_sequence to get
   * confused because it doesn't realize that the current_buffer was
   * changed by read_char.
   *
   * initial_define_lispy_key (Vspecial_event_map, "select-window",
   * 			    "handle-select-window"); */
  initial_define_lispy_key (Vspecial_event_map, "save-session",
			    "handle-save-session");
}