emacs: src/w32term.c comparison

comparison src/w32term.c @ 54171:f6909a416c3f

(w32_read_socket): Remove bufp_r and numcharsp args. Add hold_quit arg. Rework to use just one, local, inev input_event. Store inev directly in fifo using kbd_buffer_store_event_hold. Update count in one place. Postpone call to gen_help_event until inev is stored; use new local do_help for this. Remove local emacs_event in handing of ButtonPress event; just use inev instead (so no reason to copy it later).

author	Kim F. Storm <storm@cua.dk>
date	Fri, 27 Feb 2004 23:49:20 +0000
parents	8d0f80667054
children	61ba665b1e90 b44978264e1d

comparison

equal deleted inserted replaced

-:9f3ff0d515be
+:f6909a416c3f
 /* Read events coming from the W32 shell.
 This routine is called by the SIGIO handler.
 We return as soon as there are no more events to be read.
-Events representing keys are stored in buffer BUFP,
-which can hold up to NUMCHARS characters.
 We return the number of characters stored into the buffer,
 thus pretending to be `read'.
 EXPECTED is nonzero if the caller knows input is available.
 which message we are processing since the windows proc gets called
 recursively with different messages by the system.
 */
 int
-w32_read_socket (sd, bufp, numchars, expected)
+w32_read_socket (sd, expected, hold_quit)
 register int sd;
-/* register */ struct input_event *bufp;
-/* register */ int numchars;
 int expected;
+struct input_event *hold_quit;
 {
 int count = 0;
 int check_visibility = 0;
 W32Msg msg;
 struct frame *f;
 BLOCK_INPUT;
 /* So people can tell when we have read the available input.  */
 input_signal_count++;
-if (numchars <= 0)
-abort ();                   /* Don't think this happens. */
 /* TODO: tool-bars, ghostscript integration, mouse
 cursors. */
 while (get_next_msg (&msg, FALSE))
 {
+struct input_event inev;
+int do_help = 0;
+EVENT_INIT (inev);
+inev.kind = NO_EVENT;
+inev.arg = Qnil;
 switch (msg.msg.message)
 	{
 	case WM_PAINT:
 	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
 		  /* WM_PAINT serves as MapNotify as well, so report
 		     visibility changes properly.  */
 		  if (f->iconified)
 		    {
-		      bufp->kind = DEICONIFY_EVENT;
+		      inev.kind = DEICONIFY_EVENT;
-		      XSETFRAME (bufp->frame_or_window, f);
+		      XSETFRAME (inev.frame_or_window, f);
-		      bufp->arg = Qnil;
-		      bufp++;
-		      count++;
-		      numchars--;
 		    }
 		  else if (! NILP (Vframe_list)
 			   && ! NILP (XCDR (Vframe_list)))
 		    /* Force a redisplay sooner or later to update the
 		       frame titles in case this is the second frame.  */
 	  /* Generate a language change event.  */
 	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
 	  if (f)
 	    {
-	      if (numchars == 0)
+	      inev.kind = LANGUAGE_CHANGE_EVENT;
-		abort ();
+	      XSETFRAME (inev.frame_or_window, f);
+	      inev.code = msg.msg.wParam;
-	      bufp->kind = LANGUAGE_CHANGE_EVENT;
+	      inev.modifiers = msg.msg.lParam & 0xffff;
-	      XSETFRAME (bufp->frame_or_window, f);
-	      bufp->arg = Qnil;
-	      bufp->code = msg.msg.wParam;
-	      bufp->modifiers = msg.msg.lParam & 0xffff;
-	      bufp++;
-	      count++;
-	      numchars--;
 	    }
 	  break;
 	case WM_KEYDOWN:
 	case WM_SYSKEYDOWN:
 		}
 	      if (temp_index == sizeof temp_buffer / sizeof (short))
 		temp_index = 0;
 	      temp_buffer[temp_index++] = msg.msg.wParam;
-	      bufp->kind = NON_ASCII_KEYSTROKE_EVENT;
+	      inev.kind = NON_ASCII_KEYSTROKE_EVENT;
-	      bufp->code = msg.msg.wParam;
+	      inev.code = msg.msg.wParam;
-	      bufp->modifiers = msg.dwModifiers;
+	      inev.modifiers = msg.dwModifiers;
-	      XSETFRAME (bufp->frame_or_window, f);
+	      XSETFRAME (inev.frame_or_window, f);
-	      bufp->arg = Qnil;
+	      inev.timestamp = msg.msg.time;
-	      bufp->timestamp = msg.msg.time;
-	      bufp++;
-	      numchars--;
-	      count++;
 	    }
 	  break;
 	case WM_SYSCHAR:
 	case WM_CHAR:
 		}
 	      if (temp_index == sizeof temp_buffer / sizeof (short))
 		temp_index = 0;
 	      temp_buffer[temp_index++] = msg.msg.wParam;
