Merge lp:~robertcarr/mir/remove-dummy-dispatcher-policy into lp:~mir-team/mir/trunk

[Robert Carr]

Remove DummyInputDispatcherPolicy

I think the DummyInputDispatcherPolicy is a kind of strange pattern which is getting in the way of some stuff I am working on in another branch (preparation for xkb based keymapping).

So lets remove it!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:572
http://jenkins.qa.ubuntu.com/job/mir-ci/332/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/192
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/337
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/337/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/144/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/332/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

seems we're just replacing one stub with another at the moment, i assume the new stub files are the ones that we'll fill in to make the real policy. That being said, the changes look ok.

It looks like nsecs_t are things that come from the android input stack; that being said though, it would be nice if we're moving towards wrapping things like this in our system so all the rough edges around our dependencies are hidden away. Still, looks good to me though. Transitions like that take more time :)

review: Approve

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Alan Griffiths (alan-griffiths)]

I'm not sure what is possible after this that wasn't possible before. but it seems harmless.

review: Approve

=== removed file 'src/server/input/android/dummy_input_dispatcher_policy.h'
--- src/server/input/android/dummy_input_dispatcher_policy.h	2012-11-10 20:36:01 +0000
+++ src/server/input/android/dummy_input_dispatcher_policy.h	1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-#ifndef MIR_DUMMY_INPUT_DISPATCHER_POLICY_H_
-#define MIR_DUMMY_INPUT_DISPATCHER_POLICY_H_
-
-// from android
-#include <InputDispatcher.h>
-
-namespace android
-{
-class InputEvent;
-}
-
-namespace droidinput = android;
-
-namespace mir
-{
-namespace input
-{
-namespace android
-{
-/*
- Dummy implementation of a InputReaderPolicy
-
- Delete it once we have a real implementation.
- */
-class DummyInputDispatcherPolicy : public droidinput::InputDispatcherPolicyInterface
-{
-public:
-    DummyInputDispatcherPolicy() {}
-    virtual ~DummyInputDispatcherPolicy() {}
-
-    virtual void notifyConfigurationChanged(nsecs_t when)
-    {
-        (void)when;
-    }
-
-    virtual nsecs_t notifyANR(
-            const droidinput::sp<droidinput::InputApplicationHandle>& inputApplicationHandle,
-            const droidinput::sp<droidinput::InputWindowHandle>& inputWindowHandle)
-    {
-        (void)inputApplicationHandle;
-        (void)inputWindowHandle;
-        return 0;
-    }
-
-    virtual void notifyInputChannelBroken(
-            const droidinput::sp<droidinput::InputWindowHandle>& inputWindowHandle)
-    {
-        (void)inputWindowHandle;
-    }
-
-    virtual void getDispatcherConfiguration(
-            droidinput::InputDispatcherConfiguration* outConfig)
-    {
-        (void)outConfig;
-    }
-
-    virtual bool isKeyRepeatEnabled()
-    {
-        return true;
-    }
-
-    virtual bool filterInputEvent(const droidinput::InputEvent* inputEvent,
-                                  uint32_t policyFlags)
-    {
-        (void)inputEvent;
-        (void)policyFlags;
-        return true;
-    }
-
-    virtual void interceptKeyBeforeQueueing(const droidinput::KeyEvent* keyEvent,
-                                            uint32_t& policyFlags)
-    {
-        (void)keyEvent;
-        policyFlags = droidinput::POLICY_FLAG_PASS_TO_USER;
-    }
-
-    virtual void interceptMotionBeforeQueueing(nsecs_t when, uint32_t& policyFlags)
-    {
-        (void)when;
-        policyFlags = droidinput::POLICY_FLAG_PASS_TO_USER;
-    }
-
-    virtual nsecs_t interceptKeyBeforeDispatching(
-            const droidinput::sp<droidinput::InputWindowHandle>& inputWindowHandle,
-            const droidinput::KeyEvent* keyEvent, uint32_t policyFlags)
-    {
-        (void)inputWindowHandle;
-        (void)keyEvent;
-        (void)policyFlags;
-        return 0;
-    }
-
-    virtual bool dispatchUnhandledKey(
-            const droidinput::sp<droidinput::InputWindowHandle>& inputWindowHandle,
-            const droidinput::KeyEvent* keyEvent, uint32_t policyFlags,
-            droidinput::KeyEvent* outFallbackKeyEvent)
-    {
-        (void)inputWindowHandle;
-        (void)keyEvent;
-        (void)policyFlags;
-        (void)outFallbackKeyEvent;
-        return false;
-    }
-
-    virtual void notifySwitch(nsecs_t when,
-            int32_t switchCode, int32_t switchValue, uint32_t policyFlags)
-    {
-        (void)when;
-        (void)switchCode;
-        (void)switchValue;
-        (void)policyFlags;
-    }
-
-    virtual void pokeUserActivity(nsecs_t eventTime, int32_t eventType)
-    {
-        (void)eventTime;
-        (void)eventType;
-    }
-
-    virtual bool checkInjectEventsPermissionNonReentrant(
-            int32_t injectorPid, int32_t injectorUid)
-    {
-        (void)injectorPid;
-        (void)injectorUid;
-        return true;
-    }
-};
-
-}
-}
-}
-
-#endif // MIR_DUMMY_INPUT_DISPATCHER_POLICY_H_

