raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove manual detection of the column number, default to 80 if ioctl TCGETSIZE fails

Browse source
This commit is contained in:
Maieul BOYER 2024-07-20 15:02:14 +02:00
parent 0cb2d91cac
commit 597c7dcf1c
No known key found for this signature in database
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
line/src/line_internals.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */ /* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/11 18:18:46 by maiboyer #+# #+# */ /* Created: 2024/07/11 18:18:46 by maiboyer #+# #+# */
/* Updated: 2024/07/11 18:20:08 by maiboyer ### ########.fr */ /* Updated: 2024/07/20 15:01:37 by maiboyer ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,11 +21,10 @@
/* ======================= Low level terminal handling ====================== */ /* ======================= Low level terminal handling ====================== */
// FIXME: remove the sscanf here !
/* Use the ESC [6n escape sequence to query the horizontal cursor position /* Use the ESC [6n escape sequence to query the horizontal cursor position
* and return it. On error -1 is returned, on success the position of the * and return it. On error -1 is returned, on success the position of the
* cursor. */ * cursor. */
t_error line_get_cursor_position(t_fd *input, t_fd *output, t_u32 *column_out) /*t_error line_get_cursor_position(t_fd *input, t_fd *output, t_u32 *column_out)
{ {
char buf[32]; char buf[32];
t_u32 i; t_u32 i;
@ -50,17 +49,14 @@ t_error line_get_cursor_position(t_fd *input, t_fd *output, t_u32 *column_out)
return (ERROR); return (ERROR);
return (*column_out = cols, NO_ERROR); return (*column_out = cols, NO_ERROR);
} }
*/
/* Try to get the number of columns in the current terminal, or assume 80 /* Try to get the number of columns in the current terminal, or assume 80
* if it fails. */ * if it fails. */
t_u32 line_get_columns(t_fd *input, t_fd *output) /*
{ // This was inside the if body
struct winsize ws; t_u32 cols;
t_u32 cols; t_u32 start;
t_u32 start;
if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0)
{
if (line_get_cursor_position(input, output, &start)) if (line_get_cursor_position(input, output, &start))
return (80); return (80);
me_printf_fd(output, "\x1b[999C"); me_printf_fd(output, "\x1b[999C");
@ -68,7 +64,14 @@ t_u32 line_get_columns(t_fd *input, t_fd *output)
return (80); return (80);
if (cols > start) if (cols > start)
me_printf_fd(output, "\x1b[%dD", cols - start); me_printf_fd(output, "\x1b[%dD", cols - start);
return (cols); */
t_u32 line_get_columns(t_fd *input, t_fd *output)
{
struct winsize ws;
if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0)
{
return (80);
} }
else else
return (ws.ws_col); return (ws.ws_col);