-	      bufp->kind = ASCII_KEYSTROKE_EVENT;
+	      inev.kind = ASCII_KEYSTROKE_EVENT;
-	      bufp->code = msg.msg.wParam;
+	      inev.code = msg.msg.wParam;
-	      bufp->modifiers = msg.dwModifiers;
+	      inev.modifiers = msg.dwModifiers;
-	      XSETFRAME (bufp->frame_or_window, f);
+	      XSETFRAME (inev.frame_or_window, f);
-	      bufp->arg = Qnil;
+	      inev.timestamp = msg.msg.time;
-	      bufp->timestamp = msg.msg.time;
-	      bufp++;
-	      numchars--;
-	      count++;
 	    }
 	  break;
 	case WM_MOUSEMOVE:
 	  /* Ignore non-movement.  */
 		     selected now and last mouse movement event was
 		     not in it.  Minibuffer window will be selected
 		     iff it is active.  */
 		  if (WINDOWP(window)
 		      && !EQ (window, last_window)
-		      && !EQ (window, selected_window)
+		      && !EQ (window, selected_window))
-		      && numchars > 0)
 		    {
-		      bufp->kind = SELECT_WINDOW_EVENT;
+		      inev.kind = SELECT_WINDOW_EVENT;
-		      bufp->frame_or_window = window;
+		      inev.frame_or_window = window;
-		      bufp->arg = Qnil;
-		      ++bufp, ++count, --numchars;
 		    }
 		  last_window=window;
 		}
 	      note_mouse_movement (f, &msg.msg);
 /* If the contents of the global variable help_echo_string
 has changed, generate a HELP_EVENT.  */
 if (help_echo_string != previous_help_echo_string ||
 	      (!NILP (help_echo_string) && !STRINGP (help_echo_string) && f->mouse_moved))
