Merge pull request #92 from palcalde/master

Fixed ‘vs’ command by:

commands/FBFlickerCommands.py

@@ -9,6 +9,7 @@
 
 import os
 import time
+import sys
 
 import lldb
 import fblldbbase as fb
@@ -64,18 +65,15 @@ class FlickerWalker:
   def __init__(self, startView):
     self.setCurrentView(startView)
 
-    self.handler = inputHelpers.FBInputHandler(lldb.debugger, self.inputCallback)
-    self.handler.start()
-
   def run(self):
-    while self.handler.isValid():
-      self.flicker()
-
-  def flicker(self):
-    viewHelpers.setViewHidden(self.currentView, True)
-    time.sleep(0.1)
-    viewHelpers.setViewHidden(self.currentView, False)
-    time.sleep(0.3)
+    self.keepRunning = True
+    initialAsync = lldb.debugger.GetAsync()
+    lldb.debugger.SetAsync(True) #Needed so XCode doesn't hang if tap on Continue while lldb is waiting for user input in 'vs' mode
+    while self.keepRunning:
+      charRead = sys.stdin.readline().rstrip("\n")
+      self.inputCallback(charRead)
+    else:
+      lldb.debugger.SetAsync(initialAsync)
 
   def inputCallback(self, input):
     oldView = self.currentView
@@ -85,28 +83,29 @@ def inputCallback(self, input):
       os.system(cmd)
 
       print '\nI hope ' + oldView + ' was what you were looking for. I put it on your clipboard.'
+      viewHelpers.unmaskView(oldView)
+      self.keepRunning = False
 
-      self.handler.stop()
     elif input == 'w':
       v = superviewOfView(self.currentView)
       if not v:
         print 'There is no superview. Where are you trying to go?!'
-      self.setCurrentView(v)
+      self.setCurrentView(v, oldView)
     elif input == 's':
       v = firstSubviewOfView(self.currentView)
       if not v:
         print '\nThe view has no subviews.\n'
-      self.setCurrentView(v)
+      self.setCurrentView(v, oldView)
     elif input == 'd':
       v = nthSiblingOfView(self.currentView, -1)
       if v == oldView:
         print '\nThere are no sibling views to this view.\n'
-      self.setCurrentView(v)
+      self.setCurrentView(v, oldView)
     elif input == 'a':
       v = nthSiblingOfView(self.currentView, 1)
       if v == oldView:
         print '\nThere are no sibling views to this view.\n'
-      self.setCurrentView(v)
+      self.setCurrentView(v, oldView)
     elif input == 'p':
       recusionName = 'recursiveDescription'
       isMac = runtimeHelpers.isMacintoshArch()
@@ -118,11 +117,12 @@ def inputCallback(self, input):
     else:
       print '\nI really have no idea what you meant by \'' + input + '\'... =\\\n'
 
-    viewHelpers.setViewHidden(oldView, False)
-
-  def setCurrentView(self, view):
+  def setCurrentView(self, view, oldView=None):
     if view:
       self.currentView = view
+      if oldView:
+        viewHelpers.unmaskView(oldView)
+      viewHelpers.maskView(self.currentView, 'red', '0.4')
       lldb.debugger.HandleCommand('po (id)' + view)
 
 def superviewOfView(view):