diff --git a/42sh/includes/ft_readline.h b/42sh/includes/ft_readline.h index e328b7b1..97297893 100644 --- a/42sh/includes/ft_readline.h +++ b/42sh/includes/ft_readline.h @@ -6,7 +6,7 @@ /* By: gwojda +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/23 10:35:44 by gwojda #+# #+# */ -/* Updated: 2017/02/04 18:16:37 by gwojda ### ########.fr */ +/* Updated: 2017/02/05 17:44:07 by gwojda ### ########.fr */ /* */ /* ************************************************************************** */ @@ -69,9 +69,9 @@ # define IS_QUOTES (1 << 0) # define IS_BQUOTES (1 << 1) # define IS_DQUOTES (1 << 2) -# define IS_ACCOLADE (1 << 3) -# define IS_BRACKET (1 << 4) -# define IS_BSLASH (1 << 5) +# define IS_BSLASH (1 << 3) +# define IS_ACCOLADE (1 << 4) +# define IS_BRACKET (1 << 5) # define STR data_singleton()->line.input # define POS data_singleton()->line.pos diff --git a/42sh/src/line-editing/check_backslash.c b/42sh/src/line-editing/check_backslash.c index f20fb5ec..4d8412b9 100644 --- a/42sh/src/line-editing/check_backslash.c +++ b/42sh/src/line-editing/check_backslash.c @@ -6,7 +6,7 @@ /* By: gwojda +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/26 13:32:52 by gwojda #+# #+# */ -/* Updated: 2017/02/05 12:40:21 by gwojda ### ########.fr */ +/* Updated: 2017/02/05 17:43:44 by gwojda ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/prompt.c b/42sh/src/line-editing/prompt.c index 1bbe01fd..ea94ec3b 100644 --- a/42sh/src/line-editing/prompt.c +++ b/42sh/src/line-editing/prompt.c @@ -6,7 +6,7 @@ /* By: gwojda +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/13 13:51:33 by gwojda #+# #+# */ -/* Updated: 2017/02/04 14:56:51 by gwojda ### ########.fr */ +/* Updated: 2017/02/05 17:42:23 by gwojda ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,13 +23,14 @@ static void ft_get_date(void) t = time(NULL); tm = *localtime(&t); - ft_putstr("\033[22;32m"); + ft_putstr("\x1b[38;5;242m"); +// ft_putstr("\033[22;32m"); printf("%.2d:%.2d:%.2d ", tm.tm_hour, tm.tm_min, tm.tm_sec); fflush(NULL); if (tm.tm_hour >= 8 && tm.tm_hour < 20) - printf("\033[22;33m%C ", L'☀'); + printf("\x1b[38;5;184m%C ", L'☀'); else - printf("\033[22;33m%C ", L'★'); + printf("\x1b[38;5;184m%C ", L'★'); fflush(NULL); } @@ -56,11 +57,11 @@ void ft_prompt(void) do_job_notification(); ft_get_date(); - ft_putstr("\033[22;36m"); + ft_putstr("\x1b[38;5;254m"); ret = ft_currend_dir(); - ft_putstr("\033[22;33m"); - printf(" %C", L'›'); + ft_putstr("\x1b[38;5;184m"); + printf(" %C ", L'›'); fflush(NULL); ft_putstr("\033[22;37m"); - data_singleton()->line.prompt_size = ret + 12; + data_singleton()->line.prompt_size = ret + 13; }