-{
+	    do_help = 1;
-Lisp_Object frame;
-int n;
-	      if (help_echo_string == Qnil)
-		{
-		  help_echo_object = help_echo_window = Qnil;
-		  help_echo_pos = -1;
-		}
-if (f)
-XSETFRAME (frame, f);
-else
-frame = Qnil;
-any_help_event_p = 1;
-n = gen_help_event (bufp, numchars, help_echo_string, frame,
-				  help_echo_window, help_echo_object,
-				  help_echo_pos);
-bufp += n, count += n, numchars -= n;
-}
 break;
 	case WM_LBUTTONDOWN:
 	case WM_LBUTTONUP:
 	case WM_MBUTTONDOWN:
 	case WM_XBUTTONDOWN:
 	case WM_XBUTTONUP:
 	  {
 /* If we decide we want to generate an event to be seen
 by the rest of Emacs, we put it here.  */
-struct input_event emacs_event;
 int tool_bar_p = 0;
 	    int button;
 	    int up;
-emacs_event.kind = NO_EVENT;
 	    if (dpyinfo->grabbed && last_mouse_frame
 		&& FRAME_LIVE_P (last_mouse_frame))
 	      f = last_mouse_frame;
 	    else
 	      f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
 	    if (f)
 	      {
-construct_mouse_click (&emacs_event, &msg, f);
+construct_mouse_click (&inev, &msg, f);
 /* Is this in the tool-bar?  */
 if (WINDOWP (f->tool_bar_window)
 && WINDOW_TOTAL_LINES (XWINDOW (f->tool_bar_window)))
 {
 Lisp_Object window;
-		    int x = XFASTINT (emacs_event.x);
+		    int x = XFASTINT (inev.x);
-		    int y = XFASTINT (emacs_event.y);
+		    int y = XFASTINT (inev.y);
 window = window_from_coordinates (f, x, y, 0, 0, 0, 1);
 if (EQ (window, f->tool_bar_window))
 {
-w32_handle_tool_bar_click (f, &emacs_event);
+w32_handle_tool_bar_click (f, &inev);
 tool_bar_p = 1;
 }
 }
-if (!tool_bar_p)
+if (tool_bar_p
-if (!dpyinfo->w32_focus_frame
+		    || (dpyinfo->w32_focus_frame
-|| f == dpyinfo->w32_focus_frame
+			&& f == dpyinfo->w32_focus_frame))
-&& (numchars >= 1))
+		  inev.kind = NO_EVENT;
-{
-construct_mouse_click (bufp, &msg, f);
-bufp++;
-count++;
-numchars--;
-}
 	      }
 	    parse_button (msg.msg.message, HIWORD (msg.msg.wParam),
 			  &button, &up);
 	      f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
 	    if (f)
 	      {
-		if ((!dpyinfo->w32_focus_frame
+		if (!dpyinfo->w32_focus_frame
-		     || f == dpyinfo->w32_focus_frame)
+		    || f == dpyinfo->w32_focus_frame)
-		    && (numchars >= 1))
 		  {
 		    /* Emit an Emacs wheel-up/down event.  */
-		    construct_mouse_wheel (bufp, &msg, f);
+		    construct_mouse_wheel (&inev, &msg, f);
-		    bufp++;
-		    count++;
-		    numchars--;
 		  }
 		/* Ignore any mouse motion that happened before this
 		   event; any subsequent mouse-movement Emacs events
 		   should reflect only motion after the
 		   ButtonPress.	 */
 	case WM_DROPFILES:
 	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
 	  if (f)
-	    {
+	    construct_drag_n_drop (&inev, &msg, f);
-	      construct_drag_n_drop (bufp, &msg, f);
-	      bufp++;
-	      count++;
-	      numchars--;
-	    }
 	  break;
 	case WM_VSCROLL:
 	  {
 	    struct scroll_bar *bar =
 	      x_window_to_scroll_bar ((HWND)msg.msg.lParam);
-	    if (bar && numchars >= 1)
+	    if (bar)
-	      {
+	      w32_scroll_bar_handle_click (bar, &msg, &inev);
-		if (w32_scroll_bar_handle_click (bar, &msg, bufp))
-		  {
-		    bufp++;
-		    count++;
-		    numchars--;
-		  }
-	      }
 	    break;
 	  }
 	case WM_WINDOWPOSCHANGED:
 	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
 		{
 		case SIZE_MINIMIZED:
 		  f->async_visible = 0;
 		  f->async_iconified = 1;
-		  bufp->kind = ICONIFY_EVENT;
+		  inev.kind = ICONIFY_EVENT;
-		  XSETFRAME (bufp->frame_or_window, f);
+		  XSETFRAME (inev.frame_or_window, f);
-		  bufp->arg = Qnil;
-		  bufp++;
-		  count++;
-		  numchars--;
 		  break;
 		case SIZE_MAXIMIZED:
 		case SIZE_RESTORED:
 		  f->async_visible = 1;
 as the co-ords. */
 x_real_positions (f, &x, &y);
 f->left_pos = x;
 f->top_pos = y;
-		      bufp->kind = DEICONIFY_EVENT;
+		      inev.kind = DEICONIFY_EVENT;
-		      XSETFRAME (bufp->frame_or_window, f);
+		      XSETFRAME (inev.frame_or_window, f);
-		      bufp->arg = Qnil;
-		      bufp++;
-		      count++;
-		      numchars--;
 		    }
 		  else if (! NILP (Vframe_list)
 			   && ! NILP (XCDR (Vframe_list)))
 		    /* Force a redisplay sooner or later
 		       to update the frame titles
 	      /* Generate a nil HELP_EVENT to cancel a help-echo.
 		 Do it only if there's something to cancel.
 		 Otherwise, the startup message is cleared when
 		 the mouse leaves the frame.  */
 	      if (any_help_event_p)
-		{
+		do_help = -1;
-		  Lisp_Object frame;
-		  int n;
-		  XSETFRAME (frame, f);
-		  help_echo_string = Qnil;
-		  n = gen_help_event (bufp, numchars,
-				      Qnil, frame, Qnil, Qnil, 0);
-		  bufp += n, count += n, numchars -= n;
-		}
 	    }
 	  break;
 	case WM_SETFOCUS:
 	  /* TODO: Port this change:
 /* Generate a nil HELP_EVENT to cancel a help-echo.
 Do it only if there's something to cancel.
 Otherwise, the startup message is cleared when
 the mouse leaves the frame.  */
 if (any_help_event_p)
-{
+		do_help = -1;
-Lisp_Object frame;
-int n;
-XSETFRAME (frame, f);
-help_echo_string = Qnil;
-n = gen_help_event (bufp, numchars,
-Qnil, frame, Qnil, Qnil, 0);
-bufp += n, count += n, numchars -=n;
-}
 }
 	  dpyinfo->grabbed = 0;
 	  check_visibility = 1;
 	  break;
 	case WM_CLOSE:
 	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
 	  if (f)
 	    {
-	      if (numchars == 0)
+	      inev.kind = DELETE_WINDOW_EVENT;
-		abort ();
+	      XSETFRAME (inev.frame_or_window, f);
-	      bufp->kind = DELETE_WINDOW_EVENT;
-	      XSETFRAME (bufp->frame_or_window, f);
-	      bufp->arg = Qnil;
-	      bufp++;
-	      count++;
-	      numchars--;
 	    }
 	  break;
 	case WM_INITMENU:
 	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
 	  if (f)
 	    {
-	      if (numchars == 0)
+	      inev.kind = MENU_BAR_ACTIVATE_EVENT;
-		abort ();
+	      XSETFRAME (inev.frame_or_window, f);
-	      bufp->kind = MENU_BAR_ACTIVATE_EVENT;
-	      XSETFRAME (bufp->frame_or_window, f);
-	      bufp->arg = Qnil;
-	      bufp++;
-	      count++;
-	      numchars--;
 	    }
 	  break;
 	case WM_COMMAND:
 	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
 	      /* Forward MSH_MOUSEWHEEL as WM_MOUSEWHEEL.  */
 	      msg.msg.message = WM_MOUSEWHEEL;
 	      prepend_msg (&msg);
 	    }
 	  break;
