CC-tea/screen
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/screen.git synced 2026-02-12 18:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some more fixes for the window list.

Browse Source 
Detecting when to destroy a window-list is rather complicated.
This commit is contained in:
Sadrul Habib Chowdhury
2010-03-04 21:40:37 -05:00
parent 02328ed6c8
commit 2e62d3683e
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/list_window.c
View File

@@ -58,6 +58,9 @@ struct gl_Window_Data
struct win *fore; /* The foreground window we had. */
};
/* Is this wdata for a group window? */
#define WLIST_FOR_GROUP(wdate) ((wdata)->group && !(wdata)->onblank && Layer2Window(flayer) && Layer2Window(flayer)->w_type == W_TYPE_GROUP)
/* This macro should not be used if 'fn' is expected to update the window list */
#define FOR_EACH_WINDOW(_wdata, _w, fn) do { \
if ((_wdata)->order == WLIST_MRU) \
@@ -300,14 +303,16 @@ gl_Window_input(struct ListData *ldata, char **inp, int *len)
if (display && AclCheckPermWin(D_user, ACL_READ, win))
return; /* Not allowed to switch to this window. */
#endif
if (wdata->onblank || (!wdata->onblank && wdata->group))
if (WLIST_FOR_GROUP(wdata))
SwitchWindow(win->w_number);
else
{
/* Do not abort the group window. */
/* Abort list only when not in a group window. */
glist_abort();
display = cd;
if (D_fore != win)
SwitchWindow(win->w_number);
}
if (D_fore != win)
SwitchWindow(win->w_number);
*len = 0;
break;
@@ -406,7 +411,7 @@ gl_Window_input(struct ListData *ldata, char **inp, int *len)
case 033: /* escape */
case 007: /* ^G */
if (wdata->onblank || (!wdata->onblank && wdata->group))
if (!WLIST_FOR_GROUP(wdata))
{
int fnumber = wdata->fore->w_number;
glist_abort();
@@ -414,9 +419,8 @@ gl_Window_input(struct ListData *ldata, char **inp, int *len)
if (wdata->onblank)
SwitchWindow(fnumber);
*len = 0;
break;
}
/* else FALLTHROUGH */
break;
default:
--*inp;
++*len;