devel/rhpxl rhpxl-0.49-no-more-input.patch, NONE, 1.1 rhpxl.spec, 1.66, 1.67

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/rhpxl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2211

Modified Files:
	rhpxl.spec 
Added Files:
	rhpxl-0.49-no-more-input.patch 
Log Message:
* Mon Mar 10 2008 Jeremy Katz <katzj at redhat.com> - 0.49-5
- Don't write out input sections in xorg.conf -- input hotplug should 
  take care of them all


rhpxl-0.49-no-more-input.patch:

--- NEW FILE rhpxl-0.49-no-more-input.patch ---
diff --git a/rhpxl/xhwstate.py b/rhpxl/xhwstate.py
index ed331f7..97a32fe 100644
--- a/rhpxl/xhwstate.py
+++ b/rhpxl/xhwstate.py
@@ -628,7 +628,7 @@ class XF86HardwareState:
     #
     # given a hardware state and a mouse and kbd spec, return X config file
     #
-    def generate_xconfig(self, mouse, keyboard):
+    def generate_xconfig(self, mouse = None, keyboard = None):
 	xconfig = xf86config.createTemplate()
 
 	self.merge_into(xconfig)
@@ -642,26 +642,27 @@ class XF86HardwareState:
 		device.options.insert(option)
 		return option
 
-	corekb = xf86config.getCoreKeyboard(xconfig)
-
-        try:
-            #Let's assume we know what kind of keyboard this is
-            get_option(corekb, "XkbModel").val = keyboard["model"]
-            get_option(corekb, "XkbLayout").val = keyboard["layout"]
-        except:
-            #Ok, the keyboard from /etc/sysconfig/keyboard isn't in rhpl's list, so let's assume US keyboard
-            #Maybe this isn't the best thing to do, but it will work for most people
-            keyboard.set("us")
-            get_option(corekb, "XkbModel").val = keyboard["model"]
-            get_option(corekb, "XkbLayout").val = keyboard["layout"]
-
-	if keyboard["options"] != "":
-	    get_option(corekb, "XkbOptions").val = keyboard["options"]
-	if keyboard["variant"] != "":
-	    get_option(corekb, "XkbVariant").val = keyboard["variant"]
+        if False: #keyboard is not None:
+            corekb = xf86config.getCoreKeyboard(xconfig)
+
+            try:
+                #Let's assume we know what kind of keyboard this is
+                get_option(corekb, "XkbModel").val = keyboard["model"]
+                get_option(corekb, "XkbLayout").val = keyboard["layout"]
+            except:
+                #Ok, the keyboard from /etc/sysconfig/keyboard isn't in rhpl's list, so let's assume US keyboard
+                #Maybe this isn't the best thing to do, but it will work for most people
+                keyboard.set("us")
+                get_option(corekb, "XkbModel").val = keyboard["model"]
+                get_option(corekb, "XkbLayout").val = keyboard["layout"]
+
+            if keyboard["options"] != "":
+                get_option(corekb, "XkbOptions").val = keyboard["options"]
+            if keyboard["variant"] != "":
+                get_option(corekb, "XkbVariant").val = keyboard["variant"]
 
 	# if no mouse defined then skip
-	if mouse.getDevice() is not None:
+	if mouse is not None and mouse.getDevice() is not None:
             #Synaptics support
             baseArch = rhpl.getArch()
             if baseArch in ("x86_64", "ppc64", "s390x", "sparc64"):
@@ -731,20 +732,4 @@ class XF86HardwareState:
 		
 	    get_option(xconfig.flags, "AllowMouseOpenFail").val = "yes"
 
-        ## Check for IBM RSA I device and if it exist add the stanza   
-        ibmasmhw = ibmasm.ibmasmCheck()
-        if ibmasmhw.isDevicePresent():
-            ibmasm_conf = xf86config.XF86ConfInput()
-            xconfig.input.insert(ibmasm_conf)
-            ibmasm_conf.identifier = "ibmasm_remote"
-            ibmasm_conf.driver = "ibmasm"
-            get_option(ibmasm_conf, "Device").val = ""
-            (w, h) = resolution_from_string(self.resolution)
-            get_option(ibmasm_conf, "XScale").val = str(w)
-            get_option(ibmasm_conf, "YScale").val = str(h)
-            get_option(ibmasm_conf, "SendCoreEvents").val = "True"
-            inputs = xconfig.layout[0].inputs
-            ibmasm_ref = xf86config.XF86ConfInputref("ibmasm_remote", "")
-            inputs.insert(ibmasm_ref)
-
 	return xconfig
diff --git a/rhpxl/xserver.py b/rhpxl/xserver.py
index f3daee6..6d11eaa 100644
--- a/rhpxl/xserver.py
+++ b/rhpxl/xserver.py
@@ -60,7 +60,7 @@ class XServer:
         if self.hwstate.videocard == None:
             return
 
-        self.config = self.hwstate.generate_xconfig(self.mousehw, self.keyboard)
+        self.config = self.hwstate.generate_xconfig()
 
     def addExtraScreen(self, identifier):
         screen = xf86config.XF86ConfScreen()
@@ -98,7 +98,6 @@ class XServer:
             logFunc(cardstr)
 
         self.monitorhw = monitor.MonitorInfo()
-        self.mousehw = mouse.Mouse(skipProbe=skipMouseProbe)
 
     def startX(self, xStartedCB=None, useFB=False):
         if not os.access("/usr/bin/Xorg", os.X_OK):


Index: rhpxl.spec
===================================================================
RCS file: /cvs/pkgs/devel/rhpxl/rhpxl.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- rhpxl.spec	12 Feb 2008 21:21:47 -0000	1.66
+++ rhpxl.spec	11 Mar 2008 03:11:11 -0000	1.67
@@ -4,7 +4,7 @@
 Name: rhpxl
 URL: http://fedoraproject.org/wiki/rhpxl
 Version: 0.49
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: http://ajax.fedoraproject.org/%{name}/%{name}-%{version}.tar.gz
 License: GPLv2
 Group: System Environment/Libraries
@@ -16,6 +16,7 @@
 
 Patch0: rhpxl-0.49-pseries-hatred.patch
 Patch1: rhpxl-0.49-ibmasm.patch
+Patch2: rhpxl-0.49-no-more-input.patch
 
 %description
 The rhpxl (pronounced 'rapunzel') package contains a Python library for
@@ -25,6 +26,7 @@
 %setup -q
 %patch0 -p1 -b .pseries
 %patch1 -p1 -b .ibmasm
+%patch2 -p1 -b .input
 
 %build
 make %{?_smp_mflags}
@@ -47,6 +49,10 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Mon Mar 10 2008 Jeremy Katz <katzj at redhat.com> - 0.49-5
+- Don't write out input sections in xorg.conf -- input hotplug should 
+  take care of them all
+
 * Tue Feb 12 2008 Adam Jackson <ajax at redhat.com> 0.49-4
 - rhpxl-0.49-ibmasm.patch: Fix string handling in ibmasm setup. (#353021)