circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-05 10:26:04 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 226:

Browse Source 
Change the way the grid is stored, previously it was:

- a two-dimensional array of cells;
- a two-dimensional array of utf8 data;
- an array of line lengths.

Now it is a single array of a new struct grid_line each of which represents a
line and contains the length and an array of cells and an array of utf8 data.

This will make it easier to add additional per-line members, such as flags.
This commit is contained in:
Tiago Cunha
2009-08-09 17:28:24 +00:00
parent 5b56ea1816
commit 37b0bcd7c1
7 changed files with 118 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd-server-info.c
View File

@@ -1,4 +1,4 @@
/* $Id: cmd-server-info.c,v 1.23 2009-07-28 23:04:29 tcunha Exp $ */
/* $Id: cmd-server-info.c,v 1.24 2009-08-09 17:28:23 tcunha Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -56,6 +56,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
struct tty_term_code_entry *ent;
struct utsname un;
struct grid *gd;
struct grid_line *gl;
u_int i, j, k;
char out[80];
char *tim;
@@ -120,15 +121,16 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
lines = ulines = size = usize = 0;
gd = wp->base.grid;
for (k = 0; k < gd->hsize + gd->sy; k++) {
if (gd->data[k] != NULL) {
gl = &gd->linedata[k];
if (gl->celldata != NULL) {
lines++;
size += gd->size[k] *
sizeof (**gd->data);
size += gl->cellsize *
sizeof *gl->celldata;
}
if (gd->udata[k] != NULL) {
if (gl->utf8data != NULL) {
ulines++;
usize += gd->usize[k] *
sizeof (**gd->udata);
usize += gl->utf8size *
sizeof *gl->utf8data;
}
}
ctx->print(ctx, "%6u: %s %lu %d %u/%u, %zu "