diff options
| author | Marvin Borner | 2020-09-13 12:10:45 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-09-13 12:10:45 +0200 |
| commit | 0ff95a565280241a4b9cc03840d8756180860b25 (patch) | |
| tree | 89280d9ed98b549e54c69a3ac74d03eca5aebc11 /libgui | |
| parent | e55f8e9039b5be5f3750639dad0ae5058adc8449 (diff) | |
Maaany wm features
Diffstat (limited to 'libgui')
| -rw-r--r-- | libgui/gui.c | 2 | ||||
| -rw-r--r-- | libgui/inc/gui.h | 21 |
2 files changed, 20 insertions, 3 deletions
diff --git a/libgui/gui.c b/libgui/gui.c index d973835..486fe8e 100644 --- a/libgui/gui.c +++ b/libgui/gui.c @@ -74,7 +74,7 @@ void gui_load_image(struct window *win, char *path, int x, int y) // TODO: Support padding with odd widths int bypp = bmp->bpp >> 3; - u8 *srcfb = &bmp->data[bypp + bmp->height * bmp->pitch]; + u8 *srcfb = &bmp->data[bypp + (bmp->height - 1) * bmp->pitch]; u8 *destfb = &win->fb[bypp]; for (u32 cy = 0; cy < bmp->height; cy++) { memcpy(destfb, srcfb, bmp->pitch); diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h index 335dc05..5087fbf 100644 --- a/libgui/inc/gui.h +++ b/libgui/inc/gui.h @@ -12,8 +12,25 @@ #define GET_RED(color) ((color >> 16) & 0x000000FF) #define GET_GREEN(color) ((color >> 8) & 0x000000FF) #define GET_BLUE(color) ((color >> 0) & 0X000000FF) -#define FG_COLOR 0xffabb2bf -#define BG_COLOR 0xff282c34 + +#define COLOR_BLACK 0xff0f0f0f +#define COLOR_RED 0xfff07f7f +#define COLOR_GREEN 0xff7ff088 +#define COLOR_YELLOW 0xffeef07f +#define COLOR_BLUE 0xff7facf0 +#define COLOR_MAGENTA 0xffd67ff0 +#define COLOR_CYAN 0xff7fe7f0 +#define COLOR_WHITE 0xffe9e9e9 +#define COLOR_BRIGHT_BLACK 0xff928374 +#define COLOR_BRIGHT_RED 0xffed9a9a +#define COLOR_BRIGHT_GREEN 0xff9ef0a5 +#define COLOR_BRIGHT_YELLOW 0xffe7e897 +#define COLOR_BRIGHT_BLUE 0xff98b9eb +#define COLOR_BRIGHT_MAGENTA 0xffd196e3 +#define COLOR_BRIGHT_CYAN 0xff94dae0 +#define COLOR_BRIGHT_WHITE 0xffe3e3e3 +#define COLOR_FG COLOR_WHITE +#define COLOR_BG COLOR_BLACK #define WF_DEFAULT (0 << 0) #define WF_NO_FOCUS (1 << 0) |