From 103748d6adfe1b2d706cb0a1e1a128be5366d655 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 6 Dec 2007 09:46:23 +0000 Subject: Major reorganisation of screen handling. --- cmd-list-windows.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'cmd-list-windows.c') diff --git a/cmd-list-windows.c b/cmd-list-windows.c index 111101b2..056af295 100644 --- a/cmd-list-windows.c +++ b/cmd-list-windows.c @@ -1,4 +1,4 @@ -/* $Id: cmd-list-windows.c,v 1.14 2007-11-23 13:11:43 nicm Exp $ */ +/* $Id: cmd-list-windows.c,v 1.15 2007-12-06 09:46:21 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -51,18 +51,18 @@ cmd_list_windows_exec(unused void *ptr, struct cmd_ctx *ctx) w = wl->window; size = 0; - for (i = 0; i < w->screen.hsize; i++) - size += w->screen.grid_size[i] * 3; - size += w->screen.hsize * (sizeof *w->screen.grid_data); - size += w->screen.hsize * (sizeof *w->screen.grid_attr); - size += w->screen.hsize * (sizeof *w->screen.grid_colr); - size += w->screen.hsize * (sizeof *w->screen.grid_size); + for (i = 0; i < w->base.hsize; i++) + size += w->base.grid_size[i] * 3; + size += w->base.hsize * (sizeof *w->base.grid_data); + size += w->base.hsize * (sizeof *w->base.grid_attr); + size += w->base.hsize * (sizeof *w->base.grid_colr); + size += w->base.hsize * (sizeof *w->base.grid_size); ctx->print(ctx, "%d: %s \"%s\" (%s) [%ux%u] [history %u/%u, %llu bytes]", - wl->idx, w->name, w->screen.title, ttyname(w->fd), - screen_size_x(&w->screen), screen_size_y(&w->screen), - w->screen.hsize, w->screen.hlimit, size); + wl->idx, w->name, w->base.title, ttyname(w->fd), + screen_size_x(&w->base), screen_size_y(&w->base), + w->base.hsize, w->base.hlimit, size); } if (ctx->cmdclient != NULL) -- cgit