diff --git a/libft/includes/color.h b/libft/includes/color.h index 0555f3b5..96eea18e 100644 --- a/libft/includes/color.h +++ b/libft/includes/color.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/25 13:36:48 by jhalford #+# #+# */ -/* Updated: 2016/12/06 20:15:42 by jhalford ### ########.fr */ +/* Updated: 2016/12/09 22:09:24 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,6 +22,12 @@ struct s_color typedef struct s_color t_color; +# define FG_DEFAULT "\x1b[0m" +# define ON_BOLD "\x1b[1m" + +# define ON_UNDERLINED "\x1b[4m" +# define ON_INVERTED "\x1b[7m" + # define FG_BLACK "\x1b[30m" # define FG_RED "\x1b[31m" # define FG_GREEN "\x1b[32m" @@ -29,7 +35,6 @@ typedef struct s_color t_color; # define FG_BLUE "\x1b[34m" # define FG_MAGENTA "\x1b[35m" # define FG_CYAN "\x1b[36m" -# define FG_DEFAULT "\x1b[0m" # define BG_BLACK "\x1b[40m" # define BG_RED "\x1b[41m" diff --git a/libft/includes/libft.h b/libft/includes/libft.h index 70e22716..0a9f831d 100644 --- a/libft/includes/libft.h +++ b/libft/includes/libft.h @@ -6,14 +6,14 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 13:49:04 by jhalford #+# #+# */ -/* Updated: 2016/12/07 16:54:11 by jhalford ### ########.fr */ +/* Updated: 2016/12/09 22:11:49 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef LIBFT_H # define LIBFT_H -# define DG_MSG0 "{yel}%13s:{blu}%-3d{eoc} |" +# define DG_MSG0 "{inv}{yel}%13s {bol}{blu}%-3d{eoc}" # define DG_MSG1 ft_path_notdir(__FILE__), __LINE__ # define DG(f, ...) ft_dprintf(2, DG_MSG0 f "{eoc}\n", DG_MSG1, ##__VA_ARGS__) diff --git a/libft/src/ft_printf/ft_printf.c b/libft/src/ft_printf/ft_printf.c index 2c49114a..61f98fc5 100644 --- a/libft/src/ft_printf/ft_printf.c +++ b/libft/src/ft_printf/ft_printf.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 13:33:27 by jhalford #+# #+# */ -/* Updated: 2016/12/09 19:14:24 by jhalford ### ########.fr */ +/* Updated: 2016/12/09 22:10:32 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/libft/src/ft_printf/ft_printf_color.c b/libft/src/ft_printf/ft_printf_color.c index 00cfb6ec..33481b49 100644 --- a/libft/src/ft_printf/ft_printf_color.c +++ b/libft/src/ft_printf/ft_printf_color.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/06 18:07:39 by jhalford #+# #+# */ -/* Updated: 2016/12/09 18:03:45 by jhalford ### ########.fr */ +/* Updated: 2016/12/09 22:09:21 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,9 @@ t_stos g_colors[] = { + {"{bol}", ON_BOLD}, + {"{und}", ON_UNDERLINED}, + {"{inv}", ON_INVERTED}, {"{bla}", FG_BLACK}, {"{red}", FG_RED}, {"{gre}", FG_GREEN},