+	}
+if (inev.kind != NO_EVENT)
+	{
+	  kbd_buffer_store_event_hold (&inev, hold_quit);
+	  count++;
+	}
+if (do_help
+	  && !(hold_quit && hold_quit->kind != NO_EVENT))
+	{
+	  Lisp_Object frame;
+	  if (f)
+	    XSETFRAME (frame, f);
+	  else
+	    frame = Qnil;
+	  if (do_help > 0)
+	    {
+	      if (help_echo_string == Qnil)
+		{
+		  help_echo_object = help_echo_window = Qnil;
+		  help_echo_pos = -1;
+		}
+	      any_help_event_p = 1;
+	      gen_help_event (help_echo_string, frame, help_echo_window,
+			      help_echo_object, help_echo_pos);
+	    }
+	  else
+	    {
+	      help_echo_string = Qnil;
+	      gen_help_event (Qnil, frame, Qnil, Qnil, 0);
+	    }
+	  count++;
 	}
 }
 /* If the focus was just given to an autoraising frame,
 raise it now.  */
 {
 /* If the user wants to use the system caret, make sure our own
 	 cursor remains invisible.  */
 if (w32_use_visible_system_caret)
 	{
+	  /* Call to erase_phys_cursor here seems to use the
+	     wrong values of w->phys_cursor, as they have been
+	     overwritten before this function was called. */
 	  if (w->phys_cursor_type != NO_CURSOR)
 	    erase_phys_cursor (w);
 	  cursor_type = w->phys_cursor_type = NO_CURSOR;
 	  w->phys_cursor_width = -1;

Mercurial > emacs

comparison src/w32term.c @ 54171:f6909a416c3f