[PointerMode] Pointer Mode removal 27/49027/4
authorKamil Nowac <k.nowac@samsung.com>
Mon, 5 Oct 2015 10:28:47 +0000 (12:28 +0200)
committerKamil Nowa? <k.nowac@samsung.com>
Mon, 5 Oct 2015 10:33:26 +0000 (03:33 -0700)
[Issue] https://bugs.tizen.org/jira/browse/TT-130
[Problem] Not needed feature
[Solution] N/A

Change-Id: Id3e2df1abe346d1c2575b915e1a906d73bb1b722
Signed-off-by: Kamil Nowac <k.nowac@samsung.com>
13 files changed:
services/BookmarkManagerUI/images/ic_more_pointermode_foc.png [deleted file]
services/BookmarkManagerUI/images/ic_more_pointermode_nor.png [deleted file]
services/MoreMenuUI/MoreMenuUI.cpp
services/MoreMenuUI/MoreMenuUI.h
services/MoreMenuUI/edc/MoreMenu.edc
services/MoreMenuUI/images/ic_more_pointermode_foc.png [deleted file]
services/MoreMenuUI/images/ic_more_pointermode_nor.png [deleted file]
services/PlatformInputManager/PlatformInputManager.cpp
services/PlatformInputManager/PlatformInputManager.h
services/SimpleUI/BookmarksManager.cpp
services/SimpleUI/BookmarksManager.h
services/SimpleUI/SimpleUI.cpp
services/SimpleUI/SimpleUI.h

diff --git a/services/BookmarkManagerUI/images/ic_more_pointermode_foc.png b/services/BookmarkManagerUI/images/ic_more_pointermode_foc.png
deleted file mode 100644 (file)
index 8785d75..0000000
Binary files a/services/BookmarkManagerUI/images/ic_more_pointermode_foc.png and /dev/null differ
diff --git a/services/BookmarkManagerUI/images/ic_more_pointermode_nor.png b/services/BookmarkManagerUI/images/ic_more_pointermode_nor.png
deleted file mode 100644 (file)
index 7a32e22..0000000
Binary files a/services/BookmarkManagerUI/images/ic_more_pointermode_nor.png and /dev/null differ
index 633f1bf..4b46641 100644 (file)
@@ -376,9 +376,6 @@ char* MoreMenuUI::_grid_text_get(void* data, Evas_Object*, const char* part)
                 item_name = "Start Mini Browser";
                 break;
 #endif
-            case FOCUS_MODE:
-                item_name = "Focus Mode";
-                break;
             case VIEW_MOBILE_WEB:
                 item_name = "View Mobile Web";
                 break;
@@ -426,9 +423,6 @@ static const char* getImageFileNameForType(ItemType type, bool focused)
         file_name = focused ? "ic_more_minibrowser_foc.png" : "ic_more_minibrowser_nor.png";
         break;
 #endif
-    case FOCUS_MODE:
-        file_name = focused ? "ic_more_focusmode_foc.png" : "ic_more_focusmode_nor.png";
-        break;
     case VIEW_MOBILE_WEB:
         file_name = focused ? "ic_more_mobileview_foc.png" : "ic_more_mobileview_nor.png";
         break;
@@ -534,8 +528,6 @@ void MoreMenuUI::_thumbSelected(void* data, Evas_Object*, void*)
             //TODO: Implement minibrowser launching
             break;
 #endif
-        case FOCUS_MODE:
-            break;
         case VIEW_MOBILE_WEB:
             itemData->moreMenuUI->switchToMobileMode();
             itemData->moreMenuUI->m_desktopMode = false;