=== modified file 'src/server/input/android/event_filter_dispatcher_policy.cpp'
--- src/server/input/android/event_filter_dispatcher_policy.cpp	2013-03-25 18:40:44 +0000
+++ src/server/input/android/event_filter_dispatcher_policy.cpp	2013-04-08 18:25:26 +0000
@@ -27,6 +27,29 @@
 {
 }
 
+void mia::EventFilterDispatcherPolicy::notifyConfigurationChanged(nsecs_t /* when */)
+{
+}
+
+nsecs_t mia::EventFilterDispatcherPolicy::notifyANR(droidinput::sp<droidinput::InputApplicationHandle> const& /* inputApplicationHandle */,
+                                                    droidinput::sp<droidinput::InputWindowHandle> const& /* inputWindowHandle */)
+{
+    return 0;
+}
+
+void mia::EventFilterDispatcherPolicy::notifyInputChannelBroken(droidinput::sp<droidinput::InputWindowHandle> const& /* inputWindowHandle */)
+{
+}
+
+void mia::EventFilterDispatcherPolicy::getDispatcherConfiguration(droidinput::InputDispatcherConfiguration* /* outConfig */)
+{
+}
+
+bool mia::EventFilterDispatcherPolicy::isKeyRepeatEnabled()
+{
+    return true;
+}
+
 bool mia::EventFilterDispatcherPolicy::filterInputEvent(const droidinput::InputEvent* input_event, uint32_t /*policy_flags*/)
 {
     MirEvent mir_ev;
@@ -42,3 +65,35 @@
 {
     policy_flags |= droidinput::POLICY_FLAG_PASS_TO_USER;
 }
+
+void mia::EventFilterDispatcherPolicy::interceptMotionBeforeQueueing(nsecs_t /* when */, uint32_t& /* policyFlags */)
+{
+    // TODO: Implement for motion events to client.
+}
+
+nsecs_t mia::EventFilterDispatcherPolicy::interceptKeyBeforeDispatching(
+    droidinput::sp<droidinput::InputWindowHandle> const& /* inputWindowHandle */, droidinput::KeyEvent const* /* keyEvent */, uint32_t /* policyFlags */)
+{
+    return 0;
+}
+
+bool mia::EventFilterDispatcherPolicy::dispatchUnhandledKey(droidinput::sp<droidinput::InputWindowHandle> const& /* inputWindowHandle */,
+                                                            droidinput::KeyEvent const* /* keyEvent */, uint32_t /* policyFlags */,
+                                                            droidinput::KeyEvent* /* outFallbackKeyEvent */)
+{
+    return false;
+}
+
+void mia::EventFilterDispatcherPolicy::notifySwitch(nsecs_t /* when */, int32_t /* switchCode */,
+                                                    int32_t /* switchValue */, uint32_t /* policyFlags */)
+{
+}
+
+void mia::EventFilterDispatcherPolicy::pokeUserActivity(nsecs_t /* eventTime */, int32_t /* eventType */)
+{
+}
+
+bool mia::EventFilterDispatcherPolicy::checkInjectEventsPermissionNonReentrant(int32_t /* injectorPid */, int32_t /* injectorUid */)
+{
+    return true;
+}

=== modified file 'src/server/input/android/event_filter_dispatcher_policy.h'
--- src/server/input/android/event_filter_dispatcher_policy.h	2013-03-13 04:54:15 +0000
+++ src/server/input/android/event_filter_dispatcher_policy.h	2013-04-08 18:25:26 +0000
@@ -18,9 +18,17 @@
 #ifndef MIR_EVENT_FILTER_DISPATCHER_POLICY_H_
 #define MIR_EVENT_FILTER_DISPATCHER_POLICY_H_
 
-#include "dummy_input_dispatcher_policy.h"
 #include "mir/input/event_filter.h"
 
+#include <InputDispatcher.h>
+
+namespace android
+{
+class InputEvent;
+}
+
+namespace droidinput = android;
+
 namespace mir
 {
 namespace input
@@ -29,16 +37,35 @@
 {
 //class EventFilter;
 
-class EventFilterDispatcherPolicy : public DummyInputDispatcherPolicy
+class EventFilterDispatcherPolicy : public droidinput::InputDispatcherPolicyInterface
 {
 public:
     EventFilterDispatcherPolicy(std::shared_ptr<EventFilter> const& event_filter);
     virtual ~EventFilterDispatcherPolicy() {}
 
-    virtual bool filterInputEvent(const droidinput::InputEvent* input_event,
-                          uint32_t policy_flags);
-    virtual void interceptKeyBeforeQueueing(const droidinput::KeyEvent* key_event,
-                                    uint32_t& policy_flags);
+    void notifyConfigurationChanged(nsecs_t when);
+    nsecs_t notifyANR(droidinput::sp<droidinput::InputApplicationHandle> const& inputApplicationHandle,
+        droidinput::sp<droidinput::InputWindowHandle> const& inputWindowHandle);
+    void notifyInputChannelBroken(droidinput::sp<droidinput::InputWindowHandle> const& inputWindowHandle);
+    bool filterInputEvent(const droidinput::InputEvent* input_event,
+        uint32_t policy_flags);
+    void interceptKeyBeforeQueueing(const droidinput::KeyEvent* key_event,
+        uint32_t& policy_flags);
+    void getDispatcherConfiguration(droidinput::InputDispatcherConfiguration* outConfig);
+    bool isKeyRepeatEnabled();
+    void interceptMotionBeforeQueueing(nsecs_t when, uint32_t& policyFlags);
+
+    nsecs_t interceptKeyBeforeDispatching(droidinput::sp<droidinput::InputWindowHandle> const& inputWindowHandle,
+        droidinput::KeyEvent const* keyEvent, uint32_t policyFlags);
+
+    bool dispatchUnhandledKey(droidinput::sp<droidinput::InputWindowHandle> const& inputWindowHandle,
+                              droidinput::KeyEvent const* keyEvent, uint32_t policyFlags,
+                              droidinput::KeyEvent* outFallbackKeyEvent);
+
+    void notifySwitch(nsecs_t when, int32_t switchCode, int32_t switchValue, uint32_t policyFlags);
+    void pokeUserActivity(nsecs_t eventTime, int32_t eventType);
+    bool checkInjectEventsPermissionNonReentrant(int32_t injectorPid, int32_t injectorUid);
+
 protected:
     EventFilterDispatcherPolicy(const EventFilterDispatcherPolicy&) = delete;
     EventFilterDispatcherPolicy& operator=(const EventFilterDispatcherPolicy&) = delete;

=== modified file 'tests/integration-tests/input/android/test_android_input_manager.cpp'
--- tests/integration-tests/input/android/test_android_input_manager.cpp	2013-04-02 18:26:40 +0000
+++ tests/integration-tests/input/android/test_android_input_manager.cpp	2013-04-08 18:25:26 +0000
@@ -22,7 +22,6 @@
 
 #include "src/server/input/android/default_android_input_configuration.h"
 #include "src/server/input/android/android_input_manager.h"
-#include "src/server/input/android/dummy_input_dispatcher_policy.h"
 #include "src/server/input/android/event_filter_dispatcher_policy.h"
 
 #include "mir_test/fake_shared.h"