浏览代码

* Add back cucul_set_color() and cucul_set_truecolor() but mark them as

deprecated using GCC attributes.
tags/v0.99.beta14
Sam Hocevar sam 18 年前
父节点
当前提交
c3bcb0052e
共有 2 个文件被更改,包括 30 次插入23 次删除
  1. +0
    -4
      cucul/colour.c
  2. +30
    -19
      cucul/cucul.h

+ 0
- 4
cucul/colour.c 查看文件

@@ -26,10 +26,6 @@
#include "cucul.h" #include "cucul.h"
#include "cucul_internals.h" #include "cucul_internals.h"


/* Legacy stuff from old versions */
int cucul_set_color(cucul_canvas_t *, unsigned char, unsigned char);
int cucul_set_truecolor(cucul_canvas_t *, unsigned int, unsigned int);

/** \brief Set the default character attribute. /** \brief Set the default character attribute.
* *
* Set the default character attribute for drawing. Attributes define * Set the default character attribute for drawing. Attributes define


+ 30
- 19
cucul/cucul.h 查看文件

@@ -237,25 +237,36 @@ cucul_canvas_t * cucul_import_canvas(cucul_buffer_t *, char const *);
char const * const * cucul_get_import_list(void); char const * const * cucul_get_import_list(void);
/* @} */ /* @} */


/* Legacy macros */ #if !defined(_DOXYGEN_SKIP_ME)
#define CUCUL_COLOR_BLACK CUCUL_BLACK /* Legacy stuff from beta versions */
#define CUCUL_COLOR_BLUE CUCUL_BLUE # ifdef __GNUC__
#define CUCUL_COLOR_GREEN CUCUL_GREEN # define CUCUL_DEPRECATED __attribute__ ((deprecated))
#define CUCUL_COLOR_CYAN CUCUL_CYAN # else
#define CUCUL_COLOR_RED CUCUL_RED # define CUCUL_DEPRECATED
#define CUCUL_COLOR_MAGENTA CUCUL_MAGENTA # endif
#define CUCUL_COLOR_BROWN CUCUL_BROWN int cucul_set_color(cucul_canvas_t *, unsigned char,
#define CUCUL_COLOR_LIGHTGRAY CUCUL_LIGHTGRAY unsigned char) CUCUL_DEPRECATED;
#define CUCUL_COLOR_DARKGRAY CUCUL_DARKGRAY int cucul_set_truecolor(cucul_canvas_t *, unsigned int,
#define CUCUL_COLOR_LIGHTBLUE CUCUL_LIGHTBLUE unsigned int) CUCUL_DEPRECATED;
#define CUCUL_COLOR_LIGHTGREEN CUCUL_LIGHTGREEN # define CUCUL_COLOR_BLACK CUCUL_BLACK
#define CUCUL_COLOR_LIGHTCYAN CUCUL_LIGHTCYAN # define CUCUL_COLOR_BLUE CUCUL_BLUE
#define CUCUL_COLOR_LIGHTRED CUCUL_LIGHTRED # define CUCUL_COLOR_GREEN CUCUL_GREEN
#define CUCUL_COLOR_LIGHTMAGENTA CUCUL_LIGHTMAGENTA # define CUCUL_COLOR_CYAN CUCUL_CYAN
#define CUCUL_COLOR_YELLOW CUCUL_YELLOW # define CUCUL_COLOR_RED CUCUL_RED
#define CUCUL_COLOR_WHITE CUCUL_YELLOW # define CUCUL_COLOR_MAGENTA CUCUL_MAGENTA
#define CUCUL_COLOR_DEFAULT CUCUL_DEFAULT # define CUCUL_COLOR_BROWN CUCUL_BROWN
#define CUCUL_COLOR_TRANSPARENT CUCUL_TRANSPARENT # define CUCUL_COLOR_LIGHTGRAY CUCUL_LIGHTGRAY
# define CUCUL_COLOR_DARKGRAY CUCUL_DARKGRAY
# define CUCUL_COLOR_LIGHTBLUE CUCUL_LIGHTBLUE
# define CUCUL_COLOR_LIGHTGREEN CUCUL_LIGHTGREEN
# define CUCUL_COLOR_LIGHTCYAN CUCUL_LIGHTCYAN
# define CUCUL_COLOR_LIGHTRED CUCUL_LIGHTRED
# define CUCUL_COLOR_LIGHTMAGENTA CUCUL_LIGHTMAGENTA
# define CUCUL_COLOR_YELLOW CUCUL_YELLOW
# define CUCUL_COLOR_WHITE CUCUL_YELLOW
# define CUCUL_COLOR_DEFAULT CUCUL_DEFAULT
# define CUCUL_COLOR_TRANSPARENT CUCUL_TRANSPARENT
#endif


#ifdef __cplusplus #ifdef __cplusplus
} }


||||||
x
 
000:0
正在加载...
取消
保存