/[emacs]/emacs/src/w32term.c
ViewVC logotype

Diff of /emacs/src/w32term.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.161.2.11 by miles, Sat May 1 23:46:19 2004 UTC revision 1.161.2.12 by miles, Tue Jul 6 09:14:38 2004 UTC
# Line 177  int last_scroll_bar_drag_pos; Line 177  int last_scroll_bar_drag_pos;
177  static RECT last_mouse_glyph;  static RECT last_mouse_glyph;
178  static Lisp_Object last_mouse_press_frame;  static Lisp_Object last_mouse_press_frame;
179    
180  Lisp_Object Vw32_num_mouse_buttons;  int w32_num_mouse_buttons;
181    
182  Lisp_Object Vw32_swap_mouse_buttons;  Lisp_Object Vw32_swap_mouse_buttons;
183    
# Line 4360  w32_read_socket (sd, expected, hold_quit Line 4360  w32_read_socket (sd, expected, hold_quit
4360    
4361            /* If the contents of the global variable help_echo_string            /* If the contents of the global variable help_echo_string
4362               has changed, generate a HELP_EVENT.  */               has changed, generate a HELP_EVENT.  */
4363    #if 0 /* The below is an invalid comparison when USE_LISP_UNION_TYPE.
4364             But it was originally changed to this to fix a bug, so I have
4365             not removed it completely in case the bug is still there.  */
4366            if (help_echo_string != previous_help_echo_string ||            if (help_echo_string != previous_help_echo_string ||
4367                (!NILP (help_echo_string) && !STRINGP (help_echo_string) && f->mouse_moved))                (!NILP (help_echo_string) && !STRINGP (help_echo_string) && f->mouse_moved))
4368    #else /* This is what xterm.c does.  */
4369                if (!NILP (help_echo_string)
4370                    || !NILP (previous_help_echo_string))
4371              do_help = 1;              do_help = 1;
4372    #endif
4373            break;            break;
4374    
4375          case WM_LBUTTONDOWN:          case WM_LBUTTONDOWN:
# Line 4784  w32_read_socket (sd, expected, hold_quit Line 4790  w32_read_socket (sd, expected, hold_quit
4790    
4791            if (do_help > 0)            if (do_help > 0)
4792              {              {
4793                if (help_echo_string == Qnil)                if (NILP (help_echo_string))
4794                  {                  {
4795                    help_echo_object = help_echo_window = Qnil;                    help_echo_object = help_echo_window = Qnil;
4796                    help_echo_pos = -1;                    help_echo_pos = -1;
# Line 6459  syms_of_w32term () Line 6465  syms_of_w32term ()
6465    Qvendor_specific_keysyms = intern ("vendor-specific-keysyms");    Qvendor_specific_keysyms = intern ("vendor-specific-keysyms");
6466    
6467    DEFVAR_INT ("w32-num-mouse-buttons",    DEFVAR_INT ("w32-num-mouse-buttons",
6468                &Vw32_num_mouse_buttons,                &w32_num_mouse_buttons,
6469                doc: /* Number of physical mouse buttons.  */);                doc: /* Number of physical mouse buttons.  */);
6470    Vw32_num_mouse_buttons = Qnil;    w32_num_mouse_buttons = 2;
6471    
6472    DEFVAR_LISP ("w32-swap-mouse-buttons",    DEFVAR_LISP ("w32-swap-mouse-buttons",
6473                &Vw32_swap_mouse_buttons,                &Vw32_swap_mouse_buttons,

Legend:
Removed from v.1.161.2.11  
changed lines
  Added in v.1.161.2.12

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26