[Uludag-commits] r15299 - in trunk/staj-projeleri/zorg: . comar zorg
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
5 Eyl 2007 Çar 10:59:43 EEST
Author: fatih
Date: Wed Sep 5 10:59:42 2007
New Revision: 15299
Modified:
trunk/staj-projeleri/zorg/comar/xorg.display.py
trunk/staj-projeleri/zorg/zorg-cli
trunk/staj-projeleri/zorg/zorg/config.py
trunk/staj-projeleri/zorg/zorg/hwdata.py
trunk/staj-projeleri/zorg/zorg/probe.py
Log:
Use the new query code
Now it can generate a simple configuration for
RandR 1.2 enabled drivers.
Modified: trunk/staj-projeleri/zorg/comar/xorg.display.py
=================================================================
--- trunk/staj-projeleri/zorg/comar/xorg.display.py (original)
+++ trunk/staj-projeleri/zorg/comar/xorg.display.py Wed Sep 5 10:59:42 2007
@@ -15,24 +15,17 @@
for dev in devices:
queryDevice(dev)
- # we need card data to check for lcd displays
- monitor = findMonitors(device, 0)[0]
-
- if not monitor.probed:
- print "Could not detect a monitor on the first controller. Trying next..."
- device.monitors = []
- monitor = findMonitors(device, 1)[0]
-
- # Add a default monitor for other devices
- if len(devices) > 1:
- defMon = DefaultMonitor()
- for dev in devices:
- if not dev.monitors:
- dev.monitors.append(defMon)
+ monitor = None
+ if device.monitors:
+ if len(device.monitors) > 1 and not device.monitors[0].probed:
+ monitor = device.monitors[1]
+ else:
+ monitor = device.monitors[0]
screen = Screen(device, monitor)
#screen.number = 0
- screen.res = monitor.res[0]
+ if monitor:
+ screen.res = monitor.res[0]
#screen.setup()
config = XConfig()
Modified: trunk/staj-projeleri/zorg/zorg-cli
=================================================================
--- trunk/staj-projeleri/zorg/zorg-cli (original)
+++ trunk/staj-projeleri/zorg/zorg-cli Wed Sep 5 10:59:42 2007
@@ -88,7 +88,7 @@
if not scr:
out.error("Could not get screen info")
return
-
+
out.sect("Setting mode to %s" % opts.mode)
res = opts.mode.split("-")[0]
@@ -120,7 +120,7 @@
reply = link.read_cmd()
if reply.command == "fail":
out.error(reply.data)
-
+
updateOpenGL(None, False)
def info():
@@ -164,7 +164,7 @@
continue
out.info(" Video card = %s" % cards[scr.device.id])
- out.info(" Monitor = %s" % monitors[scr.monitor.id])
+ #out.info(" Monitor = %s" % monitors[scr.monitor.id])
out.info(" Resolution = %s" % scr.res)
out.info(" Color depth = %s" % scr.depth)
out.info("")
Modified: trunk/staj-projeleri/zorg/zorg/config.py
=================================================================
--- trunk/staj-projeleri/zorg/zorg/config.py (original)
+++ trunk/staj-projeleri/zorg/zorg/config.py Wed Sep 5 10:59:42 2007
@@ -195,12 +195,14 @@
sec = XorgSection("Screen")
sec.set("Identifier", scr.identifier)
sec.set("Device", scr.device.identifier)
- sec.set("Monitor", scr.monitor.identifier)
+ if scr.monitor:
+ sec.set("Monitor", scr.monitor.identifier)
sec.set("DefaultDepth", scr.depth)
subsec = XorgSection("Display")
subsec.set("Depth", scr.depth)
- subsec.set("Modes", *scr.modes)
+ if not scr.device.randr12:
+ subsec.set("Modes", *scr.modes)
sec.sections = [subsec]
self._parser.sections.append(sec)
@@ -214,7 +216,8 @@
screen.setup()
secDev = self._addDevice(dev, screen.number)
- secMon = self._addMonitor(mon)
+ if mon:
+ secMon = self._addMonitor(mon)
secScr = self._addScreen(screen)
self._priScreen = screen
@@ -444,7 +447,6 @@
tags = {
"Card" : screen.device.id,
- "Monitor" : screen.monitor.id,
"Resolution" : screen.res,
"Depth" : str(screen.depth)
}
@@ -452,6 +454,9 @@
for k, v in tags.items():
addTag(tag, k, v)
+ if screen.monitor:
+ addTag(tag, "Monitor", screen.monitor.id)
+
def enableScreen(self, number, enable=True):
nr = str(screen.number)
for tag in self.doc.tags("Screen"):
Modified: trunk/staj-projeleri/zorg/zorg/hwdata.py
=================================================================
--- trunk/staj-projeleri/zorg/zorg/hwdata.py (original)
+++ trunk/staj-projeleri/zorg/zorg/hwdata.py Wed Sep 5 10:59:42 2007
@@ -128,7 +128,8 @@
def setup(self):
self.identifier = "Screen%d" % self.number
- self.monitor.identifier = "Monitor%d" % self.number
+ if self.monitor:
+ self.monitor.identifier = "Monitor%d" % self.number
self.device.identifier = "VideoCard%d" % self.number
if not self.depth or self.device.driver == "fglrx":
@@ -137,13 +138,14 @@
else:
self.depth = 16
- print "Supported modes are %s" % self.monitor.res
- print "Requested mode is %s" % self.res
- if self.res in self.monitor.res:
- i = self.monitor.res.index(self.res)
- self.modes = self.monitor.res[i:]
- else:
- self.modes[:0] = [self.res]
+ if self.monitor:
+ print "Supported modes are %s" % self.monitor.res
+ print "Requested mode is %s" % self.res
+ if self.res in self.monitor.res:
+ i = self.monitor.res.index(self.res)
+ self.modes = self.monitor.res[i:]
+ else:
+ self.modes[:0] = [self.res]
def driver2opengl(driver):
return opengl_impl.get(driver, "xorg-x11")
Modified: trunk/staj-projeleri/zorg/zorg/probe.py
=================================================================
--- trunk/staj-projeleri/zorg/zorg/probe.py (original)
+++ trunk/staj-projeleri/zorg/zorg/probe.py Wed Sep 5 10:59:42 2007
@@ -151,6 +151,8 @@
if dev.driver in randr12_drivers:
dev.randr12 = True
+ queryOutputs(dev)
+
def findVideoCards():
""" Finds video cards. Result is a list of Device objects. """
cards = []
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi