1 files changed, 17 insertions, 8 deletions

diff --git a/src/utouch.h b/src/utouch.h
index c9f3a6d..3db32a7 100644
--- a/src/utouch.h
+++ b/src/utouch.h
@@ -20,25 +20,34 @@
  */
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
-
+#include <utouch/frame-xi2.h>
 
 class UtouchScreen
-: public ScreenInterface
-, public PluginClassHandler<UtouchScreen, CompScreen>
+        : public ScreenInterface
+        , public PluginClassHandler<UtouchScreen, CompScreen>
 {
 public:
-  UtouchScreen(CompScreen* s);
+        UtouchScreen(CompScreen* s);
+
+        virtual ~UtouchScreen();
+
+        void handleEvent(XEvent *ev);
 
-  virtual ~UtouchScreen();
+protected:
+        utouch_frame_handle createDevice(int devid) const;
+        void handleDeviceEvent(const XIDeviceEvent *ev);
 
 private:
-  CompScreen*   screen;
+        typedef std::map<int, utouch_frame_handle> dev_map;
+        CompScreen* screen;
+        dev_map devices;
+        int opcode;
 };
 
 
 class UtouchVTable
-: public CompPlugin::VTableForScreen<UtouchScreen>
+        : public CompPlugin::VTableForScreen<UtouchScreen>
 {
-  bool init();
+        bool init();
 };