[Emacs-diffs] Changes to emacs/src/w32term.c

[Pavel Janík]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.161 emacs/src/w32term.c:1.162
*** emacs/src/w32term.c:1.161   Sat May 25 05:08:37 2002
--- emacs/src/w32term.c Thu Jun 13 10:58:38 2002
***************
*** 6188,6196 ****
    parse_button (msg->msg.message, HIWORD (msg->msg.wParam),
                &button, &up);
  
!   /* Make the event type no_event; we'll change that when we decide
       otherwise.  */
!   result->kind = mouse_click;
    result->code = button;
    result->timestamp = msg->msg.time;
    result->modifiers = (msg->dwModifiers
--- 6188,6196 ----
    parse_button (msg->msg.message, HIWORD (msg->msg.wParam),
                &button, &up);
  
!   /* Make the event type NO_EVENT; we'll change that when we decide
       otherwise.  */
!   result->kind = MOUSE_CLICK_EVENT;
    result->code = button;
    result->timestamp = msg->msg.time;
    result->modifiers = (msg->dwModifiers
***************
*** 6212,6218 ****
       struct frame *f;
  {
    POINT p;
!   result->kind = mouse_wheel;
    result->code = (short) HIWORD (msg->msg.wParam);
    result->timestamp = msg->msg.time;
    result->modifiers = msg->dwModifiers;
--- 6212,6218 ----
       struct frame *f;
  {
    POINT p;
!   result->kind = MOUSE_WHEEL_EVENT;
    result->code = (short) HIWORD (msg->msg.wParam);
    result->timestamp = msg->msg.time;
    result->modifiers = msg->dwModifiers;
***************
*** 6240,6246 ****
    char *name;
    int i, len;
  
!   result->kind = drag_n_drop;
    result->code = 0;
    result->timestamp = msg->msg.time;
    result->modifiers = msg->dwModifiers;
--- 6240,6246 ----
    char *name;
    int i, len;
  
!   result->kind = DRAG_N_DROP_EVENT;
    result->code = 0;
    result->timestamp = msg->msg.time;
    result->modifiers = msg->dwModifiers;
***************
*** 8319,8325 ****
  }
  
  /* Handle a mouse click on the scroll bar BAR.  If *EMACS_EVENT's kind
!    is set to something other than no_event, it is enqueued.
  
     This may be called from a signal handler, so we have to ignore GC
     mark bits.  */
--- 8319,8325 ----
  }
  
  /* Handle a mouse click on the scroll bar BAR.  If *EMACS_EVENT's kind
!    is set to something other than NO_EVENT, it is enqueued.
  
     This may be called from a signal handler, so we have to ignore GC
     mark bits.  */
***************
*** 8333,8339 ****
    if (! GC_WINDOWP (bar->window))
      abort ();
  
!   emacs_event->kind = w32_scroll_bar_click;
    emacs_event->code = 0;
    /* not really meaningful to distinguish up/down */
    emacs_event->modifiers = msg->dwModifiers;
--- 8333,8339 ----
    if (! GC_WINDOWP (bar->window))
      abort ();
  
!   emacs_event->kind = W32_SCROLL_BAR_CLICK_EVENT;
    emacs_event->code = 0;
    /* not really meaningful to distinguish up/down */
    emacs_event->modifiers = msg->dwModifiers;
***************
*** 8433,8439 ****
          }
        /* fall through */
        default:
!       emacs_event->kind = no_event;
        return FALSE;
        }
  
--- 8433,8439 ----
          }
        /* fall through */
        default:
!       emacs_event->kind = NO_EVENT;
        return FALSE;
        }
  
