summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mouse.py4
-rw-r--r--xserver.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/mouse.py b/mouse.py
index 2fe4ef65e..e399af20e 100644
--- a/mouse.py
+++ b/mouse.py
@@ -86,14 +86,14 @@ class Mouse (SimpleConfigFile):
def probed(self):
return self.wasProbed
- def probe (self):
+ def probe (self, frob = 0):
list = kudzu.probe(kudzu.CLASS_MOUSE, kudzu.BUS_UNSPEC,
kudzu.PROBE_ONE)
if (list):
(device, module, desc) = list[0]
- if device == 'psaux':
+ if frob and device == 'psaux':
# kickstart some ps/2 mice. Blame the kernel
try:
f = open ('/dev/psaux')
diff --git a/xserver.py b/xserver.py
index a002cf547..4fcb45f11 100644
--- a/xserver.py
+++ b/xserver.py
@@ -68,7 +68,7 @@ def startX():
print "Probing for mouse type..."
mouse = Mouse()
- if not mouse.probe ():
+ if not mouse.probe (frob=1):
if not mouseWindow(mouse):
raise RuntimeError, "failed to get a mouse for X startup"
else: