Merge branch 'obsd-master'

Conflicts:
	Makefile
	format.c
This commit is contained in:
Thomas Adam
2015-08-30 21:44:01 +01:00
26 changed files with 594 additions and 388 deletions

View File

@ -32,14 +32,8 @@ void screen_resize_y(struct screen *, u_int);
void
screen_init(struct screen *s, u_int sx, u_int sy, u_int hlimit)
{
char host[HOST_NAME_MAX+1];
s->grid = grid_create(sx, sy, hlimit);
if (gethostname(host, sizeof(host)) == 0)
s->title = xstrdup(host);
else
s->title = xstrdup("");
s->title = xstrdup("");
s->cstyle = 0;
s->ccolour = xstrdup("");