Merge lp:~aacid/unity-2d/unity-2d-shell_rtl into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

[shell] Bring back shell to the level of RTL that current unity-2d has

Everything i can find that is missing RTL wise now seems to be fixed at https://code.launchpad.net/~haggai-eran/unity-2d/rtl-rebased/+merge/82151

[Michał Sawicz (saviq)]

The dash corner input mask needs to be moved and flipped horizontally.

review: Needs Fixing

[lp:~aacid/unity-2d/unity-2d-shell_rtl]

942. By Albert Astals Cid on 2012-01-27

These comments were MIA for some reason D

[Gerry Boland (gerboland)]

Lots of your tests fail for people on MM setups, because the TmpWindow you open at (XDo::XWindow.display_geometry[0] - 10,100) is shoved to the next monitor by Metacity, and so don't overlap the Launcher.

Could you do the maths like in test "Move window positioning to check launcher action" as that one works perfectly.

Also some of your comments don't match what's going on, e.g.:

+ # Open Terminal with position 40x100
+ xid = TmpWindow.open_window_at(XDo::XWindow.display_geometry[0] - 40, 100)

Aside from these things, everything looks good!

review: Needs Fixing

[lp:~aacid/unity-2d/unity-2d-shell_rtl]

943. By Albert Astals Cid on 2012-01-30

Use a different way to overlap the windows with the launcher, should work on multimonitor according to Gerry

944. By Albert Astals Cid on 2012-01-30

Return the image with the whole desktop size

945. By Albert Astals Cid on 2012-01-30

adapt to new getshape output

946. By Albert Astals Cid on 2012-01-30

merge

947. By Albert Astals Cid on 2012-01-30

Add a workaround for home shortcuts in rtl, need it so tests pass since need to click on the [x] button

948. By Albert Astals Cid on 2012-01-30

Implement mirroring

It can be made more performant but works for now

949. By Albert Astals Cid on 2012-01-30

Add the shaping rtl tests

950. By Albert Astals Cid on 2012-01-30

Use sut and other small other tools from xdotool

951. By Albert Astals Cid on 2012-01-30

Output the file in stdout if outputfilename is -

952. By Albert Astals Cid on 2012-01-30

Make getshape work in target/host divide

953. By Albert Astals Cid on 2012-01-30

Fix anchoring in rtl

954. By Albert Astals Cid on 2012-01-30

Abstract shaping tests, they are the same wheter rtl or not, just one extra if, no need to copy the code twice

955. By Albert Astals Cid on 2012-01-30

Tauler -> Dash home

956. By Albert Astals Cid on 2012-01-30

Add header

957. By Albert Astals Cid on 2012-01-30

abstract stuff so we don't have almost the same code twice

958. By Albert Astals Cid on 2012-01-30

Make it work from run-tests.rb

959. By Albert Astals Cid on 2012-01-30

Remove one space too many

[Albert Astals Cid (aacid)]

Ok, i think it is ready to be reviewed again, all comments are fixed (i hope :D)

[Lohith D Shivamurthy (dyams)]

Hey, In his branch Haggai has swapped the left-right cursor keys while navigating in Dash. It is RTL requirement i believe.

review: Needs Information

[Lohith D Shivamurthy (dyams)]

Hey, it works great overall. :)

[Albert Astals Cid (aacid)]

@Lohith: This does not try to fix ALL of the RTL issues, just makes the shell work as unity-2d non-shell was working, as I say in the description most of Haggai's patch is still needed.

[Michał Sawicz (saviq)]

Wow that's a huge work on the tests, kudos!

One thing I noticed from the diff - instead of commenting out the printf(), maybe you could write it to stderr? Or just drop that line completely.

review: Needs Fixing

[lp:~aacid/unity-2d/unity-2d-shell_rtl]

960. By Albert Astals Cid on 2012-01-31

Drop the printf as suggested in the MR

[Albert Astals Cid (aacid)]

I've dropped the printf since execute_shell_command also returns what is written to stderr.

[lp:~aacid/unity-2d/unity-2d-shell_rtl]

961. By Albert Astals Cid on 2012-01-31

merge

962. By Albert Astals Cid on 2012-02-01

merge

[Gerry Boland (gerboland)]

Could you please my name from the copyright notices please?

The input_shaping tests needs small fixes:
- please rename input_shaping_tests.rb to input_shaping_common.rb
- please fix the require path to shell/input_shaping_common.rb. It's currently pointing to autohide stuff for the launcher.
- could you also please change
verify_true(10, "The actual shape does not match the expected shape") { identical }
to assert statements? If identical is false, it will wait 10 seconds before throwing a fail.

review: Needs Fixing

[Albert Astals Cid (aacid)]

Removed the names of the copyright notices, except a few ones that will come once https://code.launchpad.net/~aacid/unity-2d/unity-2d_tests_for_rtl/+merge/90849 is merged (and this one will ultraconflict with it)

Also instead of changing to "assert" changed to "verify_true(0," that was an easier change, hope you're ok with that.

[lp:~aacid/unity-2d/unity-2d-shell_rtl]

963. By Albert Astals Cid on 2012-02-01

Fixes comming for the MR discussion

[Michał Sawicz (saviq)]

* Launcher.qml
  * please move the monitoredArea Binding up into LauncherLoader.qml
* input_shaping.rb
  * you removed the Authors completely, was that on purpose?
  * we need to kill panel twice, too
  * @@panel args are not indented properly

review: Needs Fixing

[Michał Sawicz (saviq)]

* input_shaping.rb
  * wrong path to autohide_show_tests_common.rb

[Michał Sawicz (saviq)]

We need to wait for https://code.launchpad.net/~aacid/unity-2d/unity-2d_tests_for_rtl/+merge/90849 to be merged first and rebase this afterwards.

