unity/disable-multitouch.patch

   1 diff -Naur unity-5.0.0.orig/CMakeLists.txt unity-5.0.0/CMakeLists.txt
   2 --- unity-5.0.0.orig/CMakeLists.txt     2012-01-12 17:47:07.000000000 +0100
   3 +++ unity-5.0.0/CMakeLists.txt  2012-01-15 09:45:17.010953206 +0100
   4 @@ -119,7 +119,7 @@
   5  #
   6  # Compiz Plugins
   7  #
   8 -set (UNITY_PLUGIN_DEPS "compiz;nux-2.0 >= 2.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4;atk;unity-misc >= 0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0 >= 3.1;sigc++-2.0;json-glib-1.0;libnotify;gnome-desktop-3.0;gdu")
   9 +set (UNITY_PLUGIN_DEPS "compiz;nux-2.0 >= 2.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4;atk;unity-misc >= 0.4.0;gconf-2.0;gtk+-3.0 >= 3.1;sigc++-2.0;json-glib-1.0;libnotify;gnome-desktop-3.0;gdu")
  10
  11  add_subdirectory(plugins/unityshell)
  12  add_subdirectory(plugins/gtkloader)
  13 diff -Naur unity-5.0.0.orig/plugins/unityshell/src/Launcher.cpp unity-5.0.0/plugins/unityshell/src/Launcher.cpp
  14 --- unity-5.0.0.orig/plugins/unityshell/src/Launcher.cpp        2012-01-12 17:47:07.000000000 +0100
  15 +++ unity-5.0.0/plugins/unityshell/src/Launcher.cpp     2012-01-15 09:55:01.696575516 +0100
  16 @@ -192,11 +192,6 @@
  17    plugin_adapter.compiz_screen_viewport_switch_started.connect(sigc::mem_fun(this, &Launcher::OnViewPortSwitchStarted));
  18    plugin_adapter.compiz_screen_viewport_switch_ended.connect(sigc::mem_fun(this, &Launcher::OnViewPortSwitchEnded));
  19
  20 -  GeisAdapter& adapter = *(GeisAdapter::Default());
  21 -  adapter.drag_start.connect(sigc::mem_fun(this, &Launcher::OnDragStart));
  22 -  adapter.drag_update.connect(sigc::mem_fun(this, &Launcher::OnDragUpdate));
  23 -  adapter.drag_finish.connect(sigc::mem_fun(this, &Launcher::OnDragFinish));
  24 -
  25    display.changed.connect(sigc::mem_fun(this, &Launcher::OnDisplayChanged));
  26
  27    _current_icon       = NULL;
  28 @@ -402,50 +397,6 @@
  29  }
  30
  31  void
  32 -Launcher::OnDragStart(GeisAdapter::GeisDragData* data)
  33 -{
  34 -  if (_drag_out_id && _drag_out_id == data->id)
  35 -    return;
  36 -
  37 -  if (data->touches == 4)
  38 -  {
  39 -    _drag_out_id = data->id;
  40 -    if (_hidden)
  41 -    {
  42 -      _drag_out_delta_x = 0.0f;
  43 -    }
  44 -    else
  45 -    {
  46 -      _drag_out_delta_x = DRAG_OUT_PIXELS;
  47 -      _hide_machine->SetQuirk(LauncherHideMachine::MT_DRAG_OUT, false);
  48 -    }
  49 -  }
  50 -}
  51 -
  52 -void
  53 -Launcher::OnDragUpdate(GeisAdapter::GeisDragData* data)
  54 -{
  55 -  if (data->id == _drag_out_id)
  56 -  {
  57 -    _drag_out_delta_x = CLAMP(_drag_out_delta_x + data->delta_x, 0.0f, DRAG_OUT_PIXELS);
  58 -    EnsureAnimation();
  59 -  }
  60 -}
  61 -
  62 -void
  63 -Launcher::OnDragFinish(GeisAdapter::GeisDragData* data)
  64 -{
  65 -  if (data->id == _drag_out_id)
  66 -  {
  67 -    if (_drag_out_delta_x >= DRAG_OUT_PIXELS - 90.0f)
  68 -      _hide_machine->SetQuirk(LauncherHideMachine::MT_DRAG_OUT, true);
  69 -    SetTimeStruct(&_times[TIME_DRAG_OUT], &_times[TIME_DRAG_OUT], ANIM_DURATION_SHORT);
  70 -    _drag_out_id = 0;
  71 -    EnsureAnimation();
  72 -  }
  73 -}
  74 -
  75 -void
  76  Launcher::startKeyNavMode()
  77  {
  78    SetStateKeyNav(true);
  79 diff -Naur unity-5.0.0.orig/plugins/unityshell/src/Launcher.h unity-5.0.0/plugins/unityshell/src/Launcher.h
  80 --- unity-5.0.0.orig/plugins/unityshell/src/Launcher.h  2012-01-12 17:47:07.000000000 +0100
  81 +++ unity-5.0.0/plugins/unityshell/src/Launcher.h       2012-01-15 09:51:33.363116092 +0100
  82 @@ -32,7 +32,6 @@
  83  #include "BackgroundEffectHelper.h"
  84  #include "DNDCollectionWindow.h"
  85  #include "DndData.h"
  86 -#include "GeisAdapter.h"
  87  #include "Introspectable.h"
  88  #include "LauncherDragWindow.h"
  89  #include "LauncherHideMachine.h"
  90 @@ -246,10 +245,6 @@
  91    void OnWindowMapped(guint32 xid);
  92    void OnWindowUnmapped(guint32 xid);
  93
  94 -  void OnDragStart(GeisAdapter::GeisDragData* data);
  95 -  void OnDragUpdate(GeisAdapter::GeisDragData* data);
  96 -  void OnDragFinish(GeisAdapter::GeisDragData* data);
  97 -
  98    void OnPluginStateChanged();
  99
 100    void OnViewPortSwitchStarted();
 101 diff -Naur unity-5.0.0.orig/plugins/unityshell/src/unityshell.cpp unity-5.0.0/plugins/unityshell/src/unityshell.cpp
 102 --- unity-5.0.0.orig/plugins/unityshell/src/unityshell.cpp      2012-01-12 17:47:07.000000000 +0100
 103 +++ unity-5.0.0/plugins/unityshell/src/unityshell.cpp   2012-01-15 09:49:39.521844903 +0100
 104 @@ -29,7 +29,6 @@
 105  #include "Launcher.h"
 106  #include "LauncherIcon.h"
 107  #include "LauncherController.h"
 108 -#include "GeisAdapter.h"
 109  #include "DevicesSettings.h"
 110  #include "PluginAdapter.h"
 111  #include "QuicklistManager.h"
 112 @@ -97,7 +96,6 @@
 113    , screen(screen)
 114    , cScreen(CompositeScreen::get(screen))
 115    , gScreen(GLScreen::get(screen))
 116 -  , gestureEngine(nullptr)
 117    , wt(nullptr)
 118    , panelWindow(nullptr)
 119    , debugger(nullptr)
 120 @@ -311,9 +309,6 @@
 121       g_idle_add_full (G_PRIORITY_DEFAULT, &UnityScreen::initPluginActions, this, NULL);
 122       super_keypressed_ = false;
 123
 124 -     GeisAdapter::Default()->Run();
 125 -     gestureEngine = new GestureEngine(screen);
 126 -
 127       CompString name(PKGDATADIR"/panel-shadow.png");
 128       CompString pname("unityshell");
 129       CompSize size(1, 20);
 130 diff -Naur unity-5.0.0.orig/plugins/unityshell/src/unityshell.h unity-5.0.0/plugins/unityshell/src/unityshell.h
 131 --- unity-5.0.0.orig/plugins/unityshell/src/unityshell.h        2012-01-12 17:47:07.000000000 +0100
 132 +++ unity-5.0.0/plugins/unityshell/src/unityshell.h     2012-01-15 09:49:39.521844903 +0100
 133 @@ -43,7 +43,6 @@
 134  #include "PanelController.h"
 135  #include "PanelStyle.h"
 136  #include "UScreen.h"
 137 -#include "GestureEngine.h"
 138  #include "DebugDBusInterface.h"
 139  #include "SwitcherController.h"
 140  #include "UBusWrapper.h"
 141 @@ -253,7 +252,6 @@
 142    panel::Controller::Ptr    panel_controller_;
 143    switcher::Controller::Ptr switcher_controller_;
 144
 145 -  GestureEngine*                        gestureEngine;
 146    nux::WindowThread*                    wt;
 147    nux::BaseWindow*                      panelWindow;
 148    nux::Geometry                         lastTooltipArea;
 149 diff -Naur unity-5.0.0.orig/standalone-clients/CMakeLists.txt unity-5.0.0/standalone-clients/CMakeLists.txt
 150 --- unity-5.0.0.orig/standalone-clients/CMakeLists.txt  2012-01-12 17:47:07.000000000 +0100
 151 +++ unity-5.0.0/standalone-clients/CMakeLists.txt       2012-01-15 09:46:58.576139550 +0100
 152 @@ -235,8 +235,6 @@
 153                  ${UNITY_SRC}/LauncherHoverMachine.h
 154                  ${UNITY_SRC}/LauncherDragWindow.cpp
 155                  ${UNITY_SRC}/LauncherDragWindow.h
 156 -                ${UNITY_SRC}/GeisAdapter.cpp
 157 -                ${UNITY_SRC}/GeisAdapter.h
 158                  ${UNITY_SRC}/WindowManager.h
 159                  ${UNITY_SRC}/WindowManager.cpp
 160                  ${UNITY_SRC}/IconRenderer.cpp