diff options
| -rw-r--r-- | libwinnie/src/sdl/gfx.h | 6 | ||||
| -rw-r--r-- | libwinnie/src/winnie.cc | 24 |
2 files changed, 9 insertions, 21 deletions
diff --git a/libwinnie/src/sdl/gfx.h b/libwinnie/src/sdl/gfx.h index b0dfa2e..90af99a 100644 --- a/libwinnie/src/sdl/gfx.h +++ b/libwinnie/src/sdl/gfx.h @@ -27,6 +27,10 @@ Author: Eleni Maria Stea <elene.mst@gmail.com> bool init_gfx(); void destroy_gfx(); +void gfx_update(const Rect &rect); + +/* TODO: Move these to ../gfx.h & ../gfx.cc */ + unsigned char *get_framebuffer(); Pixmap *get_framebuffer_pixmap(); @@ -36,8 +40,6 @@ int get_color_depth(); void set_clipping_rect(const Rect &clip_rect); const Rect &get_clipping_rect(); -void gfx_update(const Rect &rect); - void get_rgb_order(int *r, int *g, int *b); #endif // GFX_H_ diff --git a/libwinnie/src/winnie.cc b/libwinnie/src/winnie.cc index 69f1510..7cedc72 100644 --- a/libwinnie/src/winnie.cc +++ b/libwinnie/src/winnie.cc @@ -36,25 +36,11 @@ Author: Eleni Maria Stea <elene.mst@gmail.com> bool winnie_init() { - if (!init_gfx()) { - return false; - } - - if (!init_window_manager()) { - return false; - } - - if (!init_keyboard()) { - return false; - } - - if (!init_mouse()) { - return false; - } - - if (!init_text()) { - return false; - } + init_gfx(); + init_window_manager(); + init_keyboard(); + init_mouse(); + init_text(); wm->invalidate_region(get_screen_size()); return true; |