Adjust things to conform to changes in other libraries

[libs/gltk.git] / source / widget.h

diff --git a/source/widget.h b/source/widget.h
index 2bf751a714f0db3a25bc45015894181fe3c96562..555db7f4c8e2c87cd6d94128e209fc11c5c5a32b 100644 (file)
--- a/source/widget.h
+++ b/source/widget.h
@@ -5,6 +5,7 @@
 #include <msp/datafile/objectloader.h>
 #include <msp/gl/renderer.h>
 #include "geometry.h"
+#include "inputmethod.h"
 #include "partcache.h"
 #include "state.h"
 
@@ -39,6 +40,8 @@ public:
        sigc::signal<void> signal_request_focus;
        sigc::signal<void> signal_grab_pointer;
        sigc::signal<void> signal_ungrab_pointer;
+       sigc::signal<void, const Time::TimeDelta &> signal_request_animation;
+       sigc::signal<void> signal_rebuild_needed;
 
 protected:
        Geometry geom;
@@ -46,10 +49,12 @@ protected:
        const Style *style;
        State state;
        bool visible;
-       bool focusable;
+       InputType input_type;
        Container *parent;
        std::string tooltip;
        PartCache part_cache;
+       bool rebuild_needed;
+       Time::TimeDelta anim_interval;
 
        Widget();
 private:
@@ -72,6 +77,7 @@ public:
        const Geometry &get_geometry() const { return geom; }
 
        void map_coords_to_ancestor(int &, int &, const Widget &) const;
+       void map_coords_to_root(int &, int &) const;
 
 protected:
        /** Sets the widget's parent Container.  The widget must be unparented when
@@ -107,12 +113,15 @@ public:
 
        void set_visible(bool);
        bool is_visible() const { return visible; }
-       void set_focusable(bool);
-       bool is_focusable() const { return focusable; }
+       InputType get_input_type() const { return input_type; }
+       bool is_focusable() const { return visible && input_type!=INPUT_NONE; }
        void set_focus();
        void set_enabled(bool);
        bool is_enabled() const { return !(state&DISABLED); }
 
+       // Deprecated
+       void set_focusable(bool);
+
 protected:
        void set_state(State s) { set_state(s, s); }
        void clear_state(State s) { set_state(s, NORMAL); }
@@ -121,6 +130,14 @@ public:
        State get_state() const { return state; }
 
 protected:
+       void set_animation_interval(const Time::TimeDelta &);
+       void stop_animation();
+public:
+       const Time::TimeDelta &get_animation_interval() const { return anim_interval; }
+
+protected:
+       void mark_rebuild();
+       virtual void rebuild_hierarchy();
        void rebuild();
        virtual void rebuild_special(const Part &);
 
@@ -139,15 +156,20 @@ public:
        virtual void touch_press(int, int, unsigned);
        virtual void touch_release(int, int, unsigned);
        virtual void touch_motion(int, int, unsigned);
-       virtual void key_press(unsigned, unsigned) { }
-       virtual void key_release(unsigned, unsigned) { }
-       virtual void character(wchar_t) { }
+       virtual bool key_press(unsigned, unsigned) { return false; }
+       virtual bool key_release(unsigned, unsigned) { return false; }
+       virtual bool character(wchar_t) { return false; }
        virtual void focus_in();
        virtual void focus_out();
+       virtual bool navigate(Navigation) { return false; }
+       virtual void animate(const Time::TimeDelta &) { }
 protected:
-       virtual void on_geometry_change() { }
+       virtual void on_size_change() { on_geometry_change(); }
        virtual void on_style_change() { }
        virtual void on_reparent() { }
+
+       // Deprecated
+       virtual void on_geometry_change() { }
 };
 
 } // namespace GLtk