Revision: 19217
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19217
Author: campbellbarton
Date: 2009-03-07 10:46:33 +0100 (Sat, 07 Mar 2009)
Log Message:
-----------
added python api function to register an operator into a keymap
example...
bpyui.registerKey( C, bpyui.spaceTypes.SEQ, 0, "Sequencer",
"SEQUENCER_OT_view_selected", bpyui.keyTypes.A, bpyui.keyValTypes.PRESS, 0,0,
{})
May want to split this into multiple functions.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
branches/blender2.5/blender/source/blender/python/intern/bpy_ui.c
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
2009-03-07 08:52:30 UTC (rev 19216)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
2009-03-07 09:46:33 UTC (rev 19217)
@@ -80,5 +80,8 @@
PyObject *Py_CmpToRich(int op, int cmp);
#endif
+#ifndef Py_CmpToRich
+PyObject *Py_CmpToRich(int op, int cmp); /* bpy_util.c */
+#endif
#endif /* BPY_COMPAT_H__ */
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-03-07 08:52:30 UTC (rev 19216)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-03-07 09:46:33 UTC (rev 19217)
@@ -586,7 +586,7 @@
ret = pyrna_prop_to_py(&self->ptr, prop);
}
else if (strcmp(name, "__dict__")==0) { /* Not quite correct, adding
this so dir() gives good feedback */
- PropertyRNA *prop, *iterprop, *nameprop;
+ PropertyRNA *iterprop, *nameprop;
CollectionPropertyIterator iter;
char name[256], *nameptr;
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_ui.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_ui.c
2009-03-07 08:52:30 UTC (rev 19216)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_ui.c
2009-03-07 09:46:33 UTC (rev 19217)
@@ -317,7 +317,36 @@
Py_RETURN_NONE;
}
+static PyObject *Method_registerKey( PyObject * self, PyObject * args )
+{
+ PyObject *py_context;
+ PyObject *py_keywords= NULL;
+ char *keymap_name, *operator_name;
+ int spaceid, regionid;
+ int keyval, evtval, q1, q2;
+
+ wmWindowManager *wm;
+ ListBase *keymap;
+ wmKeymapItem *km;
+
+ if( !PyArg_ParseTuple( args, "O!iissiiii|O!:registerKey",
&PyCObject_Type, &py_context, &spaceid, ®ionid, &keymap_name,
&operator_name, &keyval, &evtval, &q1, &q2, &PyDict_Type, &py_keywords) )
+ return NULL;
+ wm= CTX_wm_manager(PyCObject_AsVoidPtr(py_context));
+
+ /* keymap= WM_keymap_listbase(wm, "Image Generic", SPACE_IMAGE, 0); */
+ keymap= WM_keymap_listbase(wm, keymap_name, spaceid, regionid);
+
+ km= WM_keymap_add_item(keymap, operator_name, keyval, evtval, q1, q2);
+
+ /* Optional python doctionary used to set python properties, just like
how keyword args are used */
+ if (py_keywords && PyDict_Size(py_keywords)) {
+ if (PYOP_props_from_dict(km->ptr, py_keywords) == -1)
+ return NULL;
+ }
+
+ Py_RETURN_NONE;
+}
/* internal use only */
static bContext *get_py_context__internal(void)
@@ -386,7 +415,10 @@
{"matchPanelsView2d", (PyCFunction)Method_matchPanelsView2d,
METH_VARARGS, ""},
{"register", (PyCFunction)Method_register, METH_VARARGS, ""}, // XXX
not sure about this - registers current script with the ScriptSpace, like
Draw.Register()
+ {"registerKey", (PyCFunction)Method_registerKey, METH_VARARGS, ""}, //
XXX could have this in another place too
+
+
{"getRegonPtr", (PyCFunction)Method_getRegonPtr, METH_NOARGS,
""}, // XXX Nasty, we really need to improve dealing with context!
{"getAreaPtr", (PyCFunction)Method_getAreaPtr, METH_NOARGS,
""},
{"getScreenPtr", (PyCFunction)Method_getScreenPtr, METH_NOARGS, ""},
@@ -408,7 +440,7 @@
PyObject *BPY_ui_module( void )
{
- PyObject *submodule, *dict;
+ PyObject *submodule, *mod;
#if PY_VERSION_HEX >= 0x03000000
submodule= PyModule_Create(&ui_module);
#else /* Py2.x */
@@ -416,26 +448,177 @@
#endif
/* uiBlock->flag (controls) */
- PyModule_AddObject( submodule, "UI_BLOCK_LOOP",
PyLong_FromSize_t(UI_BLOCK_LOOP) );
- PyModule_AddObject( submodule, "UI_BLOCK_RET_1",
PyLong_FromSize_t(UI_BLOCK_RET_1) );
- PyModule_AddObject( submodule, "UI_BLOCK_NUMSELECT",
PyLong_FromSize_t(UI_BLOCK_NUMSELECT) );
- PyModule_AddObject( submodule, "UI_BLOCK_ENTER_OK",
PyLong_FromSize_t(UI_BLOCK_ENTER_OK) );
- PyModule_AddObject( submodule, "UI_BLOCK_NOSHADOW",
PyLong_FromSize_t(UI_BLOCK_NOSHADOW) );
- PyModule_AddObject( submodule, "UI_BLOCK_NO_HILITE",
PyLong_FromSize_t(UI_BLOCK_NO_HILITE) );
- PyModule_AddObject( submodule, "UI_BLOCK_MOVEMOUSE_QUIT",
PyLong_FromSize_t(UI_BLOCK_MOVEMOUSE_QUIT) );
- PyModule_AddObject( submodule, "UI_BLOCK_KEEP_OPEN",
PyLong_FromSize_t(UI_BLOCK_KEEP_OPEN) );
- PyModule_AddObject( submodule, "UI_BLOCK_POPUP",
PyLong_FromSize_t(UI_BLOCK_POPUP) );
+ mod = PyModule_New("ui");
+ PyModule_AddObject( submodule, "ui", mod );
+ PyModule_AddObject( mod, "BLOCK_LOOP", PyLong_FromSize_t(UI_BLOCK_LOOP)
);
+ PyModule_AddObject( mod, "BLOCK_RET_1",
PyLong_FromSize_t(UI_BLOCK_RET_1) );
+ PyModule_AddObject( mod, "BLOCK_NUMSELECT",
PyLong_FromSize_t(UI_BLOCK_NUMSELECT) );
+ PyModule_AddObject( mod, "BLOCK_ENTER_OK",
PyLong_FromSize_t(UI_BLOCK_ENTER_OK) );
+ PyModule_AddObject( mod, "BLOCK_NOSHADOW",
PyLong_FromSize_t(UI_BLOCK_NOSHADOW) );
+ PyModule_AddObject( mod, "BLOCK_NO_HILITE",
PyLong_FromSize_t(UI_BLOCK_NO_HILITE) );
+ PyModule_AddObject( mod, "BLOCK_MOVEMOUSE_QUIT",
PyLong_FromSize_t(UI_BLOCK_MOVEMOUSE_QUIT) );
+ PyModule_AddObject( mod, "BLOCK_KEEP_OPEN",
PyLong_FromSize_t(UI_BLOCK_KEEP_OPEN) );
+ PyModule_AddObject( mod, "BLOCK_POPUP",
PyLong_FromSize_t(UI_BLOCK_POPUP) );
/* for executing operators (XXX move elsewhere) */
- PyModule_AddObject( submodule, "WM_OP_INVOKE_DEFAULT",
PyLong_FromSize_t(WM_OP_INVOKE_DEFAULT) );
- PyModule_AddObject( submodule, "WM_OP_INVOKE_REGION_WIN",
PyLong_FromSize_t(WM_OP_INVOKE_REGION_WIN) );
- PyModule_AddObject( submodule, "WM_OP_INVOKE_AREA",
PyLong_FromSize_t(WM_OP_INVOKE_AREA) );
- PyModule_AddObject( submodule, "WM_OP_INVOKE_SCREEN",
PyLong_FromSize_t(WM_OP_INVOKE_SCREEN) );
- PyModule_AddObject( submodule, "WM_OP_EXEC_DEFAULT",
PyLong_FromSize_t(WM_OP_EXEC_DEFAULT) );
- PyModule_AddObject( submodule, "WM_OP_EXEC_REGION_WIN",
PyLong_FromSize_t(WM_OP_EXEC_REGION_WIN) );
- PyModule_AddObject( submodule, "WM_OP_EXEC_AREA",
PyLong_FromSize_t(WM_OP_EXEC_AREA) );
- PyModule_AddObject( submodule, "WM_OP_EXEC_SCREEN",
PyLong_FromSize_t(WM_OP_EXEC_SCREEN) );
+ mod = PyModule_New("wmTypes");
+ PyModule_AddObject( submodule, "wmTypes", mod );
+ PyModule_AddObject( mod, "OP_INVOKE_DEFAULT",
PyLong_FromSize_t(WM_OP_INVOKE_DEFAULT) );
+ PyModule_AddObject( mod, "OP_INVOKE_REGION_WIN",
PyLong_FromSize_t(WM_OP_INVOKE_REGION_WIN) );
+ PyModule_AddObject( mod, "OP_INVOKE_AREA",
PyLong_FromSize_t(WM_OP_INVOKE_AREA) );
+ PyModule_AddObject( mod, "OP_INVOKE_SCREEN",
PyLong_FromSize_t(WM_OP_INVOKE_SCREEN) );
+ PyModule_AddObject( mod, "OP_EXEC_DEFAULT",
PyLong_FromSize_t(WM_OP_EXEC_DEFAULT) );
+ PyModule_AddObject( mod, "OP_EXEC_REGION_WIN",
PyLong_FromSize_t(WM_OP_EXEC_REGION_WIN) );
+ PyModule_AddObject( mod, "OP_EXEC_AREA",
PyLong_FromSize_t(WM_OP_EXEC_AREA) );
+ PyModule_AddObject( mod, "OP_EXEC_SCREEN",
PyLong_FromSize_t(WM_OP_EXEC_SCREEN) );
+ mod = PyModule_New("keyValTypes");
+ PyModule_AddObject( submodule, "keyValTypes", mod );
+ PyModule_AddObject( mod, "ANY", PyLong_FromSize_t(KM_ANY) );
+ PyModule_AddObject( mod, "NOTHING", PyLong_FromSize_t(KM_NOTHING) );
+ PyModule_AddObject( mod, "PRESS", PyLong_FromSize_t(KM_PRESS) );
+ PyModule_AddObject( mod, "RELEASE", PyLong_FromSize_t(KM_RELEASE) );
+
+ mod = PyModule_New("keyModTypes");
+ PyModule_AddObject( submodule, "keyModTypes", mod );
+ PyModule_AddObject( mod, "SHIFT", PyLong_FromSize_t(KM_SHIFT) );
+ PyModule_AddObject( mod, "CTRL", PyLong_FromSize_t(KM_CTRL) );
+ PyModule_AddObject( mod, "ALT", PyLong_FromSize_t(KM_ALT) );
+ PyModule_AddObject( mod, "OSKEY", PyLong_FromSize_t(KM_OSKEY) );
+
+ PyModule_AddObject( mod, "SHIFT2", PyLong_FromSize_t(KM_SHIFT2) );
+ PyModule_AddObject( mod, "CTRL2", PyLong_FromSize_t(KM_CTRL2) );
+ PyModule_AddObject( mod, "ALT2", PyLong_FromSize_t(KM_ALT2) );
+ PyModule_AddObject( mod, "OSKEY2", PyLong_FromSize_t(KM_OSKEY2) );
+
+ mod = PyModule_New("keyTypes");
+ PyModule_AddObject( submodule, "keyTypes", mod );
+ PyModule_AddObject( mod, "A", PyLong_FromSize_t(AKEY) );
+ PyModule_AddObject( mod, "B", PyLong_FromSize_t(BKEY) );
+ PyModule_AddObject( mod, "C", PyLong_FromSize_t(CKEY) );
+ PyModule_AddObject( mod, "D", PyLong_FromSize_t(DKEY) );
+ PyModule_AddObject( mod, "E", PyLong_FromSize_t(EKEY) );
+ PyModule_AddObject( mod, "F", PyLong_FromSize_t(FKEY) );
+ PyModule_AddObject( mod, "G", PyLong_FromSize_t(GKEY) );
+ PyModule_AddObject( mod, "H", PyLong_FromSize_t(HKEY) );
+ PyModule_AddObject( mod, "I", PyLong_FromSize_t(IKEY) );
+ PyModule_AddObject( mod, "J", PyLong_FromSize_t(JKEY) );
+ PyModule_AddObject( mod, "K", PyLong_FromSize_t(KKEY) );
+ PyModule_AddObject( mod, "L", PyLong_FromSize_t(LKEY) );
+ PyModule_AddObject( mod, "M", PyLong_FromSize_t(MKEY) );
+ PyModule_AddObject( mod, "N", PyLong_FromSize_t(NKEY) );
+ PyModule_AddObject( mod, "O", PyLong_FromSize_t(OKEY) );
+ PyModule_AddObject( mod, "P", PyLong_FromSize_t(PKEY) );
+ PyModule_AddObject( mod, "Q", PyLong_FromSize_t(QKEY) );
+ PyModule_AddObject( mod, "R", PyLong_FromSize_t(RKEY) );
+ PyModule_AddObject( mod, "S", PyLong_FromSize_t(SKEY) );
+ PyModule_AddObject( mod, "T", PyLong_FromSize_t(TKEY) );
+ PyModule_AddObject( mod, "U", PyLong_FromSize_t(UKEY) );
+ PyModule_AddObject( mod, "V", PyLong_FromSize_t(VKEY) );
+ PyModule_AddObject( mod, "W", PyLong_FromSize_t(WKEY) );
+ PyModule_AddObject( mod, "X", PyLong_FromSize_t(XKEY) );
+ PyModule_AddObject( mod, "Y", PyLong_FromSize_t(YKEY) );
+ PyModule_AddObject( mod, "Z", PyLong_FromSize_t(ZKEY) );
+ PyModule_AddObject( mod, "ZERO", PyLong_FromSize_t(ZEROKEY) );
+ PyModule_AddObject( mod, "ONE", PyLong_FromSize_t(ONEKEY) );
+ PyModule_AddObject( mod, "TWO", PyLong_FromSize_t(TWOKEY) );
+ PyModule_AddObject( mod, "THREE", PyLong_FromSize_t(THREEKEY) );
+ PyModule_AddObject( mod, "FOUR", PyLong_FromSize_t(FOURKEY) );
+ PyModule_AddObject( mod, "FIVE", PyLong_FromSize_t(FIVEKEY) );
+ PyModule_AddObject( mod, "SIX", PyLong_FromSize_t(SIXKEY) );
+ PyModule_AddObject( mod, "SEVEN", PyLong_FromSize_t(SEVENKEY) );
+ PyModule_AddObject( mod, "EIGHT", PyLong_FromSize_t(EIGHTKEY) );
+ PyModule_AddObject( mod, "NINE", PyLong_FromSize_t(NINEKEY) );
+ PyModule_AddObject( mod, "CAPSLOCK", PyLong_FromSize_t(CAPSLOCKKEY) );
+ PyModule_AddObject( mod, "LEFTCTRL", PyLong_FromSize_t(LEFTCTRLKEY) );
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
