From 4fd321c36ed4ab05021df2ca461fd795492f7d02 Mon Sep 17 00:00:00 2001 From: "bernard.xiong" Date: Sun, 11 Apr 2010 23:57:21 +0000 Subject: add rtgui_dc_draw_color_point function. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@606 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- rtgui/include/rtgui/color.h | 1 - rtgui/include/rtgui/dc.h | 32 ++++++++++++++++---------------- rtgui/include/rtgui/dc_hw.h | 2 -- rtgui/include/rtgui/rtgui.h | 24 +++++++++++++++++++++++- rtgui/include/rtgui/widgets/widget.h | 13 ------------- 5 files changed, 39 insertions(+), 33 deletions(-) (limited to 'rtgui/include') diff --git a/rtgui/include/rtgui/color.h b/rtgui/include/rtgui/color.h index 6150b99039..e13f461885 100644 --- a/rtgui/include/rtgui/color.h +++ b/rtgui/include/rtgui/color.h @@ -16,7 +16,6 @@ #include -typedef unsigned long rtgui_color_t; #define RTGUI_ARGB(a, r, g, b) \ ((rtgui_color_t)(((rt_uint8_t)(r)|\ (((unsigned)(rt_uint8_t)(g))<<8))|\ diff --git a/rtgui/include/rtgui/dc.h b/rtgui/include/rtgui/dc.h index ec7d50f461..a4abda7cc3 100644 --- a/rtgui/include/rtgui/dc.h +++ b/rtgui/include/rtgui/dc.h @@ -34,20 +34,15 @@ struct rtgui_dc /* interface */ void (*draw_point)(struct rtgui_dc* dc, int x, int y); + void (*draw_color_point)(struct rtgui_dc* dc, int x, int y, rtgui_color_t color); void (*draw_vline)(struct rtgui_dc* dc, int x, int y1, int y2); void (*draw_hline)(struct rtgui_dc* dc, int x1, int x2, int y); void (*fill_rect )(struct rtgui_dc* dc, rtgui_rect_t* rect); void (*blit )(struct rtgui_dc* dc, struct rtgui_point* dc_point, struct rtgui_dc* dest, rtgui_rect_t* rect); - /* set and get color */ - void (*set_color )(struct rtgui_dc* dc, rtgui_color_t color); - rtgui_color_t (*get_color)(struct rtgui_dc* dc); - - /* set and get font */ - void (*set_font )(struct rtgui_dc* dc, rtgui_font_t* font); - rtgui_font_t* (*get_font)(struct rtgui_dc* dc); - void (*set_textalign)(struct rtgui_dc* dc, rt_int32_t align); - rt_int32_t (*get_textalign)(struct rtgui_dc* dc); + /* set and get graphic context */ + void (*set_gc)(struct rtgui_dc* dc, struct rtgui_gc *gc); + struct rtgui_gc* (*get_gc)(struct rtgui_dc* dc); /* get dc visible */ rt_bool_t (*get_visible)(struct rtgui_dc* dc); @@ -58,27 +53,32 @@ struct rtgui_dc rt_bool_t (*fini )(struct rtgui_dc* dc); }; +#define RTGUI_DC_FC(dc) (rtgui_dc_get_gc(dc)->foreground) +#define RTGUI_DC_BC(dc) (rtgui_dc_get_gc(dc)->background) +#define RTGUI_DC_FONT(dc) (rtgui_dc_get_gc(dc)->font) +#define RTGUI_DC_TEXTALIGN(dc) (rtgui_dc_get_gc(dc)->textalign) + /* create a buffer dc */ struct rtgui_dc* rtgui_dc_buffer_create(int width, int height); rt_uint8_t* rtgui_dc_buffer_get_pixel(struct rtgui_dc* dc); +/* begin and end a drawing */ +struct rtgui_dc* rtgui_dc_begin_drawing(rtgui_widget_t* owner); +void rtgui_dc_end_drawing(struct rtgui_dc* dc); + /* destroy a dc */ void rtgui_dc_destory(struct rtgui_dc* dc); void rtgui_dc_draw_point(struct rtgui_dc* dc, int x, int y); +void rtgui_dc_draw_color_point(struct rtgui_dc* dc, int x, int y, rtgui_color_t color); void rtgui_dc_draw_vline(struct rtgui_dc* dc, int x, int y1, int y2); void rtgui_dc_draw_hline(struct rtgui_dc* dc, int x1, int x2, int y); void rtgui_dc_fill_rect (struct rtgui_dc* dc, struct rtgui_rect* rect); void rtgui_dc_blit(struct rtgui_dc* dc, struct rtgui_point* dc_point, struct rtgui_dc* dest, rtgui_rect_t* rect); -void rtgui_dc_set_color(struct rtgui_dc* dc, rtgui_color_t color); -rtgui_color_t rtgui_dc_get_color(struct rtgui_dc* dc); - -void rtgui_dc_set_font(struct rtgui_dc* dc, rtgui_font_t* font); -rtgui_font_t* rtgui_dc_get_font(struct rtgui_dc* dc); -void rtgui_dc_set_textalign(struct rtgui_dc* dc, rt_int32_t align); -rt_int32_t rtgui_dc_get_textalign(struct rtgui_dc* dc); +void rtgui_dc_set_gc(struct rtgui_dc* dc, rtgui_gc_t* gc); +rtgui_gc_t *rtgui_dc_get_gc(struct rtgui_dc* dc); rt_bool_t rtgui_dc_get_visible(struct rtgui_dc* dc); void rtgui_dc_get_rect(struct rtgui_dc*dc, rtgui_rect_t* rect); diff --git a/rtgui/include/rtgui/dc_hw.h b/rtgui/include/rtgui/dc_hw.h index 870b447aca..e40fce4472 100644 --- a/rtgui/include/rtgui/dc_hw.h +++ b/rtgui/include/rtgui/dc_hw.h @@ -33,8 +33,6 @@ struct rtgui_dc_hw /* create a hardware dc */ struct rtgui_dc* rtgui_dc_hw_create(rtgui_widget_t* owner); -struct rtgui_dc* rtgui_dc_begin_drawing(rtgui_widget_t* owner); -void rtgui_dc_end_drawing(struct rtgui_dc* dc); /* draw a hline with raw pixel data */ void rtgui_dc_hw_draw_raw_hline(struct rtgui_dc_hw* dc, rt_uint8_t* raw_ptr, int x1, int x2, int y); diff --git a/rtgui/include/rtgui/rtgui.h b/rtgui/include/rtgui/rtgui.h index c70be8c55e..d46b83b8d1 100644 --- a/rtgui/include/rtgui/rtgui.h +++ b/rtgui/include/rtgui/rtgui.h @@ -25,6 +25,7 @@ struct rtgui_event; struct rtgui_widget; struct rtgui_win; +struct rtgui_font; typedef struct rtgui_panel rtgui_panel_t; typedef struct rtgui_win rtgui_win_t; @@ -46,6 +47,21 @@ typedef struct rtgui_rect rtgui_rect_t; #define rtgui_rect_width(r) ((r).x2 - (r).x1) #define rtgui_rect_height(r) ((r).y2 - (r).y1) +typedef unsigned long rtgui_color_t; + +struct rtgui_gc +{ + /* foreground and background color */ + rtgui_color_t foreground, background; + + /* text align */ + rt_base_t textalign; + + /* font */ + struct rtgui_font* font; +}; +typedef struct rtgui_gc rtgui_gc_t; + enum RTGUI_MARGIN_STYLE { RTGUI_MARGIN_LEFT = 0x01, @@ -86,7 +102,13 @@ enum RTGUI_ALIGN RTGUI_ALIGN_BOTTOM = 0x04, RTGUI_ALIGN_CENTER_VERTICAL = 0x08, RTGUI_ALIGN_EXPAND = 0x10, - RTGUI_ALIGN_STRETCH = 0x20 + RTGUI_ALIGN_STRETCH = 0x20, +}; + +enum RTGUI_TEXTATTR +{ + RTGUI_TEXTATTR_NORMAL = 0x0000, + RTGUI_TEXTATTR_ }; enum RTGUI_ARRAW diff --git a/rtgui/include/rtgui/widgets/widget.h b/rtgui/include/rtgui/widgets/widget.h index 326595840e..6c561a0051 100644 --- a/rtgui/include/rtgui/widgets/widget.h +++ b/rtgui/include/rtgui/widgets/widget.h @@ -60,19 +60,6 @@ extern "C" { /** Check if the object is a rtgui_widget */ #define RTGUI_IS_WIDGET(obj) (RTGUI_OBJECT_CHECK_TYPE((obj), RTGUI_WIDGET_TYPE)) -struct rtgui_gc -{ - /* foreground and background color */ - rtgui_color_t foreground, background; - - /* text align */ - rt_base_t textalign; - - /* font */ - rtgui_font_t* font; -}; -typedef struct rtgui_gc rtgui_gc_t; - /* * the base widget object */ -- cgit v1.3.1