aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.1-168

Browse Source
This commit is contained in:
Bram Moolenaar 2007-12-03 21:21:03 +00:00
parent e9c3bcda1d
commit ea40888076
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui_w48.c
View File

@ -290,6 +290,11 @@ static struct
/* Local variables */ /* Local variables */
static int s_button_pending = -1; static int s_button_pending = -1;
/* s_getting_focus is set when we got focus but didn't see mouse-up event yet,
* so don't reset s_button_pending. */
static int s_getting_focus = FALSE;
static int s_x_pending; static int s_x_pending;
static int s_y_pending; static int s_y_pending;
static UINT s_kFlags_pending; static UINT s_kFlags_pending;
@ -671,6 +676,8 @@ _OnMouseEvent(
{ {
int vim_modifiers = 0x0; int vim_modifiers = 0x0;
s_getting_focus = FALSE;
if (keyFlags & MK_SHIFT) if (keyFlags & MK_SHIFT)
vim_modifiers |= MOUSE_SHIFT; vim_modifiers |= MOUSE_SHIFT;
if (keyFlags & MK_CONTROL) if (keyFlags & MK_CONTROL)
@ -792,6 +799,7 @@ _OnMouseMoveOrRelease(
{ {
int button; int button;
s_getting_focus = FALSE;
if (s_button_pending > -1) if (s_button_pending > -1)
{ {
/* Delayed action for mouse down event */ /* Delayed action for mouse down event */
@ -1951,8 +1959,10 @@ gui_mch_wait_for_chars(int wtime)
allow_scrollbar = FALSE; allow_scrollbar = FALSE;
/* Clear pending mouse button, the release event may have been /* Clear pending mouse button, the release event may have been
* taken by the dialog window. */ * taken by the dialog window. But don't do this when getting
s_button_pending = -1; * focus, we need the mouse-up event then. */
if (!s_getting_focus)
s_button_pending = -1;
return OK; return OK;
} }
@ -2702,6 +2712,7 @@ _OnSetFocus(
HWND hwndOldFocus) HWND hwndOldFocus)
{ {
gui_focus_change(TRUE); gui_focus_change(TRUE);
s_getting_focus = TRUE;
(void)MyWindowProc(hwnd, WM_SETFOCUS, (WPARAM)hwndOldFocus, 0); (void)MyWindowProc(hwnd, WM_SETFOCUS, (WPARAM)hwndOldFocus, 0);
} }
@ -2711,6 +2722,7 @@ _OnKillFocus(
HWND hwndNewFocus) HWND hwndNewFocus)
{ {
gui_focus_change(FALSE); gui_focus_change(FALSE);
s_getting_focus = FALSE;
(void)MyWindowProc(hwnd, WM_KILLFOCUS, (WPARAM)hwndNewFocus, 0); (void)MyWindowProc(hwnd, WM_KILLFOCUS, (WPARAM)hwndNewFocus, 0);
} }

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
168,
/**/ /**/
167, 167,
/**/ /**/