jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix padding and arrows

Browse source
This commit is contained in:
M600 2017-03-10 12:44:54 +01:00
parent 12c35ed904
commit 7bf475540c
4 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/src/completion/c_arrow.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/10 09:04:42 by alao #+# #+# */ /* Created: 2017/03/10 09:04:42 by alao #+# #+# */
/* Updated: 2017/03/10 10:21:01 by alao ### ########.fr */ /* Updated: 2017/03/10 12:44:05 by alao ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -29,10 +29,8 @@ static void c_arrow_right(t_comp *c)
i += c->c_line - (c->c_sy - ((c->c_pline - 1) * c->c_line)); i += c->c_line - (c->c_sy - ((c->c_pline - 1) * c->c_line));
i++; i++;
} }
DG("POSX [%d] C_PLINE [%d]", c->pos_x, c->c_line);
if (c->pos_x == (c->c_pline - 1)) if (c->pos_x == (c->c_pline - 1))
{ {
DG("X");
i = c->c_line - (c->c_sy - ((c->c_pline - 1) * c->c_line)); i = c->c_line - (c->c_sy - ((c->c_pline - 1) * c->c_line));
while (i < c->c_line) while (i < c->c_line)
{ {

3
42sh/src/completion/c_init.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 11:21:16 by alao #+# #+# */ /* Created: 2017/01/09 11:21:16 by alao #+# #+# */
/* Updated: 2017/03/10 11:38:35 by alao ### ########.fr */ /* Updated: 2017/03/10 12:43:57 by alao ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -60,7 +60,6 @@ static void c_init_base(t_comp *c)
c->m_size += ft_strlen(data_singleton()->line.input); c->m_size += ft_strlen(data_singleton()->line.input);
c->m_size = (c->m_size / c->win_y); c->m_size = (c->m_size / c->win_y);
c->m_size = c->win_y - c->m_size - 1; c->m_size = c->win_y - c->m_size - 1;
DG("MS [%d] WX %d WY %d", c->m_size, c->win_x, c->win_y);
c->pos_x = 1; c->pos_x = 1;
c->pos_y = 1; c->pos_y = 1;
c->cutpoint = 0; c->cutpoint = 0;

22
42sh/src/completion/c_printer.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/10 12:55:39 by alao #+# #+# */ /* Created: 2017/01/10 12:55:39 by alao #+# #+# */
/* Updated: 2017/03/10 10:18:16 by alao ### ########.fr */ /* Updated: 2017/03/10 12:43:16 by alao ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -98,12 +98,10 @@ static t_clst *c_rolling(t_comp *c)
y = 1; y = 1;
while ((y * (c->m_size - 1)) < id) while ((y * (c->m_size - 1)) < id)
y++; y++;
c->pos_x = x; c->pos_x = id;
c->pos_y = y; c->pos_y = y;
if (y > 1) if (y > 1)
{ {
c->pos_x = x;
c->pos_y = y;
x = (y - 1) * (c->m_size - 1); x = (y - 1) * (c->m_size - 1);
ptr = c->lst; ptr = c->lst;
while (x) while (x)
@ -125,10 +123,17 @@ void c_printer(t_comp *c)
t_clst *ptr; t_clst *ptr;
int loop; int loop;
int max_line; int max_line;
int offset;
loop = c->c_line; loop = c->c_line;
max_line = c->m_size - 1;
max_line = c->c_line - (c->m_size - 1);
ptr = c_rolling(c); ptr = c_rolling(c);
if ((c->pos_y * (c->m_size - 1)) > c->c_line)
max_line = (c->c_line % (c->m_size - 1));
else
max_line = c->m_size - 1;
offset = (c->m_size - 1) - max_line;
while (loop && max_line) while (loop && max_line)
{ {
c_printer_line(c, ptr, c->c_pline, 1); c_printer_line(c, ptr, c->c_pline, 1);
@ -137,4 +142,9 @@ void c_printer(t_comp *c)
loop--; loop--;
max_line--; max_line--;
} }
while (offset)
{
ft_putstr(tgetstr("do", NULL));
offset--;
}
} }

4
42sh/src/completion/c_terminal.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/10/11 10:44:40 by alao #+# #+# */ /* Created: 2016/10/11 10:44:40 by alao #+# #+# */
/* Updated: 2017/03/10 11:45:57 by alao ### ########.fr */ /* Updated: 2017/03/10 12:06:22 by alao ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -78,7 +78,7 @@ void c_term_mv_down(t_comp *c)
i = 0; i = 0;
if (c->c_sy > c->win_y) if (c->c_sy > c->win_y)
value = c->m_size + 1; value = c->m_size;
else else
value = c->c_line; value = c->c_line;
while (i < value) while (i < value)