[Uludag-commits] r21717 - in trunk/comar/zorg: . zorg

[uludag-commits at pardus.org.tr]

Author: fatih
Date: Thu Mar  5 23:38:09 2009
New Revision: 21717

Modified:
   trunk/comar/zorg/ChangeLog
   trunk/comar/zorg/zorg/config.py
Log:
Remove input device sections

Modified: trunk/comar/zorg/ChangeLog
=================================================================
--- trunk/comar/zorg/ChangeLog	(original)
+++ trunk/comar/zorg/ChangeLog	Thu Mar  5 23:38:09 2009
@@ -1,3 +1,8 @@
+2009-03-05  Fatih Aşıcı  <fatih at pardus.org.tr>
+	* zorg/config.py:
+		Do not create InputDevice sections. We will use
+		new input hotplug mechanism for all input devices.
+
 2009-02-19  Fatih Aşıcı  <fatih at pardus.org.tr>
 	* zorg/hwdata.py:
 		Copy hwdata module from display manager.

Modified: trunk/comar/zorg/zorg/config.py
=================================================================
--- trunk/comar/zorg/zorg/config.py	(original)
+++ trunk/comar/zorg/zorg/config.py	Thu Mar  5 23:38:09 2009
@@ -16,8 +16,6 @@
     secdri = XorgSection("dri")
     secFiles = XorgSection("Files")
     secFlags = XorgSection("ServerFlags")
-    secKeyboard = XorgSection("InputDevice")
-    secMouse = XorgSection("InputDevice")
     secDevice = XorgSection("Device")
     secScr = XorgSection("Screen")
     secLay = XorgSection("ServerLayout")
@@ -27,8 +25,6 @@
         secdri,
         secFiles,
         secFlags,
-        secKeyboard,
-        secMouse,
         secDevice,
         secScr,
         secLay
@@ -72,43 +68,6 @@
                 }
         secFlags.options.update(jailOpts)
 
-    secKeyboard.set("Identifier", "Keyboard")
-    secKeyboard.set("Driver", "kbd")
-    xkb_layout, xkb_variant = getKeymap()
-    secKeyboard.options = {
-        "CoreKeyboard" :    "true",
-        "XkbModel" :        "pc105",
-        "XkbLayout" :       xkb_layout,
-        "XkbVariant" :      xkb_variant
-    }
-
-    secMouse.set("Identifier", "Mouse")
-
-    if os.path.exists("/dev/vboxadd") and \
-        os.path.exists("/usr/lib/xorg/modules/input/vboxmouse_drv.so"):
-        secMouse.set("Driver", "vboxmouse")
-    else:
-        secMouse.set("Driver", "mouse")
-
-    secMouse.options = {
-        "CorePointer" :     "true",
-    }
-
-    if os.path.exists("/dev/input/wacom"):
-        def addWacom(wtype):
-            wacomSec = XorgSection("InputDevice")
-            wacomSec.set("Identifier", "Wacom[%s]" % wtype)
-            wacomSec.set("Driver", "wacom")
-            wacomSec.options = {
-                "Device" :          "/dev/input/wacom",
-                "Type":             wtype,
-                "USB":              "on"
-            }
-            parser.sections.append(wacomSec)
-
-        for wtype in "stylus", "eraser", "cursor", "pad":
-            addWacom(wtype)
-
     info = card.getDict()
 
     secDevice.set("Identifier", "VideoCard")
@@ -184,10 +143,6 @@
     secLay.set("Identifier", "Layout")
     secLay.set("Screen", "Screen")
 
-    if os.path.exists("/dev/input/wacom"):
-        for wtype in "stylus", "eraser", "cursor", "pad":
-            secLay.add("InputDevice", "Wacom[%s]" % wtype)
-
     backup(xorgConf)
 
     f = open(xorgConf, "w")