updated for material C API additions

dfhack/python/dfhack_api_ctypes.py

@@ -1,4 +1,5 @@
 from ctypes import *
+from pydftypes import *
 
 int_ptr = POINTER(c_int)
 uint_ptr = POINTER(c_uint)
@@ -7,29 +8,46 @@ libdfhack = cdll.libdfhack
 libdfhack.API_Alloc.restype = c_void_p
 libdfhack.API_Free.argtypes = [ c_void_p ]
 
+libdfhack.API_getMemoryInfo.restype = c_void_p
+libdfhack.API_getProcess.restype = c_void_p
+libdfhack.API_getWindow.restype = c_void_p
+
+libdfhack.API_getCreatures.restype = c_void_p
+libdfhack.API_getMaps.restype = c_void_p
+libdfhack.API_getGui.restype = c_void_p
+libdfhack.API_getPosition.restype = c_void_p
+libdfhack.API_getMaterials.restype = c_void_p
+libdfhack.API_getTranslation.restype = c_void_p
+libdfhack.API_getVegetation.restype = c_void_p
+libdfhack.API_getBuildings.restype = c_void_p
+libdfhack.API_getConstructions.restype = c_void_p
+
 class API(object):
     def __init__(self, memory_path):
         self._api_ptr = libdfhack.API_Alloc(create_string_buffer(memory_path))
 
+        self._pos_obj = None
+        self._mat_obj = None
+
     def __del__(self):
         libdfhack.API_Free(self._api_ptr)
 
-    def Attach(self):
+    def attach(self):
         return libdfhack.API_Attach(self._api_ptr) > 0
 
-    def Detach(self):
+    def detach(self):
         return libdfhack.API_Detach(self._api_ptr) > 0
 
-    def Suspend(self):
+    def suspend(self):
         return libdfhack.API_Suspend(self._api_ptr) > 0
 
-    def Resume(self):
+    def resume(self):
         return libdfhack.API_Resume(self._api_ptr) > 0
 
-    def Force_Resume(self):
+    def force_resume(self):
         return libdfhack.API_ForceResume(self._api_ptr) > 0
 
-    def Async_Suspend(self):
+    def async_suspend(self):
         return libdfhack.API_AsyncSuspend(self._api_ptr) > 0
 
     @property
@@ -39,3 +57,217 @@ class API(object):
     @property
     def is_suspended(self):
         return libdfhack.API_isSuspended(self._api_ptr) > 0
