enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

reflow: WIP: vertical expansion

This commit is contained in:
Boris Faure 2013-03-17 19:49:32 +01:00
parent 852400f039
commit 591529c05f
1 changed files with 63 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/bin/termpty.c
View File

@ -702,6 +702,60 @@ expand_screen:
#undef OLD_SCREEN #undef OLD_SCREEN
} }
static void
_termpty_vertically_expand(Termpty *ty, int oldh,
Termcell *oldscreen, Termcell *oldscreen2)
{
/* TODO */
int hh, y;
hh = oldh;
// FIXME: handle pointer copy here
for (y = 0; y < hh; y++)
{
Termcell *c1, *c2;
c1 = &(oldscreen[y * ty->w]);
c2 = &(TERMPTY_SCREEN(ty, 0, y));
_termpty_text_copy(ty, c1, c2, ty->w);
termpty_cell_fill(ty, NULL, c1, ty->w);
c1 = &(oldscreen2[y * ty->w]);
c2 = &(ty->screen2[y * ty->w]);
_termpty_text_copy(ty, c1, c2, ty->w);
termpty_cell_fill(ty, NULL, c1, ty->w);
}
}
static void
_termpty_vertically_shrink(Termpty *ty, int oldh,
Termcell *oldscreen, Termcell *oldscreen2)
{
/* TODO */
int hh, y;
hh = ty->h;
// FIXME: handle pointer copy here
for (y = 0; y < hh; y++)
{
Termcell *c1, *c2;
c1 = &(oldscreen[y * ty->w]);
c2 = &(TERMPTY_SCREEN(ty, 0, y));
_termpty_text_copy(ty, c1, c2, ty->w);
termpty_cell_fill(ty, NULL, c1, ty->w);
c1 = &(oldscreen2[y * ty->w]);
c2 = &(ty->screen2[y * ty->w]);
_termpty_text_copy(ty, c1, c2, ty->w);
termpty_cell_fill(ty, NULL, c1, ty->w);
}
}
static void static void
_termpty_horizontally_shrink(Termpty *ty, int oldw, int oldh, _termpty_horizontally_shrink(Termpty *ty, int oldw, int oldh,
Termcell *oldscreen, Termcell *oldscreen2) Termcell *oldscreen, Termcell *oldscreen2)
@ -709,6 +763,7 @@ _termpty_horizontally_shrink(Termpty *ty, int oldw, int oldh,
/* TODO */ /* TODO */
} }
void void
termpty_resize(Termpty *ty, int w, int h) termpty_resize(Termpty *ty, int w, int h)
{ {
@ -741,39 +796,20 @@ termpty_resize(Termpty *ty, int w, int h)
ERR("memerr"); ERR("memerr");
} }
ww = ty->w; if (oldw != ty->w)
hh = ty->h;
if (oldh == ty->h && oldw != ty->w)
{ {
if (ty->w > oldw) if (ty->w > oldw)
{
_termpty_horizontally_expand(ty, oldw, oldh, olds); _termpty_horizontally_expand(ty, oldw, oldh, olds);
return;
}
else else
{
_termpty_horizontally_shrink(ty, oldw, oldh, olds, olds2); _termpty_horizontally_shrink(ty, oldw, oldh, olds, olds2);
} }
}
if (ww > oldw) ww = oldw; if (oldh != ty->h)
if (hh > oldh) hh = oldh;
// FIXME: handle pointer copy here
for (y = 0; y < hh; y++)
{ {
Termcell *c1, *c2; if (ty->h > oldh)
_termpty_vertically_expand(ty, oldh, olds, olds2);
c1 = &(olds[y * oldw]); else
c2 = &(TERMPTY_SCREEN(ty, 0, y)); _termpty_vertically_shrink(ty, oldh, olds, olds2);
_termpty_text_copy(ty, c1, c2, ww);
termpty_cell_fill(ty, NULL, c1, ww);
c1 = &(olds2[y * oldw]);
c2 = &(ty->screen2[y * ty->w]);
_termpty_text_copy(ty, c1, c2, ww);
termpty_cell_fill(ty, NULL, c1, ww);
} }
ty->circular_offset = 0; ty->circular_offset = 0;