Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2024-08-21 08:01:09 +01:00
17 changed files with 747 additions and 294 deletions

View File

@ -542,7 +542,7 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
}
if ((((pd->flags & (POPUP_CLOSEEXIT|POPUP_CLOSEEXITZERO)) == 0) ||
pd->job == NULL) &&
(event->key == '\033' || event->key == '\003'))
(event->key == '\033' || event->key == ('c'|KEYC_CTRL)))
return (1);
if (pd->job != NULL) {
if (KEYC_IS_MOUSE(event->key)) {