diff options
| -rwxr-xr-x | anaconda | 6 | ||||
| -rw-r--r-- | installclass.py | 10 | ||||
| -rw-r--r-- | instdata.py | 6 | ||||
| -rw-r--r-- | packages.py | 2 | ||||
| -rw-r--r-- | xsetup.py | 3 |
5 files changed, 3 insertions, 24 deletions
@@ -453,8 +453,7 @@ def probeHW(opts, x_already_set, xserver): # Probe what is available for X and setup a hardware state # # try to probe interesting hw - skipmouseprobe = not (not os.environ.has_key('DISPLAY') or flags.setupFilesystems) - xserver.probeHW(skipMouseProbe=skipmouseprobe, forceDriver=opts.xdriver) + xserver.probeHW(forceDriver=opts.xdriver) # if the len(videocards) is zero, then let's assume we're isHeadless if len(xserver.videohw.videocards) == 0: @@ -940,9 +939,6 @@ if __name__ == "__main__": anaconda.id.x_already_set = x_already_set if xserver: - if xserver.mousehw: - anaconda.id.setMouse(xserver.mousehw) - if xserver.videohw: anaconda.id.setVideoCard(xserver.videohw) diff --git a/installclass.py b/installclass.py index 3c4af1114..6dbf8d535 100644 --- a/installclass.py +++ b/installclass.py @@ -414,15 +414,6 @@ class BaseInstallClass(object): rl = 3 self.setMiscXSettings(id, depth, resolution, runlevel = rl) - def setMouse(self, id, mouseType, device = None, emulThree = -1): - import rhpxl.mouse as mouse - - # blindly trust what we're told - mouse = mouse.Mouse(skipProbe = 1) - mouseName = mouse.mouseToMouse()[mouseType] - mouse.set(mouseName, emulThree, device) - id.setMouse(mouse) - def getBackend(self, methodstr): # this should be overriden in distro install classes from backend import AnacondaBackend @@ -463,7 +454,6 @@ class BaseInstallClass(object): #id.setAuthentication() #id.setHostname() #id.setDesktop() - #id.setMouse() # These are callbacks used to let classes configure packages #id.setPackageSelection() diff --git a/instdata.py b/instdata.py index 32c5124bd..d66757f59 100644 --- a/instdata.py +++ b/instdata.py @@ -58,7 +58,6 @@ class InstallData: def reset(self): # Reset everything except: # - # - The mouse # - The install language # - The keyboard @@ -117,10 +116,6 @@ class InstallData: def setKeyboard(self, keyboard): self.keyboard = keyboard - # expects a Mouse object - def setMouse(self, mouse): - self.mouse = mouse - # expects a VideoCardInfo object def setVideoCard(self, video): self.videocard = video @@ -301,7 +296,6 @@ class InstallData: self.backend = backend self.anaconda = anaconda - self.mouse = None self.monitor = None self.videocard = None self.xsetup = None diff --git a/packages.py b/packages.py index a6a8a1598..50c6a37a8 100644 --- a/packages.py +++ b/packages.py @@ -119,7 +119,7 @@ def writeXConfiguration(anaconda): else: fn = "/tmp/" - anaconda.id.xsetup.write(fn+"/etc/X11", anaconda.id.mouse, anaconda.id.keyboard) + anaconda.id.xsetup.write(fn+"/etc/X11", anaconda.id.keyboard) anaconda.id.desktop.write(anaconda.rootPath) def doMigrateFilesystems(anaconda): @@ -32,9 +32,8 @@ class XSetup: self.xserver = xserver self.anaconda = anaconda - def write(self, fn, mouse, keyboard): + def write(self, fn, keyboard): self.xserver.keyboard = keyboard - self.xserver.mousehw = mouse self.xserver.generateConfig() if self.anaconda.isKickstart: |