review: Abstain

[lp:~aacid/unity-2d/unity-2d-shell_rtl]

964. By Albert Astals Cid on 2012-02-03

merge

965. By Albert Astals Cid on 2012-02-03

fix path

966. By Albert Astals Cid on 2012-02-03

Kill panel twice and indent second line of args for @@panel better

[Albert Astals Cid (aacid)]

Requested fixes implemented

[lp:~aacid/unity-2d/unity-2d-shell_rtl]

967. By Albert Astals Cid on 2012-02-03

Move the monitoredArea binding up to LauncherLoader

968. By Albert Astals Cid on 2012-02-03

merge

[Albert Astals Cid (aacid)]

The merge for "tests/launcher/autohide_show_tests_common.rb" and the rtl version look crazy, something is getting confused here, have a look at the individual commits (i.e. r969) to see what is happening there.

[lp:~aacid/unity-2d/unity-2d-shell_rtl]

969. By Albert Astals Cid on 2012-02-06

Merge

[Albert Astals Cid (aacid)]

Repushed a remerge to get a much nicer diff on tests/launcher/ files

[lp:~aacid/unity-2d/unity-2d-shell_rtl]

970. By Albert Astals Cid on 2012-02-06

Make getshape still write to a file and copy it over

It is safer since execute_shell_command also returns stuff from stdout and Gerry was getting some warnings that "broke" his PNG file

971. By Albert Astals Cid on 2012-02-06

Merge

[Gerry Boland (gerboland)]

Ok, I'm happy to approve this for merging! Nice one

review: Approve

=== modified file 'libunity-2d-private/src/inputshaperectangle.cpp'
--- libunity-2d-private/src/inputshaperectangle.cpp	2012-01-12 18:47:24 +0000
+++ libunity-2d-private/src/inputshaperectangle.cpp	2012-02-06 16:36:19 +0000
@@ -9,7 +9,8 @@
 
 InputShapeRectangle::InputShapeRectangle(QObject *parent) :
     QObject(parent),
-    m_enabled(true)
+    m_enabled(true),
+    m_mirrorHorizontally(false)
 {
 }
 
@@ -29,6 +30,10 @@
         }
     }
 
+    if (m_mirrorHorizontally) {
+        newShape = QBitmap::fromImage(newShape.toImage().mirrored(true, false));
+    }
+
     m_shape = newShape;
     Q_EMIT shapeChanged();
 }
@@ -71,6 +76,16 @@
     return QDeclarativeListProperty<InputShapeMask>(this, this, &InputShapeRectangle::appendMask);
 }
 
+bool InputShapeRectangle::mirrorHorizontally() const
+{
+    return m_mirrorHorizontally;
+}
+
+void InputShapeRectangle::setMirrorHorizontally(bool mirror)
+{
+    m_mirrorHorizontally = mirror;
+}
+
 void InputShapeRectangle::appendMask(QDeclarativeListProperty<InputShapeMask> *list, InputShapeMask *mask)
 {
     InputShapeRectangle* instance = qobject_cast<InputShapeRectangle*>(list->object);

=== modified file 'libunity-2d-private/src/inputshaperectangle.h'
--- libunity-2d-private/src/inputshaperectangle.h	2012-01-12 18:47:24 +0000
+++ libunity-2d-private/src/inputshaperectangle.h	2012-02-06 16:36:19 +0000
@@ -14,6 +14,7 @@
     Q_OBJECT
     Q_PROPERTY(QRect rectangle READ rectangle WRITE setRectangle NOTIFY rectangleChanged)
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
+    Q_PROPERTY(bool mirrorHorizontally READ mirrorHorizontally WRITE setMirrorHorizontally)
     Q_PROPERTY(QBitmap shape READ shape NOTIFY shapeChanged)
     Q_PROPERTY(QDeclarativeListProperty<InputShapeMask> masks READ masks)
     Q_CLASSINFO("DefaultProperty", "masks")
@@ -27,6 +28,8 @@
     void setEnabled(bool enabled);
     QBitmap shape() const;
     QDeclarativeListProperty<InputShapeMask> masks();
+    bool mirrorHorizontally() const;
+    void setMirrorHorizontally(bool mirror);
 
 protected:
     static void appendMask(QDeclarativeListProperty<InputShapeMask> *list, InputShapeMask *mask);
@@ -42,6 +45,7 @@
 private:
     QRect m_rectangle;
     bool m_enabled;
+    bool m_mirrorHorizontally;
     QBitmap m_shape;
     QList<InputShapeMask*> m_masks;
 };

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-02-03 16:20:38 +0000
+++ shell/Shell.qml	2012-02-06 16:36:19 +0000
@@ -33,7 +33,13 @@
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         width: 65
-        x: visibilityController.shown ? 0 : -width
+        x: {
+            if (Utils.isLeftToRight()) {
+                return visibilityController.shown ? 0 : -width
+            } else {
+                return visibilityController.shown ? screen.availableGeometry.width - width : screen.availableGeometry.width
+            }
+        }
 
         KeyNavigation.right: dashLoader
 
@@ -78,7 +84,7 @@
         id: dashLoader
         source: "dash/Dash.qml"
         anchors.top: parent.top
-        x: launcherLoader.width
+        x: Utils.isLeftToRight() ? launcherLoader.width : screen.availableGeometry.width - width - launcherLoader.width
         onLoaded: item.focus = true
         opacity: item.active ? 1.0 : 0.0
         focus: item.active