index c8ed824..e9edc23 100644 (file)
@@ -44,7 +44,6 @@ enum ItemType {
 #ifdef START_MINIBROWSER_ENABLED
     START_MINIBROWSER,
 #endif
-    FOCUS_MODE,
     VIEW_MOBILE_WEB,
     VIEW_DESKTOP_WEB,
     SHARE,
index 4863286..05e9568 100644 (file)
@@ -36,7 +36,6 @@ RESOURCE_IMAGE_LOSSY("ic_more_bookmark_nor.png")
 RESOURCE_IMAGE_LOSSY("ic_more_history_nor.png")
 RESOURCE_IMAGE_LOSSY("ic_more_zoom_nor.png")
 RESOURCE_IMAGE_LOSSY("ic_more_minibrowser_nor.png")
-RESOURCE_IMAGE_LOSSY("ic_more_focusmode_nor.png")
 RESOURCE_IMAGE_LOSSY("ic_more_mobileview_nor.png")
 RESOURCE_IMAGE_LOSSY("ic_more_desktopview_nor.png")
 RESOURCE_IMAGE_LOSSY("ic_more_share_nor.png")
@@ -49,7 +48,6 @@ RESOURCE_IMAGE_LOSSY("ic_more_bookmark_foc.png")
 RESOURCE_IMAGE_LOSSY("ic_more_history_foc.png")
 RESOURCE_IMAGE_LOSSY("ic_more_zoom_foc.png")
 RESOURCE_IMAGE_LOSSY("ic_more_minibrowser_foc.png")
-RESOURCE_IMAGE_LOSSY("ic_more_focusmode_foc.png")
 RESOURCE_IMAGE_LOSSY("ic_more_mobileview_foc.png")
 RESOURCE_IMAGE_LOSSY("ic_more_desktopview_foc.png")
 RESOURCE_IMAGE_LOSSY("ic_more_share_foc.png")
diff --git a/services/MoreMenuUI/images/ic_more_pointermode_foc.png b/services/MoreMenuUI/images/ic_more_pointermode_foc.png
deleted file mode 100644 (file)
index 8785d75..0000000
Binary files a/services/MoreMenuUI/images/ic_more_pointermode_foc.png and /dev/null differ
diff --git a/services/MoreMenuUI/images/ic_more_pointermode_nor.png b/services/MoreMenuUI/images/ic_more_pointermode_nor.png
deleted file mode 100644 (file)
index 7a32e22..0000000
Binary files a/services/MoreMenuUI/images/ic_more_pointermode_nor.png and /dev/null differ
index 4fc5fbc..c163b32 100644 (file)
@@ -17,8 +17,6 @@
 
 #include "PlatformInputManager.h"
 
-//#include <X11/Xlib.h>
-//#include <utilX.h>
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <Ecore_Input.h>
@@ -40,11 +38,7 @@ namespace services
 
 EXPORT_SERVICE(PlatformInputManager, "org.tizen.browser.platforminputmanager")
 
-PlatformInputManager::PlatformInputManager() :
-    m_mouseMoveTimer(NULL),
-    m_moveMousePointer(false),
-    m_lastPressedKey(OTHER_KEY),
-    m_pointerModeEnabled(true)
+PlatformInputManager::PlatformInputManager()
 {
 
 }
@@ -53,14 +47,6 @@ void PlatformInputManager::init(Evas_Object* mainWindow)
 {
     M_ASSERT(mainWindow);
     ecore_event_filter_add(NULL, __filter, NULL, this);
-    m_xWindow = elm_win_xwindow_get(mainWindow);
-
-    // This snippet is needed to show mouse pointer all the time, because by default it is hidden after few seconds
-    //m_atomDevicemgrInputWindow = ecore_x_atom_get(E_PROP_DEVICEMGR_INPUTWIN);
-    //m_atomAlwaysCursorOn = ecore_x_atom_get(E_PROP_NOT_CURSOR_HIDE);
-    //if(!ecore_x_window_prop_window_get(ecore_x_window_root_first_get(), m_atomDevicemgrInputWindow, &m_devicemgr_win, 1))
-    //    BROWSER_LOGD("Failed to get device manager input window!");
-    //ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_IN, __handler_FOCUS_IN, this);
 }
 
 Eina_Bool PlatformInputManager::__filter(void *data, void */*loop_data*/, int type, void *event)
@@ -77,63 +63,6 @@ Eina_Bool PlatformInputManager::__filter(void *data, void */*loop_data*/, int ty
         BROWSER_LOGD("Pressed key: %s", ev->keyname);
         const std::string keyName = ev->keyname;
 
-        bool wasArrow = false;
-        /**
-         * In pointer mode arrow key events cause mouse pointer to move.
-         * For that each arrow key is handled by us.
-         * Pointer movement is realized in timer to achieve smooth animation of pointer's move.
-         */
-/*
-        if(self->m_pointerModeEnabled) {
-            wasArrow = true;
-            if (!keyName.compare("KEY_LEFT")) {
-                self->m_currentMouseMovementParams.xMod = -1;
-                self->m_currentMouseMovementParams.yMod = 0;
-            }
-            else if (!keyName.compare("KEY_RIGHT")) {
-                self->m_currentMouseMovementParams.xMod = 1;
-                self->m_currentMouseMovementParams.yMod = 0;
-            }
-            else if (!keyName.compare("KEY_UP")) {
-                self->m_currentMouseMovementParams.xMod = 0;
-                self->m_currentMouseMovementParams.yMod = -1;
-            }
-            else if (!keyName.compare("KEY_DOWN")) {
-                self->m_currentMouseMovementParams.xMod = 0;
-                self->m_currentMouseMovementParams.yMod = 1;
-            }
-            else
-                wasArrow = false;
-*/
-            /**
-            * If last pressed key was arrow we would like to convert Return key to mouse click
-            * assuming that user was moving cursor and now want to "click" chosen element.
-            * In other cases Return key is handled normally allowing for example to accecpt typed url.
-            */
-/*
-            if(!keyName.compare("KEY_ENTER")) {
-                if(self->m_lastPressedKey == ARROW) {
-                    self->m_lastPressedKey = RETURN;
-                    self->mouseButtonManipulate(Button1, ButtonPress);
-                    return EINA_FALSE;
-                }
-            }
-
-            if(wasArrow) {
-                self->m_lastPressedKey = ARROW;
-                if(!(self->m_mouseMoveTimer)) {
-                    self->m_currentMouseMovementParams.moveMousePointer = true;
-                    self->m_currentMouseMovementParams.counter = 0;
-                    self->m_currentMouseMovementParams.speed = 1;
-                    self->m_mouseMoveTimer = ecore_timer_add(MOUSE_POINTER_MOVE_DELAY, &PlatformInputManager::mouseMove, self);
-                }
-                return EINA_FALSE;
-            }
-        }
-*/
-
-        self->m_lastPressedKey= OTHER_KEY;
-
         /**
          * Because MENU button launches org.tizen.menu
          * we use blue 'D' button on remote control or F4 on keyboard as substitution of MENU button
@@ -143,25 +72,6 @@ Eina_Bool PlatformInputManager::__filter(void *data, void */*loop_data*/, int ty
             return EINA_FALSE;
         }
 
-//        if(!keyName.compare("KEY_CHANNELUP")){
-            /**
-             * Converting ChannelUp Button on remote control and Page Up key on keyboard to mouse's wheel up move.
-             * This is used to achieve same effect of scrolling web page using mouse, remote control and keyboard.
-             */
-//            self->mouseButtonManipulate(Button4, ButtonPress); // Simulate mouse wheel up movement
-//            self->mouseButtonManipulate(Button4, ButtonRelease);
-//            return EINA_FALSE;
-//        }
-
-//        if(!keyName.compare("KEY_CHANNELDOWN")){
-            /**
-             * Same as above ChannelDown and Page Down are replaced by mouse's wheel down movement.
-             */
-//            self->mouseButtonManipulate(Button5, ButtonPress); // Simulate mouse wheel down movement
-//            self->mouseButtonManipulate(Button5, ButtonRelease);
-//            return EINA_FALSE;
-//        }
-
         if(!keyName.compare("KEY_RETURN"))
             self->returnPressed();
         else if(!keyName.compare("KEY_LEFT"))
@@ -181,101 +91,9 @@ Eina_Bool PlatformInputManager::__filter(void *data, void */*loop_data*/, int ty
             return EINA_TRUE;
 
         BROWSER_LOGD("Released key: %s", ev->keyname);
-        const std::string keyName = ev->keyname;
-
-        /**
-         * When arrow key is released thread realizing pointer movement is stopped.
-         */
-//        if(self->m_pointerModeEnabled && (!keyName.compare("KEY_LEFT")||!keyName.compare("KEY_UP")
-//        || !keyName.compare("KEY_RIGHT")||!keyName.compare("KEY_DOWN"))) {
-//            if(self->m_mouseMoveTimer) {
-//                self->m_currentMouseMovementParams.moveMousePointer = false;
-//                ecore_timer_del(self->m_mouseMoveTimer);
-//                self->m_mouseMoveTimer = NULL;
-//            }
-//            return EINA_FALSE;
-//        }
-        /**
-         * If Return key is being released we send event that mouse button was released (in pointer mode).
-         */
-//        if(self->m_lastPressedKey == RETURN && self->m_pointerModeEnabled && !keyName.compare("KEY_ENTER")) {
-//            self->m_lastPressedKey = OTHER_KEY;
-//            self->mouseButtonManipulate(Button1, ButtonRelease);
-//            return EINA_FALSE;
-//        }
     }
     return EINA_TRUE;
 }