+
+    @property
+    def position(self):
+        if self._pos_obj is None:
+            ptr = libdfhack.API_getPosition(self._api_ptr)
+
+            if ptr is not None:
+                return Position(ptr)
+            else:
+                return None
+        else:
+            return self._pos_obj
+
+    @property
+    def materials(self):
+        if self._mat_obj is None:
+            ptr = libdfhack.API_getMaterials(self._api_ptr)
+
+            if ptr is not None:
+                return Materials(ptr)
+            else:
+                return None
+        else:
+            return self._mat_obj
+
+class Position(object):
+    def __init__(self, ptr):
+        self._pos_ptr = ptr
+
+        self._vx, self._vy, self._vz = c_int(), c_int(), c_int()
+        self._cx, self._cy, self._cz = c_int(), c_int(), c_int()
+        self._ww, self._wh = c_int(), c_int()
+
+    def get_view_coords(self):
+        if libdfhack.Position_getViewCoords(self._pos_ptr, byref(self._vx), byref(self._vy), byref(self._vz)) > 0:
+            return (self._vx.value, self._vy.value, self._vz.value)
+        else:
+            return (-1, -1, -1)
+
+    def set_view_coords(self, v_coords):
+        self._vx.value, self._vy.value, self._vz.value = v_coords
+
+        libdfhack.Position_setViewCoords(self._pos_ptr, self._vx, self._vy, self._vz)
+
+    view_coords = property(get_view_coords, set_view_coords)
+    
+    def get_cursor_coords(self):
+        if libdfhack.Position_getCursorCoords(self._pos_ptr, byref(self._cx), byref(self._cy), byref(self._cz)) > 0:
+            return (self._cx.value, self._cy.value, self._cz.value)
+        else:
+            return (-1, -1, -1)
+
+    def set_cursor_coords(self, c_coords):
+        self._cx.value, self._cy.value, self_cz.value = c_coords
+
+        libdfhack.Position_setCursorCoords(self._pos_ptr, self._cx, self._cy, self._cz)
+
+    cursor_coords = property(get_cursor_coords, set_cursor_coords)
+
+    @property
+    def window_size(self):
+        if libdfhack.Position_getWindowSize(self._pos_ptr, byref(self._ww), byref(self._wh)) > 0:
+            return (self._ww.value, self._wh.value)
+        else:
+            return (-1, -1)
+
+libdfhack.Gui_ReadViewScreen.argtypes = [ c_void_p, c_void_p ]
+
+class Gui(object):
+    def __init__(self, ptr):
+        self._gui_ptr = ptr
+
+    def start(self):
+        return libdfhack.Gui_Start(self._gui_ptr)
+
+    def finish(self):
+        return libdfhack.Gui_Finish(self._gui_ptr)
+
+    def read_pause_state(self):
+        return libdfhack.Gui_ReadPauseState(self._pos_ptr) > 0
+
+    def read_view_screen(self):
+        s = ViewScreen()
+
+        if libdfhack.Gui_ReadViewScreen(self._gui_ptr, byref(s)) > 0:
+            return s
+        else:
+            return None
+
+arr_create_func = CFUNCTYPE(c_void_p, c_int)
+
+get_arg_types = [ c_void_p, arr_create_func ]
+
+libdfhack.Materials_getInorganic.argtypes = get_arg_types
+libdfhack.Materials_getOrganic.argtypes = get_arg_types
+libdfhack.Materials_getTree.argtypes = get_arg_types
+libdfhack.Materials_getPlant.argtypes = get_arg_types
+libdfhack.Materials_getRace.argtypes = get_arg_types
+libdfhack.Materials_getRaceEx.argtypes = get_arg_types
+libdfhack.Materials_getColor.argtypes = get_arg_types
+libdfhack.Materials_getOther.argtypes = get_arg_types
+
+class Materials(object):
+    def __init__(self, ptr):
+        self._mat_ptr = ptr
+
+        self.inorganic = None
+        self.organic = None
+        self.tree = None
+        self.plant = None
+        self.race = None
+        self.race_ex = None
+        self.color = None
+        self.other = None
+
+    def read_inorganic(self):
+        return libdfhack.Materials_ReadInorganicMaterials(self._mat_ptr)
+
+    def read_organic(self):
+        return libdfhack.Materials_ReadOrganicMaterials(self._mat_ptr)
+
+    def read_wood(self):
+        return libdfhack.Materials_ReadWoodMaterials(self._mat_ptr)
+
+    def read_plant(self):
+        return libdfhack.Materials_ReadPlantMaterials(self._mat_ptr)
+
+    def read_creature_types(self):
+        return libdfhack.Materials_ReadCreatureTypes(self._mat_ptr)
+
+    def read_creature_types_ex(self):
+        return libdfhack.Materials_ReadCreatureTypesEx(self._mat_ptr)
+
+    def read_descriptor_colors(self):
+        return libdfhack.Materials_ReadDescriptorColors(self._mat_ptr)
+
+    def read_others(self):
+        return libdfhack.Materials_ReadOthers(self._mat_ptr)
+
+    def read_all(self):
+        libdfhack.Materials_ReadAllMaterials(self._mat_ptr)
+
+    def get_description(self, material):
+        return libdfhack.Materials_getDescription(self._mat_ptr, byref(material))
+
+    def _allocate_matgloss_array(self, count):
+        arr_type = Matgloss * count
+
+        arr = arr_type()
+
+        ptr = c_void_p()
+        ptr = addressof(arr)
+
+        return (arr, ptr)
+
+    def update_inorganic_cache(self):
+        def update_callback(count):
+            allocated = self._allocate_matgloss_array(count)
+
+            self.inorganic = allocated[0]
+
+            return allocated[1]
+
+        callback = arr_create_func(update_callback)
+
+        return libdfhack.Materials_getInorganic(self._mat_ptr, callback)
+
+    def update_organic_cache(self):
+        def update_callback(count):
+            allocated = self._allocate_matgloss_array(count)
+
+            self.organic = allocated[0]
+
+            return allocated[1]
+
+        callback = arr_create_func(update_callback)
+
+        return libdfhack.Materials_getOrganic(self._mat_ptr, callback)
+
+    def update_tree_cache(self):
+        def update_callback(count):
+            allocated = self._allocate_matgloss_array(count)
+
+            self.tree = allocated[0]
+
+            return allocated[1]
+
+        callback = arr_create_func(update_callback)
+
+        return libdfhack.Materials_getTree(self._mat_ptr, callback)
+
+    def update_plant_cache(self):
+        def update_callback(count):
+            allocated = self._allocate_matgloss_array(count)
+
+            self.plant = allocated[0]
+
+            return allocated[1]
+
+        callback = arr_create_func(update_callback)
+
+        return libdfhack.Materials_getPlant(self._mat_ptr, callback)
+
+    def update_race_cache(self):
+        def update_callback(count):
+            allocated = self._allocate_matgloss_array(count)
+
+            self.race = allocated[0]
+
+            return allocated[1]
+
+        callback = arr_create_func(update_callback)
+
+        return libdfhack.Materials_getRace(self._mat_ptr, callback)

dfhack/python/pydftypes.py

@@ -1,3 +1,4 @@
+from ctypes import *
 from collections import namedtuple
 
 Position2D = namedtuple("Position2D", "x, y")
@@ -13,12 +14,12 @@ Attribute = namedtuple("Attribute", "level, field_4, field_8, field_C, leveldiff
 Skill = namedtuple("Skill", "id, experience, rating")
 Tree = namedtuple("Tree", "type, material, position, address")
 CreatureCaste = namedtuple("CreatureCaste", "rawname, singular, plural, adjective")
-Matgloss = namedtuple("Matgloss", "id, fore, back, bright, name")
-DescriptorColor = namedtuple("DescriptorColor", "id, r, v, b, name")
 CreatureTypeEx = namedtuple("CreatureTypeEx", "rawname, castes, tile_character, tilecolor")
 TileColor = namedtuple("TileColor", "fore, back, bright")
 Name = namedtuple("Name", "first_name, nickname, language, has_name, words, parts_of_speech")
 
+char_array = c_char * 128
+
 class Soul(object):
     def __init__(self, *args, **kwds):
         if kwds:
@@ -26,4 +27,24 @@ class Soul(object):
                 self.__dict__[k] = v
 
 class MapBlock40d(object):
-    pass
+    pass
+
+class ViewScreen(Structure):
+    _fields_ = [("type", c_int)]
+
+class Matgloss(Structure):
+    _fields_ = [("id", char_array),
+                ("fore", c_byte),
+                ("back", c_byte),
+                ("bright", c_byte),
+                ("name", char_array)]
+
+class Descriptor_Color(Structure):
+    _fields_ = [("id", char_array),
+                ("r", c_float),
+                ("v", c_float),
+                ("b", c_float),
+                ("name", char_array)]
+
+class MatglossOther(Structure):
+    _fields_ = [("rawname", char_array)]