@@ -119,13 +125,24 @@
         target: declarativeView
 
         InputShapeRectangle {
-            // Prevent the launcher mask to ever go to negative values or be less than 1 pixel
-            // (to preserve the autohide/intellihide edge detection)
-            // FIXME: this results in a 1px wide white rectangle on the launcher edge, we should switch
-            //        to cpp-based edge detection, and later XFixes barriers to get rid of that completely
-            rectangle: Qt.rect(0, launcherLoader.y,
-                               -launcherLoader.x < launcherLoader.width ? launcherLoader.x + launcherLoader.width : 1,
-                               launcherLoader.height)
+            rectangle: {
+                // FIXME: this results in a 1px wide white rectangle on the launcher edge, we should switch
+                //        to cpp-based edge detection, and later XFixes barriers to get rid of that completely
+                var somewhatShown = Utils.isLeftToRight() ? -launcherLoader.x < launcherLoader.width : launcherLoader.x < screen.availableGeometry.width
+                if (somewhatShown) {
+                    return Qt.rect(launcherLoader.x,
+                                   launcherLoader.y,
+                                   launcherLoader.width,
+                                   launcherLoader.height)
+                } else {
+                    // The outerEdgeMouseArea is one pixel bigger on each side so use it
+                    // when the launcher is hidden to have that extra pixel in the border
+                    return Qt.rect(launcherLoader.x + launcherLoader.outerEdgeMouseArea.x,
+                                   launcherLoader.y,
+                                   launcherLoader.outerEdgeMouseArea.width,
+                                   launcherLoader.height)
+                }
+            }
             enabled: launcherLoader.status == Loader.Ready
         }
 
@@ -136,6 +153,7 @@
                 Qt.rect(dashLoader.x, dashLoader.y, dashLoader.width - 7, dashLoader.height - 9)
             }
             enabled: dashLoader.status == Loader.Ready && dashLoader.item.active