-/*
-Eina_Bool PlatformInputManager::mouseMove(void *data)
-{
-    int x, y;
-    PlatformInputManager *self = static_cast<PlatformInputManager*>(data);
-
-    if(self->m_currentMouseMovementParams.moveMousePointer) {
-        ecore_x_pointer_xy_get(self->m_xWindow, &x, &y);
-        x += self->m_currentMouseMovementParams.xMod * self->m_currentMouseMovementParams.speed;
-        y += self->m_currentMouseMovementParams.yMod * self->m_currentMouseMovementParams.speed;
-        ecore_x_pointer_warp(self->m_xWindow, x, y);
-        ecore_x_flush();
-
-        ++(self->m_currentMouseMovementParams.counter);
-        if(self->m_currentMouseMovementParams.counter == MOUSE_POINTER_STEPS) {
-            self->m_currentMouseMovementParams.counter = 0;
-            ++(self->m_currentMouseMovementParams.speed);
-        }
-        return EINA_TRUE;
-    }
-    return EINA_FALSE;
-}
-*/
-//Eina_Bool PlatformInputManager::__handler_FOCUS_IN(void *data, int /*type*/, void */*event*/)
-//{
-//    PlatformInputManager * self = reinterpret_cast<PlatformInputManager *>(data);
-//    ecore_x_window_prop_window_set(self->m_devicemgr_win, self->m_atomAlwaysCursorOn, &(self->m_xWindow), 1);
-//    return EINA_TRUE;
-//}
-/*
-void PlatformInputManager::mouseButtonManipulate(int button, int event_type)
-{
-    XEvent event;
-
-    Display *display = static_cast<Display*>(ecore_x_display_get());
-
-    memset(&event, 0x00, sizeof(event));
-
-    event.type = event_type;
-
-    if (event_type == ButtonRelease)
-        event.xbutton.state = 0x100;
-
-    event.xbutton.button = button;
-    event.xbutton.same_screen = True;
-
-    XQueryPointer(display, RootWindow(display, DefaultScreen(display)), &event.xbutton.root, &event.xbutton.window, &event.xbutton.x_root, &event.xbutton.y_root, &event.xbutton.x, &event.xbutton.y, &event.xbutton.state);
-
-    event.xbutton.subwindow = event.xbutton.window;
-
-    while (event.xbutton.subwindow) {
-        event.xbutton.window = event.xbutton.subwindow;
-
-        XQueryPointer(display, event.xbutton.window, &event.xbutton.root, &event.xbutton.subwindow, &event.xbutton.x_root, &event.xbutton.y_root, &event.xbutton.x, &event.xbutton.y, &event.xbutton.state);
-    }
-
-    XSendEvent(display, PointerWindow, True, 0xfff, &event);
-
-    XFlush(display);
-}
-*/
-void PlatformInputManager::setPointerModeEnabled(bool enabled)
-{
-    m_pointerModeEnabled = enabled;
-}
-
-bool PlatformInputManager::getPointerModeEnabled() const
-{
-    return m_pointerModeEnabled;
-}
 
 }
 }
