libui updates

1 files changed, 8 insertions, 4 deletions

diff --git a/src/ui/ui.h b/src/ui/ui.h
index 28b6997..5195cbd 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -31,7 +31,7 @@ public:
 	void load();
 
 	/// make a window the active window
-	void show_window(char const *label);
+	void show_window(const char *label);
 
 	/// hide the active window
 	void hide_window();
@@ -40,11 +40,11 @@ public:
 	Window *active() { return ui_active_window; }
 
 	/// handle mouse cursor
-	virtual void event_mousecursor(float x, float y);
+	void event_mousemove(float x, float y);
 
 	/// handle keyboard input
-	virtual void event_keypress(unsigned int key, unsigned int modifier);
-	virtual void event_keyrelease(unsigned int key, unsigned int modifier);
+	void event_keypress(unsigned int key, unsigned int modifier);
+	void event_keyrelease(unsigned int key, unsigned int modifier);
 
 	/// run a user interface frame
 	void frame();
@@ -53,10 +53,14 @@ public:
 	inline Widget *focus() { return ui_focus; }
 
 protected:
+	Window *find_window(const char *label);
+
 	virtual void add_window(Window *window);
 	virtual void remove_window(Window *window);
 
 private:
+	Palette			 ui_palette;
+
 	Window			*ui_active_window;
 	Widget			*ui_focus;
 	math::Vector2f		 mouse_cursor;