patch 8.2.2352: if focus lost/gained is received twice code is not ignored

brammool · brammool · commit d44cc593cee8 · 2021-01-14T21:57:58.000+01:00
Problem:    If the focus lost/gained escape sequence is received twice it is
            not ignored. (Christ van Willigen)
Solution:   Adjust the logic to ignore the escape code.
diff --git a/src/term.c b/src/term.c
@@ -5708,18 +5708,24 @@ check_termcode(
 		&& key_name[0] == KS_EXTRA
 	    )
 	{
-	    if (key_name[1] == KE_FOCUSGAINED && !focus_state)
+	    if (key_name[1] == KE_FOCUSGAINED)
 	    {
-		ui_focus_change(TRUE);
-		did_cursorhold = TRUE;
-		focus_state = TRUE;
+		if (!focus_state)
+		{
+		    ui_focus_change(TRUE);
+		    did_cursorhold = TRUE;
+		    focus_state = TRUE;
+		}
 		key_name[1] = (int)KE_IGNORE;
 	    }
-	    else if (key_name[1] == KE_FOCUSLOST && focus_state)
+	    else if (key_name[1] == KE_FOCUSLOST)
 	    {
-		ui_focus_change(FALSE);
-		did_cursorhold = TRUE;
-		focus_state = FALSE;
+		if (focus_state)
+		{
+		    ui_focus_change(FALSE);
+		    did_cursorhold = TRUE;
+		    focus_state = FALSE;
+		}
 		key_name[1] = (int)KE_IGNORE;
 	    }
 	}
diff --git a/src/version.c b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2352,
 /**/
     2351,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -5708,18 +5708,24 @@ check_termcode(`
`5708`	`5708`	`&& key_name[0] == KS_EXTRA`
`5709`	`5709`	`)`
`5710`	`5710`	`{`
`5711`		`- if (key_name[1] == KE_FOCUSGAINED && !focus_state)`
	`5711`	`+ if (key_name[1] == KE_FOCUSGAINED)`
`5712`	`5712`	`{`
`5713`		`- ui_focus_change(TRUE);`
`5714`		`- did_cursorhold = TRUE;`
`5715`		`- focus_state = TRUE;`
	`5713`	`+ if (!focus_state)`
	`5714`	`+ {`
	`5715`	`+ ui_focus_change(TRUE);`
	`5716`	`+ did_cursorhold = TRUE;`
	`5717`	`+ focus_state = TRUE;`
	`5718`	`+ }`
`5716`	`5719`	`key_name[1] = (int)KE_IGNORE;`
`5717`	`5720`	`}`
`5718`		`- else if (key_name[1] == KE_FOCUSLOST && focus_state)`
	`5721`	`+ else if (key_name[1] == KE_FOCUSLOST)`
`5719`	`5722`	`{`
`5720`		`- ui_focus_change(FALSE);`
`5721`		`- did_cursorhold = TRUE;`
`5722`		`- focus_state = FALSE;`
	`5723`	`+ if (focus_state)`
	`5724`	`+ {`
	`5725`	`+ ui_focus_change(FALSE);`
	`5726`	`+ did_cursorhold = TRUE;`
	`5727`	`+ focus_state = FALSE;`
	`5728`	`+ }`
`5723`	`5729`	`key_name[1] = (int)KE_IGNORE;`
`5724`	`5730`	`}`
`5725`	`5731`	`}`