index 63bbec2..0dc980e 100644 (file)
@@ -20,7 +20,6 @@
 #include <boost/signals2/signal.hpp>
 #include <boost/thread/thread.hpp>
 #include <Ecore.h>
-//#include <Ecore_X.h>
 #include <Eina.h>
 #include <Elementary.h>
 
@@ -61,19 +60,7 @@ public:
      */
     virtual std::string getName();
 
-    /**
-     * @brief Enables/disables pointer mode.
-     */
-    void setPointerModeEnabled(bool enabled);
-
-    /**
-     * @brief Returns if poiner mode is enabled.
-     */
-    bool getPointerModeEnabled() const;
-
 private:
-    enum LastPressedKey {ARROW, RETURN, OTHER_KEY};
-
     /**
      * @brief Struct holding parameters of mouse movement.
      * It is used in pointer mode to simulate mouse move after pressing arrows.
@@ -88,33 +75,6 @@ private:
      * @brief It process every input event and handles it if necessary.
      */
     static Eina_Bool __filter(void */*data*/, void */*loop_data*/, int /*type*/, void */*event*/);
-
-    /**
-     * @brief This callback prevent mouse cursor from disappearing.
-     */
-    static Eina_Bool __handler_FOCUS_IN(void *data, int type, void *event);
-
-    /**
-     * @brief Moves mouse cursor on screen according to passed params. Called in timer.
-     */
-    static Eina_Bool mouseMove(void *data);
-
-    /**
-     * @brief Allows to simulate mouse button presses and releases.
-     * @param button Button identifier from Xlib.h
-     * @param event_type Event identifier from Xlib.h
-     */
-    void mouseButtonManipulate(int button, int event_type);
-
-    Ecore_X_Window m_xWindow;
-    Ecore_X_Window m_devicemgr_win;
-    Ecore_X_Atom m_atomDevicemgrInputWindow;
-    Ecore_X_Atom m_atomAlwaysCursorOn;
-    MouseMovementParams m_currentMouseMovementParams;
-    Ecore_Timer *m_mouseMoveTimer;
-    bool m_moveMousePointer;
-    LastPressedKey m_lastPressedKey;
-    bool m_pointerModeEnabled;
 };
 
 }
