mirror of
https://git.savannah.gnu.org/git/screen.git
synced 2026-02-18 05:12:23 +02:00
Compare commits
6 Commits
caption-ne
...
jesstess-d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
066b098a31 | ||
|
|
a805439f64 | ||
|
|
dfab460087 | ||
|
|
2f565ead2d | ||
|
|
4f9101fc9d | ||
|
|
98bf4132c5 |
@@ -25,7 +25,10 @@ SCREEN = screen-$(VERSION)
|
||||
GIT_REV = "`git describe --always 2>/dev/null`"
|
||||
DEFS = @DEFS@ -DGIT_REV=\"$(GIT_REV)\"
|
||||
|
||||
ETCSCREENRC = $(prefix)/etc/screenrc
|
||||
ETCSCREENRC = @ETCSCREENRC@
|
||||
ifeq (${ETCSCREENRC}, )
|
||||
ETCSCREENRC=$(prefix)/etc/screenrc
|
||||
endif
|
||||
SCREENENCODINGS = $(datadir)/screen/utf8encodings
|
||||
|
||||
CC = @CC@
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
document.
|
||||
|
||||
* Screen can now be started detached (screen -d -m -S sockname).
|
||||
This is usefull if you want to start screen in your /etc/rc file
|
||||
This is useful if you want to start screen in your /etc/rc file
|
||||
(e.g. as a console multiplexer)
|
||||
|
||||
* Console grabbing added ('console on' command).
|
||||
|
||||
@@ -1294,6 +1294,11 @@ test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq"
|
||||
|
||||
AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.))
|
||||
|
||||
ETCSCREENRC=
|
||||
AC_MSG_CHECKING(for the global screenrc file)
|
||||
AC_ARG_WITH(sys-screenrc, [ --with-sys-screenrc=path to the global screenrc file], [ ETCSCREENRC="${withval}" ])
|
||||
AC_SUBST(ETCSCREENRC)
|
||||
|
||||
AC_OUTPUT(Makefile doc/Makefile, [[
|
||||
# a hook for preserving undef directive in config.h
|
||||
mv config.h conftest
|
||||
|
||||
@@ -2524,7 +2524,7 @@ int from, to, y, bce;
|
||||
DisplayLine(oml, &mline_blank, y, from, to);
|
||||
return;
|
||||
}
|
||||
bcechar = mchar_blank;
|
||||
bcechar = mchar_null;
|
||||
rend_setbg(&bcechar, bce);
|
||||
for (x = from; x <= to; x++)
|
||||
copy_mchar2mline(&bcechar, &mline_old, x);
|
||||
|
||||
@@ -335,7 +335,13 @@ int x, y;
|
||||
#endif
|
||||
|
||||
if (l->l_pause.d)
|
||||
LayPauseUpdateRegion(l, x, x, y, y);
|
||||
LayPauseUpdateRegion(l, x,
|
||||
#ifdef DW_CHARS
|
||||
x + (c->mbcs ? 1 : 0)
|
||||
#else
|
||||
x
|
||||
#endif
|
||||
, y, y);
|
||||
|
||||
FOR_EACH_UNPAUSED_CANVAS(l,
|
||||
{
|
||||
|
||||
10
src/layout.c
10
src/layout.c
@@ -64,7 +64,7 @@ CreateLayout(title, startat)
|
||||
char *title;
|
||||
int startat;
|
||||
{
|
||||
struct layout *lay;
|
||||
struct layout *lay, **pl;
|
||||
int i;
|
||||
|
||||
if (startat >= MAXLAY || startat < 0)
|
||||
@@ -86,8 +86,12 @@ int startat;
|
||||
lay->lay_autosave = 1;
|
||||
lay->lay_number = i;
|
||||
laytab[i] = lay;
|
||||
lay->lay_next = layouts;
|
||||
layouts = lay;
|
||||
lay->lay_next = 0;
|
||||
|
||||
pl = &layouts;
|
||||
while (*pl)
|
||||
pl = &(*pl)->lay_next;
|
||||
*pl = lay;
|
||||
return lay;
|
||||
}
|
||||
|
||||
|
||||
@@ -771,7 +771,7 @@ processchar:
|
||||
LGotoPos(flayer, cx, W2D(cy));
|
||||
break;
|
||||
case '@':
|
||||
/* it may be usefull to have a key that does nothing */
|
||||
/* it may be useful to have a key that does nothing */
|
||||
break;
|
||||
case '%':
|
||||
rep_cnt--;
|
||||
|
||||
@@ -1048,8 +1048,8 @@ struct win *p;
|
||||
}
|
||||
p->w_alt.hlines = 0;
|
||||
p->w_alt.histidx = 0;
|
||||
#endif
|
||||
p->w_alt.histheight = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -1064,9 +1064,9 @@ struct win *p;
|
||||
SWAP(mlines, ml);
|
||||
SWAP(width, t);
|
||||
SWAP(height, t);
|
||||
SWAP(histheight, t);
|
||||
|
||||
#ifdef COPY_PASTE
|
||||
SWAP(histheight, t);
|
||||
SWAP(hlines, ml);
|
||||
SWAP(histidx, t);
|
||||
#endif
|
||||
|
||||
@@ -642,7 +642,7 @@ struct NewWindow *newwin;
|
||||
#ifdef MULTIUSER
|
||||
/*
|
||||
* This is dangerous: without a display we use creators umask
|
||||
* This is intended to be usefull for detached startup.
|
||||
* This is intended to be useful for detached startup.
|
||||
* But is still better than default bits with a NULL user.
|
||||
*/
|
||||
if (NewWindowAcl(p, display ? D_user : users))
|
||||
|
||||
@@ -283,12 +283,14 @@ struct win
|
||||
struct mline *mlines;
|
||||
int width;
|
||||
int height;
|
||||
int histheight;
|
||||
#ifdef COPY_PASTE
|
||||
int histheight;
|
||||
struct mline *hlines;
|
||||
int histidx;
|
||||
struct cursor cursor;
|
||||
#else
|
||||
int histheight; /* 0 */
|
||||
#endif
|
||||
struct cursor cursor;
|
||||
} w_alt;
|
||||
|
||||
struct event w_destroyev; /* window destroy event */
|
||||
|
||||
Reference in New Issue
Block a user