Minor cleanup in w32inevt.c

* src/w32inevt.c (w32_console_mouse_position, mouse_moved_to)
(do_mouse_event): Use 'get_frame' to obtain the frame pointer.

diff --git a/src/w32inevt.c b/src/w32inevt.c
index 894bc3ab089df12fe8530a6631bb6e9441854ad7..4cc01d31c942dcaa951615e7552d07a9c10f3dbc 100644 (file)
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -420,7 +420,7 @@ w32_console_mouse_position (struct frame **f,
   *f = get_frame ();
   *bar_window = Qnil;
   *part = scroll_bar_above_handle;
-  SELECTED_FRAME ()->mouse_moved = 0;
+  (*f)->mouse_moved = 0;
 
   XSETINT (*x, movement_pos.X);
   XSETINT (*y, movement_pos.Y);
@@ -436,7 +436,8 @@ mouse_moved_to (int x, int y)
   /* If we're in the same place, ignore it.  */
   if (x != movement_pos.X || y != movement_pos.Y)
     {
-      SELECTED_FRAME ()->mouse_moved = 1;
+      struct frame *f = get_frame ();
+      f->mouse_moved = 1;
       movement_pos.X = x;
       movement_pos.Y = y;
       movement_time = GetTickCount ();
@@ -471,13 +472,13 @@ do_mouse_event (MOUSE_EVENT_RECORD *event,
   int i;
 
   /* Mouse didn't move unless MOUSE_MOVED says it did.  */
-  SELECTED_FRAME ()->mouse_moved = 0;
+  struct frame *f = get_frame ();
+  f->mouse_moved = 0;
 
   switch (flags)
     {
     case MOUSE_MOVED:
       {
-       struct frame *f = get_frame ();
        Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
        int mx = event->dwMousePosition.X, my = event->dwMousePosition.Y;
 
@@ -536,7 +537,6 @@ do_mouse_event (MOUSE_EVENT_RECORD *event,
     case MOUSE_WHEELED:
     case MOUSE_HWHEELED:
       {
-       struct frame *f = get_frame ();
        /* Mouse positions in console wheel events are reported to
           ReadConsoleInput relative to the display's top-left
           corner(!), not relative to the origin of the console screen
@@ -588,8 +588,8 @@ do_mouse_event (MOUSE_EVENT_RECORD *event,
 
       int x = event->dwMousePosition.X;
       int y = event->dwMousePosition.Y;
-      struct frame *f = get_frame ();
-      emacs_ev->arg = tty_handle_tab_bar_click (f, x, y, (button_state & mask) != 0,
+      emacs_ev->arg = tty_handle_tab_bar_click (f, x, y,
+                                               (button_state & mask) != 0,
                                                emacs_ev);
 
       emacs_ev->modifiers |= ((button_state & mask)