To: vim-dev@vim.org Subject: Patch 5.6.064 Fcc: outbox From: Bram Moolenaar ------------ Patch 5.6.064 Problem: MS-DOS and Win32 console: Mouse doesn't work correctly after including patch 5.6.28. (Vince Negri) Solution: Don't check for mouse scroll wheel when the mouse code contains the number of clicks. Files: src/term.c *** ../vim-5.6.63/src/term.c Fri Apr 7 10:12:54 2000 --- src/term.c Wed Apr 12 20:03:41 2000 *************** *** 3525,3553 **** mouse_row = bytes[2] - ' ' - 1; slen += num_bytes; /* * Handle mouse events. * Recognize the xterm mouse wheel, but not in the GUI ! * (multi-clicks use >= 0x60). */ if (mouse_code >= MOUSEWHEEL_LOW ! #ifdef USE_GUI && !gui.in_use ! #endif ) { /* Keep the mouse_code before it's changed, so that we * remember that it was a mouse wheel click. */ wheel_code = mouse_code; } ! # ifdef UNIX else if (use_xterm_mouse() > 1) { if (mouse_code & MOUSE_DRAG_XTERM) mouse_code |= MOUSE_DRAG; } ! # endif ! # ifdef XTERM_CLIP else if (!(mouse_code & MOUSE_DRAG & ~MOUSE_CLICK_MASK)) { if ((mouse_code & MOUSE_RELEASE) == MOUSE_RELEASE) --- 3525,3554 ---- mouse_row = bytes[2] - ' ' - 1; slen += num_bytes; + # if !defined(MSWIN) && !defined(MSDOS) /* * Handle mouse events. * Recognize the xterm mouse wheel, but not in the GUI ! * and the MS-DOS or Win32 console (multi-clicks use >= 0x60). */ if (mouse_code >= MOUSEWHEEL_LOW ! # ifdef USE_GUI && !gui.in_use ! # endif ) { /* Keep the mouse_code before it's changed, so that we * remember that it was a mouse wheel click. */ wheel_code = mouse_code; } ! # ifdef UNIX else if (use_xterm_mouse() > 1) { if (mouse_code & MOUSE_DRAG_XTERM) mouse_code |= MOUSE_DRAG; } ! # endif ! # ifdef XTERM_CLIP else if (!(mouse_code & MOUSE_DRAG & ~MOUSE_CLICK_MASK)) { if ((mouse_code & MOUSE_RELEASE) == MOUSE_RELEASE) *************** *** 3555,3560 **** --- 3556,3562 ---- else start_xterm_trace(mouse_code); } + # endif # endif } # endif /* !UNIX || XTERM_MOUSE */ *** ../vim-5.6.63/src/version.c Wed Apr 12 19:04:04 2000 --- src/version.c Wed Apr 12 20:34:01 2000 *************** *** 420,421 **** --- 420,423 ---- { /* Add new patch number below this line */ + /**/ + 64, /**/ -- hundred-and-one symptoms of being an internet addict: 14. You start introducing yourself as "Jim at I-I-Net dot net dot au" /-/-- Bram Moolenaar --- Bram@moolenaar.net --- http://www.moolenaar.net --\-\ \-\-- Vim: http://www.vim.org ---- ICCF Holland: http://www.vim.org/iccf --/-/