py improvements

diff --git a/py/iact.py b/py/iact.py
index b4b5f44aa9d02c8fdbe89866acda5c6a51119a4c..073e4ca1b277876b99e68c040c5055c64f5b15a3 100755 (executable)
--- a/py/iact.py
+++ b/py/iact.py
@@ -20,6 +20,16 @@ crtc = conn.get_current_crtc()
 
 #crtc.set_mode(conn, fb, mode)
 
+i = 0
+for p in card.get_planes():
+    globals()["plane"+str(i)] = p
+    i=i+1
+
+i = 0
+for c in card.get_crtcs():
+    globals()["crtc"+str(i)] = c
+    i=i+1
+
 for p in crtc.get_possible_planes():
     if p.plane_type() == 0:
         plane = p
@@ -28,6 +38,13 @@ for p in crtc.get_possible_planes():
 def set_plane(x, y):
     crtc.set_plane(plane, fb, x, y, fb.width(), fb.height(), 0, 0, fb.width(), fb.height())
 
+def props(o):
+    o.refresh_props()
+    map = o.get_prop_map()
+    for propid in map:
+        prop = card.get_prop(propid)
+        print("%-15s %d (%#x)" % (prop.name(), map[propid], map[propid]))
+
 set_plane(0, 0)
 
 # for x in range(0, crtc.width() - fb.width()): set_plane(x, int((sin(x/50) + 1) * 100)); sleep(0.01)

diff --git a/py/pykms.i b/py/pykms.i
index 0cd3188a574c5c015db3705cd4774a2ce35e6dcc..d1b6581eb23c1feaf60fda6d0434917a8d4dfefd 100644 (file)
--- a/py/pykms.i
+++ b/py/pykms.i
@@ -10,6 +10,7 @@ using namespace kms;
 %include "std_string.i"
 %include "stdint.i"
 %include "std_vector.i"
+%include "std_map.i"
 
 %feature("director") PageFlipHandlerBase;
 
@@ -33,3 +34,4 @@ using namespace kms;
 %template(CrtcVector) std::vector<kms::Crtc*>;
 %template(EncoderVector) std::vector<kms::Encoder*>;
 %template(PlaneVector) std::vector<kms::Plane*>;
+%template(map_u32_u64) std::map<uint32_t, uint64_t>;