***************
*** 8634,8640 ****
                     visibility changes properly.  */
                  if (f->iconified)
                    {
!                     bufp->kind = deiconify_event;
                      XSETFRAME (bufp->frame_or_window, f);
                      bufp->arg = Qnil;
                      bufp++;
--- 8634,8640 ----
                     visibility changes properly.  */
                  if (f->iconified)
                    {
!                     bufp->kind = DEICONIFY_EVENT;
                      XSETFRAME (bufp->frame_or_window, f);
                      bufp->arg = Qnil;
                      bufp++;
***************
*** 8672,8678 ****
              if (numchars == 0)
                abort ();
          
!             bufp->kind = language_change_event;
              XSETFRAME (bufp->frame_or_window, f);
              bufp->arg = Qnil;
              bufp->code = msg.msg.wParam;
--- 8672,8678 ----
              if (numchars == 0)
                abort ();
          
!             bufp->kind = LANGUAGE_CHANGE_EVENT;
              XSETFRAME (bufp->frame_or_window, f);
              bufp->arg = Qnil;
              bufp->code = msg.msg.wParam;
***************
*** 8698,8704 ****
              if (temp_index == sizeof temp_buffer / sizeof (short))
                temp_index = 0;
              temp_buffer[temp_index++] = msg.msg.wParam;
!             bufp->kind = non_ascii_keystroke;
              bufp->code = msg.msg.wParam;
              bufp->modifiers = msg.dwModifiers;
              XSETFRAME (bufp->frame_or_window, f);
--- 8698,8704 ----
              if (temp_index == sizeof temp_buffer / sizeof (short))
                temp_index = 0;
              temp_buffer[temp_index++] = msg.msg.wParam;
!             bufp->kind = NON_ASCII_KEYSTROKE_EVENT;
              bufp->code = msg.msg.wParam;
              bufp->modifiers = msg.dwModifiers;
              XSETFRAME (bufp->frame_or_window, f);
***************
*** 8725,8731 ****
              if (temp_index == sizeof temp_buffer / sizeof (short))
                temp_index = 0;
              temp_buffer[temp_index++] = msg.msg.wParam;
!             bufp->kind = ascii_keystroke;
              bufp->code = msg.msg.wParam;
              bufp->modifiers = msg.dwModifiers;
              XSETFRAME (bufp->frame_or_window, f);
--- 8725,8731 ----
              if (temp_index == sizeof temp_buffer / sizeof (short))
                temp_index = 0;
              temp_buffer[temp_index++] = msg.msg.wParam;
!             bufp->kind = ASCII_KEYSTROKE_EVENT;
              bufp->code = msg.msg.wParam;
              bufp->modifiers = msg.dwModifiers;
              XSETFRAME (bufp->frame_or_window, f);
***************
*** 8799,8805 ****
            int button;
            int up;
  
!             emacs_event.kind = no_event;
            
            if (dpyinfo->grabbed && last_mouse_frame
                && FRAME_LIVE_P (last_mouse_frame))
--- 8799,8805 ----
            int button;
            int up;
  
!             emacs_event.kind = NO_EVENT;
            
            if (dpyinfo->grabbed && last_mouse_frame
                && FRAME_LIVE_P (last_mouse_frame))
***************
*** 8991,8997 ****
                  f->async_visible = 0;
                  f->async_iconified = 1;
                  
!                 bufp->kind = iconify_event;
                  XSETFRAME (bufp->frame_or_window, f);
                  bufp->arg = Qnil;
                  bufp++;
--- 8991,8997 ----
                  f->async_visible = 0;
                  f->async_iconified = 1;
                  
!                 bufp->kind = ICONIFY_EVENT;
                  XSETFRAME (bufp->frame_or_window, f);
                  bufp->arg = Qnil;
                  bufp++;
***************
*** 9021,9027 ****
                        f->output_data.w32->left_pos = x;
                        f->output_data.w32->top_pos = y;
  
!                     bufp->kind = deiconify_event;
                      XSETFRAME (bufp->frame_or_window, f);
                      bufp->arg = Qnil;
                      bufp++;
--- 9021,9027 ----
                        f->output_data.w32->left_pos = x;
                        f->output_data.w32->top_pos = y;
  
!                     bufp->kind = DEICONIFY_EVENT;
                      XSETFRAME (bufp->frame_or_window, f);
                      bufp->arg = Qnil;
                      bufp++;
***************
*** 9169,9175 ****
              if (numchars == 0)
                abort ();
              
!             bufp->kind = delete_window_event;
              XSETFRAME (bufp->frame_or_window, f);
              bufp->arg = Qnil;
              bufp++;
--- 9169,9175 ----
              if (numchars == 0)
                abort ();
              
!             bufp->kind = DELETE_WINDOW_EVENT;
              XSETFRAME (bufp->frame_or_window, f);
              bufp->arg = Qnil;
              bufp++;
***************
*** 9186,9192 ****
              if (numchars == 0)
                abort ();
          
!             bufp->kind = menu_bar_activate_event;
              XSETFRAME (bufp->frame_or_window, f);
              bufp->arg = Qnil;
              bufp++;
--- 9186,9192 ----
              if (numchars == 0)
                abort ();
          
!             bufp->kind = MENU_BAR_ACTIVATE_EVENT;
              XSETFRAME (bufp->frame_or_window, f);
              bufp->arg = Qnil;
              bufp++;