Remove touch grabbing for now

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>

3 files changed, 2 insertions, 46 deletions

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 5dd8ad619..e9eca8a65 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1951,39 +1951,6 @@ GrabWindow(ClientPtr client, DeviceIntPtr dev, int type,
     return AddPassiveGrabToList(client, grab);
 }
 
-/* TouchBegin grab */
-int
-GrabTouch(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr mod_dev, int tool,
-          GrabParameters *param, GrabMask *mask)
-{
-    WindowPtr pWin;
-    GrabPtr grab;
-    Mask access_mode = DixGrabAccess;
-    int rc;
-
-    rc = CheckGrabValues(client, param);
-    if (rc != Success)
-        return rc;
-
-    rc = dixLookupWindow(&pWin, param->grabWindow, client, DixSetAttrAccess);
-    if (rc != Success)
-	return rc;
-    if (param->this_device_mode == GrabModeSync)
-	access_mode |= DixFreezeAccess;
-    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);
-    if (rc != Success)
-	return rc;
-
-    /* FIXME: tool gets truncated to 8 bits here */
-    grab = CreateGrab(client->index, dev, mod_dev, pWin, GRABTYPE_XI2,
-                      mask, param, XI_TouchBegin, tool, NULL, NULL);
-
-    if (!grab)
-        return BadAlloc;
-
-    return AddPassiveGrabToList(client, grab);
-}
-
 int
 SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,
 		Mask mask, Mask exclusivemasks)
diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c
index 5de43ff72..d14adb31b 100644
--- a/Xi/xiallowev.c
+++ b/Xi/xiallowev.c
@@ -115,10 +115,6 @@ ProcXIAllowEvents(ClientPtr client)
         if (IsMaster(dev))
             AllowSome(client, time, dev, THAWED_BOTH);
 	break;
-    case XIAcceptTouch:
-    case XIReplayTouch:
-        AllowTouches(client, time, dev, req.mode, req.detail);
-        break;
     default:
 	client->errorValue = req.mode;
 	ret = BadValue;
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index 5bafe539e..296614510 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -105,8 +105,7 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     if (stuff->grab_type != XIGrabtypeButton &&
         stuff->grab_type != XIGrabtypeKeycode &&
         stuff->grab_type != XIGrabtypeEnter &&
-        stuff->grab_type != XIGrabtypeFocusIn &&
-        stuff->grab_type != XIGrabtypeTouchBegin)
+        stuff->grab_type != XIGrabtypeFocusIn)
     {
         client->errorValue = stuff->grab_type;
         return BadValue;
@@ -186,10 +185,6 @@ ProcXIPassiveGrabDevice(ClientPtr client)
                 status = GrabWindow(client, dev, stuff->grab_type,
                                     &param, &mask);
                 break;
-            case XIGrabtypeTouchBegin:
-                status = GrabTouch(client, dev, mod_dev, stuff->detail,
-                                   &param, &mask);
-                break;
         }
 
         if (status != GrabSuccess)
@@ -268,8 +263,7 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
     if (stuff->grab_type != XIGrabtypeButton &&
         stuff->grab_type != XIGrabtypeKeycode &&
         stuff->grab_type != XIGrabtypeEnter &&
-        stuff->grab_type != XIGrabtypeFocusIn &&
-        stuff->grab_type != XIGrabtypeTouchBegin)
+        stuff->grab_type != XIGrabtypeFocusIn)
     {
         client->errorValue = stuff->grab_type;
         return BadValue;
@@ -300,7 +294,6 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
         case XIGrabtypeKeycode:  tempGrab.type = XI_KeyPress;    break;
         case XIGrabtypeEnter:   tempGrab.type = XI_Enter;       break;
         case XIGrabtypeFocusIn: tempGrab.type = XI_FocusIn;     break;
-        case XIGrabtypeTouchBegin: tempGrab.type = XI_TouchBegin; break;
     }
     tempGrab.grabtype = GRABTYPE_XI2;
     tempGrab.modifierDevice = mod_dev;