+            mirrorHorizontally: Utils.isRightToLeft()
 
             InputShapeMask {
                 id: shape1

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-02-06 12:21:57 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-02-06 16:36:19 +0000
@@ -64,9 +64,7 @@
     , m_superKeyHeld(false)
 {
     setAttribute(Qt::WA_X11NetWmWindowTypeDock, true);
-    /* Respect the struts manually because the window manager does not enforce struts
-       on dock windows */
-    move(QApplication::desktop()->availableGeometry(QX11Info::appScreen()).topLeft());
+    updateShellPosition(QX11Info::appScreen());
 
     setTransparentBackground(QX11Info::isCompositingManagerRunning());
 
@@ -101,7 +99,11 @@
 ShellDeclarativeView::updateShellPosition(int screen)
 {
     if (screen == QX11Info::appScreen()) {
-        QPoint posToMove = QApplication::desktop()->availableGeometry(screen).topLeft();
+        const QRect availableGeometry = QApplication::desktop()->availableGeometry(screen);
+        QPoint posToMove = availableGeometry.topLeft();
+        if (qApp->isRightToLeft()) {
+            posToMove.setX(availableGeometry.width() - width());
+        }
 
         StrutManager *strutManager = rootObject()->findChild<StrutManager*>();
         if (strutManager && strutManager->enabled()) {
@@ -112,7 +114,11 @@
                 break;
 
                 case Unity2dPanel::LeftEdge:
-                    posToMove.rx() -= strutManager->realWidth();
+                    if (qApp->isLeftToRight()) {
+                        posToMove.rx() -= strutManager->realWidth();
+                    } else {
+                        posToMove.rx() += strutManager->realWidth();
+                    }
                 break;
             }
         }
@@ -137,6 +143,13 @@
 }
 
 void
+ShellDeclarativeView::resizeEvent(QResizeEvent *event)
+{
+    updateShellPosition(QX11Info::appScreen());
+    Unity2DDeclarativeView::resizeEvent(event);
+}
+
+void
 ShellDeclarativeView::setWMFlags()
 {
     Display *display = QX11Info::display();

=== modified file 'shell/app/shelldeclarativeview.h'
--- shell/app/shelldeclarativeview.h	2012-02-03 16:24:03 +0000
+++ shell/app/shelldeclarativeview.h	2012-02-06 16:36:19 +0000
@@ -107,6 +107,7 @@
     virtual void showEvent(QShowEvent *event);
     virtual void mouseMoveEvent(QMouseEvent *event);
     virtual void leaveEvent(QEvent *event);
+    virtual void resizeEvent(QResizeEvent *event);
 
 private Q_SLOTS:
     void updateShellPosition(int screen);

=== modified file 'shell/common/utils.js'
--- shell/common/utils.js	2012-02-06 12:07:47 +0000
+++ shell/common/utils.js	2012-02-06 16:36:19 +0000
@@ -36,3 +36,11 @@
     for (var key in hash) return false;
     return true
 }
+
+function isLeftToRight() {
+    return Qt.application.layoutDirection == Qt.LeftToRight
+}
+
+function isRightToLeft() {
+    return Qt.application.layoutDirection == Qt.RightToLeft
+}

=== modified file 'shell/dash/HomeShortcuts.qml'
--- shell/dash/HomeShortcuts.qml	2011-11-25 15:44:18 +0000
+++ shell/dash/HomeShortcuts.qml	2012-02-06 16:36:19 +0000
@@ -29,6 +29,13 @@
     Grid {
         id: buttons
 
+        // TODO The alignment here is broken in RTL but Gerry says it's going away so we
+        //      do not care about it. Don't ask me why this transparent rectangle fixes it
+        Rectangle {
+            anchors.fill: parent
+            opacity: 0
+        }
+
         anchors.fill: parent
         spacing: 51
         columns: 4

=== modified file 'shell/launcher/IntelliHideBehavior.qml'
--- shell/launcher/IntelliHideBehavior.qml	2012-01-24 16:58:28 +0000
+++ shell/launcher/IntelliHideBehavior.qml	2012-02-06 16:36:19 +0000
@@ -1,6 +1,7 @@
 import QtQuick 1.0
 import Unity2d 1.0
 import "../common"
+import "../common/utils.js" as Utils
 
 BaseBehavior {
     id: intellihide
@@ -50,9 +51,22 @@
 
     WindowsIntersectMonitor {
         id: windows
-        monitoredArea: intellihide.target ? Qt.rect(0, intellihide.target.y,
-                                                    intellihide.target.width,
-                                                    intellihide.target.height)
-                                          : Qt.rect(0, 0, 0, 0)
+        monitoredArea: {
+            if (intellihide.target) {
+                if (Utils.isLeftToRight()) {
+                    return Qt.rect(0,
+                                   intellihide.target.y,
+                                   intellihide.target.width,
+                                   intellihide.target.height)
+                } else {
+                    return Qt.rect(screen.availableGeometry.width - intellihide.target.width,
+                                   intellihide.target.y,
+                                   intellihide.target.width,
+                                   intellihide.target.height)
+                }
+            } else {
+                return Qt.rect(0, 0, 0, 0)
+            }
+        }
     }
 }

=== modified file 'shell/launcher/Launcher.qml'
--- shell/launcher/Launcher.qml	2012-01-19 14:22:10 +0000
+++ shell/launcher/Launcher.qml	2012-02-06 16:36:19 +0000
@@ -29,11 +29,6 @@
     property bool shown
     property bool showMenus: true
 
-    Binding {
-        target: declarativeView
-        property: "monitoredArea"
-        value: Qt.rect(launcher.x, launcher.y, launcher.width, launcher.height)
-    }
     property bool containsMouse: declarativeView.monitoredAreaContainsMouse
 
     function hideMenu() {
@@ -81,7 +76,8 @@
 
         width: 1
         height: parent.height
-        anchors.right: parent.right
+        anchors.right: Utils.isLeftToRight() ? parent.right : undefined
+        anchors.left:  Utils.isLeftToRight() ? undefined : parent.left
         fillMode: Image.TileVertically
         source: "artwork/background.png"
     }

=== modified file 'shell/launcher/LauncherLoader.qml'
--- shell/launcher/LauncherLoader.qml	2012-01-24 14:13:36 +0000
+++ shell/launcher/LauncherLoader.qml	2012-02-06 16:36:19 +0000
@@ -8,6 +8,7 @@
     source: "Launcher.qml"
     property variant visibilityController: visibilityController
     onLoaded: item.focus = true
+    property alias outerEdgeMouseArea: outerEdge
 
     VisibilityController {
         id: visibilityController
@@ -32,6 +33,13 @@
     }
 
     Binding {
+        target: declarativeView
+        property: "monitoredArea"
+        value: Qt.rect(launcherLoader.x, launcherLoader.item.y, launcherLoader.item.width, launcherLoader.item.height)
+        when: launcherBehavior.status == Loader.Ready
+    }
+
+    Binding {
         target: launcherBehavior.item
         property: "forcedVisible"
         value: visibilityController.forceVisible

=== modified file 'tests/getshape/getshape.cpp'
--- tests/getshape/getshape.cpp	2012-01-19 16:02:51 +0000
+++ tests/getshape/getshape.cpp	2012-02-06 16:36:19 +0000
@@ -25,6 +25,9 @@
 #include <QStringList>
 
 #include <QBitmap>
+#include <QDesktopWidget>
+#include <QFile>
+#include <QImageWriter>
 #include <QRegion>
 #include <QPainter>
 #include <QPainterPath>
@@ -80,19 +83,45 @@
 
     for (int i = 0; i < count; i++) {
         region = region.united(QRect(rects[i].x, rects[i].y, rects[i].width, rects[i].height));
-
-        printf("%dx%d@%d,%d", rects[i].width, rects[i].height, rects[i].x, rects[i].y);
     }
 
     if (!outputFile.isEmpty()) {
-        QBitmap bitmap(region.boundingRect().width(), region.boundingRect().height());
+        Atom actual_type;
+        int actual_format;
+        unsigned long nitems, bytes_after;
+        unsigned char *data;
+        const Atom atom = XInternAtom(QX11Info::display(), "_NET_WM_DESKTOP", False);
+        const int status = XGetWindowProperty(QX11Info::display(), windowId, atom, 0, (~0L),
+                                              False, AnyPropertyType, &actual_type,
+                                              &actual_format, &nitems, &bytes_after,
+                                              &data);
+        int desktop = -1;
+        if (status == Success) {
+            if (nitems == 1) {
+                desktop = *((int*)data);
+            }
+            free(data);
+        }
+  
+        const QDesktopWidget dw;
+        QBitmap bitmap(dw.availableGeometry(desktop).size());
         bitmap.fill(Qt::color0);
         QPainter painter(&bitmap);
         QPainterPath path;
         path.addRegion(region);
         painter.fillPath(path, Qt::color1);
         painter.end();
-        if (!bitmap.save(outputFile)) {
+
+        if (outputFile == "-") {
+            QFile f;
+            if (!f.open(stdout, QIODevice::WriteOnly)) {
+                return 4;
+            }
+            QImageWriter writer(&f, "PNG");
+            if (!writer.write(bitmap.toImage())) {
+                return 5;
+            }
+        } else if (!bitmap.save(outputFile)) {
             qWarning() << "Failed to save file with path:" << outputFile;
             return 3;
         }

=== modified file 'tests/launcher/autohide_show_tests.rb'
--- tests/launcher/autohide_show_tests.rb	2012-02-06 12:07:47 +0000
+++ tests/launcher/autohide_show_tests.rb	2012-02-06 16:36:19 +0000
@@ -146,11 +146,11 @@
     test_alt_f1_focus_unfocus_launcher()
   end
 
-  xtest "Press Alt+F1, esc to focus/unfocus Launcher when dash is open" do
+  test "Press Alt+F1, esc to focus/unfocus Launcher when dash is open" do
     test_alt_f1_esc_focus_unfocus_launcher_when_dash_open()
   end
 
-  xtest "Press Alt+F1 to focus Launcher when dash is open, Alt+F1 to unfocus" do
+  test "Press Alt+F1 to focus Launcher when dash is open, Alt+F1 to unfocus" do
     test_alt_f1_toggle_focus_launcher_when_dash_open()
   end
 

=== modified file 'tests/launcher/autohide_show_tests_rtl.rb'
--- tests/launcher/autohide_show_tests_rtl.rb	2012-02-06 12:07:47 +0000
+++ tests/launcher/autohide_show_tests_rtl.rb	2012-02-06 16:36:19 +0000
@@ -111,63 +111,63 @@
   #####################################################################################
   # Test cases
 
-  xtest "Position with Empty Desktop" do
+  test "Position with Empty Desktop" do
     test_position_with_empty_desktop()
   end
 
-  xtest "Position with Window not in the way" do
+  test "Position with Window not in the way" do
     test_position_width_window_not_in_the_way()
   end
 
-  xtest "Position with Window in the way" do
+  test "Position with Window in the way" do
     test_position_with_window_in_the_way()
   end
 
-  xtest "Move window positioning to check launcher action" do
+  test "Move window positioning to check launcher action" do
     test_move_window_positioning_to_check_launcher_action()
   end
 
-  xtest "Reveal hidden Launcher with mouse" do
+  test "Reveal hidden Launcher with mouse" do
     test_reveal_hidden_launcher_with_mouse()
   end
 
-  xtest "Press Super key to toggle launcher" do
+  test "Press Super key to toggle launcher" do
     test_press_super_to_toggle_launcher()
   end
 
-  xtest "Hold Super key down to reveal launcher and shortcut keys" do
+  test "Hold Super key down to reveal launcher and shortcut keys" do
     test_hold_super_launcher_shortcuts()
   end
 
-  xtest "Press Alt+F1 to focus Launcher" do
+  test "Press Alt+F1 to focus Launcher" do
     test_alt_f1_focus_launcher()
   end
 
-  xtest "Press Alt+F1 to focus/unfocus Launcher" do
+  test "Press Alt+F1 to focus/unfocus Launcher" do
     test_alt_f1_focus_unfocus_launcher()
   end
 
-  xtest "Press Alt+F1, esc to focus/unfocus Launcher when dash is open" do
+  test "Press Alt+F1, esc to focus/unfocus Launcher when dash is open" do
     test_alt_f1_esc_focus_unfocus_launcher_when_dash_open()
   end
 
-  xtest "Press Alt+F1 to focus Launcher when dash is open, Alt+F1 to unfocus" do
+  test "Press Alt+F1 to focus Launcher when dash is open, Alt+F1 to unfocus" do
     test_alt_f1_toggle_focus_launcher_when_dash_open()
   end
 
-  xtest "Launcher visible on show-desktop" do
+  test "Launcher visible on show-desktop" do
     test_launcher_visible_show_desktop()
   end
 
-  xtest "Launcher hide delay on tile removal" do
+  test "Launcher hide delay on tile removal" do
     test_launcher_hide_delay_on_tile_removal()
   end
 
-  xtest "Launcher visible after toggling dash" do
+  test "Launcher visible after toggling dash" do
     test_launcher_visible_after_toggling_dash()
   end
 
-  xtest "Launcher does not hide on Esc after Alt+F1 with overlapping window" do
+  test "Launcher does not hide on Esc after Alt+F1 with overlapping window" do
     test_launcher_does_not_hide_on_esc_after_alt_f1_with_overlapping_window()
   end
 

=== modified file 'tests/shell/input_shaping.rb'
--- tests/shell/input_shaping.rb	2012-02-06 12:07:47 +0000
+++ tests/shell/input_shaping.rb	2012-02-06 16:36:19 +0000
@@ -5,10 +5,6 @@
  *
  * Copyright 2011 Canonical Ltd.
  *
- * Authors:
- * - Ugo Riboni <[e-mail]>
- * - Gerry Boland <[e-mail]>
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 3.
@@ -30,72 +26,24 @@
 require 'timeout'
 require 'tmpdir'
 require 'tempfile'
+require $library_path + '/../../shell/input_shaping_common.rb'
+
 include TDriverVerify
 
-def desktop_geometry
-    out = %x{xdotool getdisplaygeometry}
-    return out.split.collect { |coord| coord.to_i }
-end
-
-# We just need a temp file name but ruby insist on creating it, so we just delete it first.
-def tempfilename(base, extension = ".tmp")
-    maskfile = Tempfile.new([base, extension])
-    maskpath = maskfile.path
-    maskfile.close
-    maskfile.unlink
-    return maskpath
-end
-
-def get_shell_shape
-    pwd = File.expand_path(File.dirname(__FILE__))
-
-    # Try to find the shell window
-    shell_ids = XDo::XWindow::search('unity-2d-shell')
-    assert(!shell_ids.empty?, "Failed to retrieve the shell window id")
-    shell_id = shell_ids[0]
-
-    # Get the shape of the shell window using our custom tool
-    maskpath = tempfilename('shape', '.png')
-    out = %x{#{BINARY_DIR}/tests/getshape/getshape #{shell_id} #{maskpath}}
-    assert($?.exitstatus == 0, "Failed to call getshape to get the shape of the window")
-    return maskpath
-end
-
-# Compare two images using ImageMagick. Perform a pixel-by-pixel comparison and return true
-# only if all the pixels are identical.
-def compare_images(image1, image2)
-    # Before checking the pixels make sure the two images are the same size, otherwise some times
-    # IM will hang for a long time (probably trying to do some super clever subimage matching).
-    size1 = %x{identify -format '%wx%h' #{image1}}
-    size2 = %x{identify -format '%wx%h' #{image2}}
-    return false if size1 != size2
-
-    # Discard the difference image and redirect stderr to stdout as IM will output the number of
-    # different pixels there for some reason.
-    difference = %x{compare #{image1} #{image2} -metric AE /dev/null 2>&1}.chop.to_i
-
-    # If the images are too different or have different sizes IM will exit with return code 1.
-    # Unfortunately it's the same code we have when there is any error (like a wrong filename),
-    # so the best we can do is just return false
-    return false if $?.exitstatus != 0
-
-    return difference == 0
-end
-
 ############################# Test Suite #############################
 context "Shell input shape tests" do
   pwd = File.expand_path(File.dirname(__FILE__)) + '/'
 
   # Run once at the beginning of this test suite
   startup do
-    system 'killall unity-2d-shell > /dev/null 2>&1'
-    system 'killall unity-2d-shell > /dev/null 2>&1'
-    system 'killall unity-2d-panel > /dev/null 2>&1'
+    $SUT.execute_shell_command 'killall unity-2d-shell'
+    $SUT.execute_shell_command 'killall unity-2d-shell'
+    $SUT.execute_shell_command 'killall unity-2d-panel'
+    $SUT.execute_shell_command 'killall unity-2d-panel'
 
     # Need panel running as position of shell depends on it
-    @@sut = TDriver.sut(:Id => "sut_qt")
-    @@panel = @@sut.run(:name => UNITY_2D_PANEL,
-                        :arguments => "-testability" )
+    @@panel = $SUT.run(:name => UNITY_2D_PANEL,
+                       :arguments => "-testability" )
 
     # Minimize all windows
     XDo::XWindow.toggle_minimize_all
@@ -108,11 +56,10 @@
   # Run before each test case begins
   setup do
     #Ensure mouse out of the way
-    XDo::Mouse.move(200,200,10,true)    
+    XDo::Mouse.move(200,200,10,true)
 
     # Execute the application 
-    @sut = TDriver.sut(:Id => "sut_qt")    
-    @app = @sut.run(:name => UNITY_2D_SHELL,
+    @app = $SUT.run(:name => UNITY_2D_SHELL,
                     :arguments => "-testability",
                     :sleeptime => 2)
     # Make certain application is ready for testing
@@ -121,116 +68,25 @@
 
   # Run after each test case completes
   teardown do
-    system "pkill -nf unity-2d-shell"
+    $SUT.execute_shell_command 'pkill -nf unity-2d-shell'
   end
 
   #####################################################################################
   # Test cases
 
   test "Shape of launcher alone" do
-    XDo::Keyboard.alt_F1
-    maskpath = get_shell_shape()
-
-    # Since the shape of the launcher is dependent on screen geometry, calculate what it should be
-    # then use imagemagick to create an image that contains only a black rectangle where the
-    # launcher should be.
-    screen_width, screen_height = desktop_geometry()
-    screen_height -= PANEL_HEIGHT
-    comparepath = tempfilename('shape', '.png')
-    %x{convert xc:black -background black -extent #{LAUNCHER_WIDTH}x#{screen_height} #{comparepath}}
-
-    identical = compare_images(maskpath, comparepath)
-
-    File.unlink(maskpath)
-    File.unlink(comparepath)
-
-    verify_true(10, "The actual shape does not match the expected shape") { identical }
+    test_shape_of_launcher_alone()
   end
 
   test "Shape of launcher and desktop mode dash" do
-    XDo::Keyboard.simulate('{SUPER}')
-    sleep 1
-    maskpath = get_shell_shape()
-
-    # Since the shape of the launcher is dependent on screen geometry, calculate what it should be,
-    # then draw a black rectangle and compose it at the left side of the dash verification image.
-
-    screen_width, screen_height = desktop_geometry()
-    screen_height -= PANEL_HEIGHT
-
-    verifypath = "#{pwd}/verification/dash_desktop.png"
-    out = %x{identify -format "%wx%h" #{verifypath}}
-    verify_width = out.split("x")[0].to_i
-    verify_width += LAUNCHER_WIDTH
-
-    comparepath = tempfilename('shape', '.png')
-
-    %x{convert #{verifypath} \
-       -gravity northeast -extent #{verify_width}x#{screen_height}! \
-       \\( xc:black -background black -extent #{LAUNCHER_WIDTH}x#{screen_height} \\) \
-       -gravity northwest -compose over -composite #{comparepath}}
-
-    identical = compare_images(maskpath, comparepath)
-
-    File.unlink(maskpath)
-    File.unlink(comparepath)
-
-    verify_true(10, "The actual shape does not match the expected shape") { identical }
+    test_shape_of_launcher_and_desktop_mode_dash()
   end
 
   test "Shape of launcher and fullscreen mode dash" do
-    XDo::Keyboard.simulate('{SUPER}')
-    sleep 1
-    @app.ShellDeclarativeView()['dashMode'] = 'FullScreenMode'
-    sleep 1
-
-    maskpath = get_shell_shape()
-
-    # Compare with just one big rectangle filling the entire screen minus the panel area
-    screen_width, screen_height = desktop_geometry()
-    screen_height -= PANEL_HEIGHT
-    comparepath = tempfilename('shape', '.png')
-    %x{convert xc:black -background black -extent #{screen_width}x#{screen_height} #{comparepath}}
-
-    identical = compare_images(maskpath, comparepath)
-
-    File.unlink(maskpath)
-    File.unlink(comparepath)
-
-    verify_true(10, "The actual shape does not match the expected shape") { identical }
+    test_shape_of_launcher_and_fullscreen_mode_dash()
   end
 
   test "Shape of launcher and collapsed desktop mode dash" do
-    XDo::Keyboard.simulate('{SUPER}')
-    sleep 1
-    @app.AbstractButton(:name => 'closeShortcutsButton').tap
-    sleep 1
-
-    maskpath = get_shell_shape()
-
-    # Since the shape of the launcher is dependent on screen geometry, calculate what it should be,
-    # then draw a black rectangle and compose it at the left side of the dash verification image.
-
-    screen_width, screen_height = desktop_geometry()
-    screen_height -= PANEL_HEIGHT
-
-    verifypath = "#{pwd}/verification/dash_collapsed.png"
-    out = %x{identify -format "%wx%h" #{verifypath}}
-    verify_width = out.split("x")[0].to_i
-    verify_width += LAUNCHER_WIDTH
-
-    comparepath = tempfilename('shape', '.png')
-
-    %x{convert #{verifypath} \
-       -gravity northeast -extent #{verify_width}x#{screen_height}! \
-       \\( xc:black -background black -extent #{LAUNCHER_WIDTH}x#{screen_height} \\) \
-       -gravity northwest -compose over -composite #{comparepath}}
-
-    identical = compare_images(maskpath, comparepath)
-
-    File.unlink(maskpath)
-    File.unlink(comparepath)
-
-    verify_true(10, "The actual shape does not match the expected shape") { identical }
+      test_shape_of_launcher_and_collapsed_desktop_mode_dash()
   end
 end

=== added file 'tests/shell/input_shaping_common.rb'
--- tests/shell/input_shaping_common.rb	1970-01-01 00:00:00 +0000
+++ tests/shell/input_shaping_common.rb	2012-02-06 16:36:19 +0000
@@ -0,0 +1,180 @@
+=begin
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+=end
+
+# We just need a temp file name but ruby insist on creating it, so we just delete it first.
+def tempfilename(base, extension = ".tmp")
+    maskfile = Tempfile.new([base, extension])
+    maskpath = maskfile.path
+    maskfile.close
+    maskfile.unlink
+    return maskpath
+end
+
+def get_shell_shape
+    # Try to find the shell window
+    shell_ids = XDo::XWindow::search('unity-2d-shell')
+    assert(!shell_ids.empty?, "Failed to retrieve the shell window id")
+    shell_id = shell_ids[0]
+
+    # Get the shape of the shell window using our custom tool
+    maskpath = tempfilename('shape', '.png')
+    get_shape_command = BINARY_DIR + "/tests/getshape/getshape #{shell_id} #{maskpath}"
+    $SUT.execute_shell_command get_shape_command
+    $SUT.copy_from_sut(:from => '/tmp/', :file => maskpath, :to => '/tmp/')
+    return maskpath
+end
+
+# Compare two images using ImageMagick. Perform a pixel-by-pixel comparison and return true
+# only if all the pixels are identical.
+def compare_images(image1, image2)
+    # Before checking the pixels make sure the two images are the same size, otherwise some times
+    # IM will hang for a long time (probably trying to do some super clever subimage matching).
+    size1 = %x{identify -format '%wx%h' #{image1}}
+    size2 = %x{identify -format '%wx%h' #{image2}}
+    return false if size1 != size2
+
+    # Discard the difference image and redirect stderr to stdout as IM will output the number of
+    # different pixels there for some reason.
+    difference = %x{compare #{image1} #{image2} -metric AE /dev/null 2>&1}.chop.to_i
+
+    # If the images are too different or have different sizes IM will exit with return code 1.
+    # Unfortunately it's the same code we have when there is any error (like a wrong filename),
+    # so the best we can do is just return false
+    return false if $?.exitstatus != 0
+
+    return difference == 0
+end
+
+def test_shape_of_launcher_alone(isRTL = false)
+    XDo::Keyboard.alt_F1
+    maskpath = get_shell_shape()
+
+    # Since the shape of the launcher is dependent on screen geometry, calculate what it should be
+    # then use imagemagick to create an image that contains only a black rectangle where the
+    # launcher should be.
+    screen_width, screen_height = XDo::XWindow.display_geometry()
+    screen_height -= PANEL_HEIGHT
+    comparepath = tempfilename('shape', '.png')
+    flopstring = ""
+    if isRTL
+        flopstring = "-flop"
+    end
+    %x{convert -size #{screen_width}x#{screen_height} xc:white -background white -draw 'rectangle 0,0 #{LAUNCHER_WIDTH-1},#{screen_height}' #{flopstring} #{comparepath}}
+
+    identical = compare_images(maskpath, comparepath)
+
+    File.unlink(maskpath)
+    File.unlink(comparepath)
+
+    verify_true(0, "The actual shape does not match the expected shape") { identical }
+end
+
+def test_shape_of_launcher_and_desktop_mode_dash(isRTL = false)
+    XDo::Keyboard.simulate('{SUPER}')
+    sleep 1
+    maskpath = get_shell_shape()
+
+    # Since the shape of the launcher is dependent on screen geometry, calculate what it should be,
+    # then draw a black rectangle and compose it at the left side of the dash verification image.
+
+    screen_width, screen_height = XDo::XWindow.display_geometry()
+    screen_height -= PANEL_HEIGHT
+
+    pwd = File.expand_path(File.dirname(__FILE__))
+    verifypath = pwd + "/verification/dash_desktop.png"
+
+    comparepath = tempfilename('shape', '.png')
+
+    flopstring = ""
+    if isRTL
+        flopstring = "-flop"
+    end
+    %x{convert xc:white -extent #{screen_width}x#{screen_height} #{verifypath} -geometry +#{LAUNCHER_WIDTH}+0 -composite  \
+       \\( xc:black -background black -extent #{LAUNCHER_WIDTH}x#{screen_height} \\) \
+       -gravity northwest -compose over -composite #{flopstring} #{comparepath}}
+
+    identical = compare_images(maskpath, comparepath)
+
+    File.unlink(maskpath)
+    File.unlink(comparepath)
+
+    verify_true(0, "The actual shape does not match the expected shape") { identical }
+end
+
+def test_shape_of_launcher_and_fullscreen_mode_dash(isRTL = false)
+    XDo::Keyboard.simulate('{SUPER}')
+    sleep 1
+    @app.ShellDeclarativeView()['dashMode'] = 'FullScreenMode'
+    sleep 1
+
+    maskpath = get_shell_shape()
+
+    # Compare with just one big rectangle filling the entire screen minus the panel area
+    screen_width, screen_height = XDo::XWindow.display_geometry()
+    screen_height -= PANEL_HEIGHT
+    comparepath = tempfilename('shape', '.png')
+    flopstring = ""
+    if isRTL
+        flopstring = "-flop"
+    end
+    %x{convert xc:black -background black -extent #{screen_width}x#{screen_height} #{flopstring} #{comparepath}}
+
+    identical = compare_images(maskpath, comparepath)
+
+    File.unlink(maskpath)
+    File.unlink(comparepath)
+
+    verify_true(0, "The actual shape does not match the expected shape") { identical }
+end
+
+def test_shape_of_launcher_and_collapsed_desktop_mode_dash(isRTL = false)
+    XDo::Keyboard.simulate('{SUPER}')
+    sleep 1
+    @app.AbstractButton(:name => 'closeShortcutsButton').tap
+    sleep 1
+
+    maskpath = get_shell_shape()
+
+    # Since the shape of the launcher is dependent on screen geometry, calculate what it should be,
+    # then draw a black rectangle and compose it at the left side of the dash verification image.
+
+    screen_width, screen_height = XDo::XWindow.display_geometry()
+    screen_height -= PANEL_HEIGHT
+
+    pwd = File.expand_path(File.dirname(__FILE__))
+    verifypath = pwd + "/verification/dash_collapsed.png"
+
+    comparepath = tempfilename('shape', '.png')
+
+    flopstring = ""
+    if isRTL
+        flopstring = "-flop"
+    end
+    %x{convert xc:white -extent #{screen_width}x#{screen_height} #{verifypath} -geometry +#{LAUNCHER_WIDTH}+0 -composite  \
+       \\( xc:black -background black -extent #{LAUNCHER_WIDTH}x#{screen_height} \\) \
+       -gravity northwest -compose over -composite #{flopstring} #{comparepath}}
+
+    identical = compare_images(maskpath, comparepath)
+
+    File.unlink(maskpath)
+    File.unlink(comparepath)
+
+    verify_true(0, "The actual shape does not match the expected shape") { identical }
+end

=== added file 'tests/shell/input_shaping_rtl.rb'
--- tests/shell/input_shaping_rtl.rb	1970-01-01 00:00:00 +0000
+++ tests/shell/input_shaping_rtl.rb	2012-02-06 16:36:19 +0000
@@ -0,0 +1,92 @@
+#!/usr/bin/env ruby1.8
+=begin
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+=end
+
+require '../run-tests.rb' unless $INIT_COMPLETED
+require 'xdo/xwindow'
+require 'xdo/keyboard'
+require 'xdo/mouse'
+require 'timeout'
+require 'tmpdir'
+require 'tempfile'
+require $library_path + '/../../shell/input_shaping_common.rb'
+
+include TDriverVerify
+
+############################# Test Suite #############################
+context "Shell input shape tests" do
+  pwd = File.expand_path(File.dirname(__FILE__)) + '/'
+
+  # Run once at the beginning of this test suite
+  startup do
+    $SUT.execute_shell_command 'killall unity-2d-shell'
+    $SUT.execute_shell_command 'killall unity-2d-shell'
+    $SUT.execute_shell_command 'killall unity-2d-panel'
+    $SUT.execute_shell_command 'killall unity-2d-panel'
+
+    # Need panel running as position of shell depends on it
+    @@panel = $SUT.run(:name => UNITY_2D_PANEL,
+                       :arguments => "-testability" )
+
+    # Minimize all windows
+    XDo::XWindow.toggle_minimize_all
+  end
+  
+  # Run once at the end of this test suite
+  shutdown do
+  end
+
+  # Run before each test case begins
+  setup do
+    #Ensure mouse out of the way
+    XDo::Mouse.move(200,200,10,true)
+
+    # Execute the application 
+    @app = $SUT.run(:name => UNITY_2D_SHELL,
+                    :arguments => "-testability,-reverse",
+                    :sleeptime => 2)
+    # Make certain application is ready for testing
+    verify(10){ @app.Launcher() }
+  end
+
+  # Run after each test case completes
+  teardown do
+    $SUT.execute_shell_command 'pkill -nf unity-2d-shell'
+  end
+
+  #####################################################################################
+  # Test cases
+
+  test "Shape of launcher alone" do
+    test_shape_of_launcher_alone(true)
+  end
+
+  test "Shape of launcher and desktop mode dash" do
+    test_shape_of_launcher_and_desktop_mode_dash(true)
+  end
+
+  test "Shape of launcher and fullscreen mode dash" do
+    test_shape_of_launcher_and_fullscreen_mode_dash(true)
+  end
+
+  test "Shape of launcher and collapsed desktop mode dash" do
+      test_shape_of_launcher_and_collapsed_desktop_mode_dash(true)
+  end
+end