[Uludag-commits] r16228 - trunk/comar/zorg

[uludag-commits at pardus.org.tr]

Author: fatih
Date: Tue Dec  4 14:37:10 2007
New Revision: 16228

Modified:
   trunk/comar/zorg/zorg
Log:
enable composite with kernel option xorg=composite

Modified: trunk/comar/zorg/zorg
=================================================================
--- trunk/comar/zorg/zorg	(original)
+++ trunk/comar/zorg/zorg	Tue Dec  4 14:37:10 2007
@@ -48,6 +48,7 @@
     VendorName "%(VENDORNAME)s"
     BoardName  "%(BOARDNAME)s"
     %(BUSID)s
+    %(AIGLX_OPTS)s
 EndSection
 """
 
@@ -117,6 +118,11 @@
 EndSection
 """
 
+template_nvidia_aiglx = """
+    Option "AddARGBGLXVisuals" "true"
+    Option "AllowGLXWithComposite" "true"
+"""
+
 template_screen = """
 Section "Screen"
     Identifier "Screen%(N)s"
@@ -183,7 +189,7 @@
 EndSection
 
 Section "Extensions"
-#    Option "Composite" "Enable"
+    %(COMPOSITE)s
 EndSection
 
 Section "dri"
@@ -248,6 +254,7 @@
     # Screen      1  "Screen1" RightOf "Screen0"
     Option      "Xinerama" "off"
     Option      "Clone" "off"
+    %(AIGLX_OPTS)s
 EndSection
 """
 
@@ -894,6 +901,16 @@
         keys_vc["VENDORNAME"] = cards[i].VendorName
         keys_vc["BOARDNAME"] = cards[i].BoardName
         keys_vc["BUSID"] = cards[i].BusId 
+
+        keys_vc["AIGLX_OPTS"] = ""
+
+        if "composite" in getKernelOpt():
+            if cards[i].Driver in ("ati", "intel"):
+                keys_vc["AIGLX_OPTS"] = 'Option "XAANoOffscreenPixmaps" "true"'
+
+            elif cards[i].Driver == "nvidia":
+                keys_vc["AIGLX_OPTS"] = template_nvidia_aiglx
+
         sec += template_videocard % keys_vc
     return sec
 
@@ -1035,6 +1052,18 @@
     keysTouchpad(keys_main)
     keys_main["KEYMAP"] = queryKeymap()
 
+    # Enable composite extension if requested
+    keys_main["AIGLX_OPTS"] = ""
+
+    if "composite" in getKernelOpt():
+        keys_main["COMPOSITE"] = 'Option "Composite" "enable"'
+
+        if cards[0].Driver in ("ati", "intel"):
+            keys_main["AIGLX_OPTS"] = 'Option "AIGLX" "true"'
+
+    else:
+        keys_main["COMPOSITE"] = '#Option "Composite" "enable"'
+
     write_tmpl(keys_main)
 
 def safeConfigure(_driver = "vesa"):