index 8d82016..0f08b41 100644 (file)
@@ -64,7 +64,6 @@ BookmarksManager::BookmarksManager(std::shared_ptr< Evas_Object > mainWindow, Ev
     , m_itemClass(nullptr)
     , m_internalPopup(nullptr)
     , m_internalPopupVisible(false)
-    , m_pointerModeEnabled(true)
 {
     std::string edjFilePath = EDJE_DIR;
     edjFilePath.append("SimpleUI/BookmarksManager.edj");
@@ -342,8 +341,7 @@ void BookmarksManager::showInternalPopup(Elm_Object_Item* listItem)
 
     elm_object_style_set(m_internalPopup, "bookmarks_manager_button");
     evas_object_show(m_internalPopup);
-    if(!m_pointerModeEnabled)
-        elm_object_focus_set(radioOn, EINA_TRUE);
+    elm_object_focus_set(radioOn, EINA_TRUE);
     elm_object_item_signal_emit(m_trackedItem, "selected", "BookmarksManagerModel");
     elm_object_signal_emit(m_genlist, "show_popup", "BookmarksManagerModel");
 }
@@ -390,11 +388,6 @@ void BookmarksManager::unFocusItem(void* /*data*/, Evas_Object* /*obj*/, void* e
     elm_object_item_signal_emit( item, "mouse,out", "option*");
 }
 
-void BookmarksManager::setPointerModeEnabled (bool enabled)
-{
-    m_pointerModeEnabled = enabled;
-}
-
 bool BookmarksManager::canBeDismissed()
 {
     BROWSER_LOGD("[%s]", __func__);
index b2dbde0..6ebe1e0 100644 (file)
@@ -54,7 +54,6 @@ public:
     void addAction(sharedAction action);
     void onEnabledChanged(sharedAction action);
     void refreshAction(sharedAction action);
-    void setPointerModeEnabled (bool enabled);
     void showPopup();
     void hidePopup();
     bool isPopupShown();
@@ -76,7 +75,6 @@ private:
     Elm_Object_Item *m_trackedItem;
     Elm_Genlist_Item_Class *m_itemClass;
     bool m_internalPopupVisible;
-    bool m_pointerModeEnabled;
     std::map<Elm_Object_Item*, std::shared_ptr<BookmarksManagerItem>> m_bookmarks_managerItemsMap;
     std::map<sharedAction, Elm_Object_Item*> m_actionButtonMap;
     enum CheckState{
index 4827b3d..d0a29f6 100644 (file)
@@ -887,11 +887,6 @@ void SimpleUI::closeBookmarkManagerUI()
     m_viewManager->popTheStack();
 }
 
-void SimpleUI::settingsPointerModeSwitch(bool newState)
-{
-    BROWSER_LOGD("%s: Setting Pointer mode to:%s", __func__, (newState ? "true" : "false"));
-}
-
 void SimpleUI::settingsPrivateModeSwitch(bool newState)
 {
     BROWSER_LOGD("%s: Setting Private mode to: %s", __func__, (newState ? "true" : "false"));
index 40d836d..5b62197 100644 (file)
@@ -200,7 +200,6 @@ private:
     void closeTab();
     void closeTab(const tizen_browser::basic_webengine::TabId& id);
 
-    void settingsPointerModeSwitch(bool newState);
     void settingsPrivateModeSwitch(bool newState);
     void settingsDeleteSelectedData(const std::string& str);
     void settingsResetMostVisited();