Changeset 4038Tweet

Timestamp:

Nov 25, 2009, 4:07:46 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Better python command handling
• Added get(str) to neercs python module, doesn't work as I would like to
• Avoid redefining everything while including neercs.h several times

Location:

neercs/trunk/src

Files:

• configuration.c (modified) (4 diffs)
• interpreter.c (modified) (4 diffs)
• neercs.h (modified) (3 diffs)
• py_module.c (modified) (3 diffs)
• py_module.h (modified) (1 diff)
• server.c (modified) (1 diff)

neercs/trunk/src/configuration.c

@@ -67 +67 @@
      get_window_manager},
     {.name = "socket_dir",.set = set_socket_dir,.get = get_window_manager},
-    {.name = "delay",.set = set_delay,.get = NULL},
+    {.name = "delay",.set = set_delay,.get = get_delay},
 
     {.name = "last",.set = NULL},
@@ -322 +322 @@
 {
     int i = 0;
+    
+    debug("Looking for '%s'\n", name);
+    
     while (strncmp(config_option[i].name, "last", strlen("last")))
     {
+        debug("%d Testing against '%s'\n", i, config_option[i].name);
         if (!strncmp(name, config_option[i].name, strlen(name)))
         {
@@ -476 +480 @@
 char *get_window_manager(struct screen_list *screen_list)
 {
+    debug("Window manager is %d\n", screen_list->wm_type);
     switch (screen_list->wm_type)
     {
@@ -487 +492 @@
         return "hsplit";
     default:
-        return "invalid";
+        return "invalid window manager";
     }
     return NULL;                /* Not reached */

neercs/trunk/src/interpreter.c

@@ -182 +182 @@
     Py_Initialize();
     
-    PyInit_neercs();
+    PyInit_neercs(sl);
     
     return 0;
@@ -219 +219 @@
     }
     
-    PyObject *pModule, *pName, *pFunc, *pValue;
+    PyObject *pModule, *pName, *pFunc;
 
     /* Module from which to call the function */
@@ -236 +236 @@
     if (pModule != NULL)
     {
-        pFunc = PyObject_GetAttrString(pModule, sl->interpreter_props.command);
-        if (pFunc && PyCallable_Check(pFunc))
+                PyObject *o = PyRun_String(sl->interpreter_props.command, Py_eval_input, PyModule_GetDict(pModule), NULL);
+        debug("py object is %p\n", o);
+        if(!o) 
         {
-            pValue = PyObject_CallObject(pFunc, NULL);
-            if (pValue != NULL) {
-                char *res = getStringFromPyObject(pValue);
-                sl->interpreter_props.output_res = res;
-                debug("py Result of call: %s\n", res);
-                Py_DECREF(pValue);
-                err = 2;
-            }
-            else {
-                Py_DECREF(pFunc);
-                Py_DECREF(pModule);
-                sl->interpreter_props.output_err = getPythonError();
-                err = 1;
-                debug("py Call failed\n");
-                goto end;
-                return 1;
-            }
+                sl->interpreter_props.output_err = getPythonError();   
+            err = 1;
         }
         else
         {
-            sl->interpreter_props.output_err = getPythonError();
+            debug("py res : %s\n", getStringFromPyObject(o));
+            sl->interpreter_props.output_res = getStringFromPyObject(o);
             err = 1;
-            debug("py Error 2\n");
-            goto end;
         }
+                goto end;
+            
     }
     else
@@ -299 +286 @@
     PyErr_Fetch(&type, &value, &traceback);
 
-    char *etype = getStringFromPyObject(type);
     char *evalue = getStringFromPyObject(value);
 

neercs/trunk/src/neercs.h

@@ -14 +14 @@
  */
 
+#ifndef _NEERCS_H_
+#define _NEERCS_H_
+
 #include <stdint.h>
-
 #include <caca.h>
 
@@ -361 +363 @@
 int get_key_value(char *line, struct option *option);
 int fill_config(struct screen_list *screen_list);
-
+struct config_line *get_config(const char *name);
 
 /* Python interpreter */
@@ -386 +388 @@
 #   define debug(format, ...) do {} while(0)
 #endif
-
+#endif /* _NEERCS_H_ */

neercs/trunk/src/py_module.c

@@ -37 +37 @@
 #include "neercs.h"
 
+/* FIXME : Find a way to pass a user pointer to PyModuleDef or something */
+struct screen_list *screen_list;
+
+static PyObject*
+neercs_get(PyObject *self, PyObject *args)
+{
+    char *s = NULL;
+    
+    debug("Get using list at %p\n", screen_list);
+    
+    if(!PyArg_ParseTuple(args, "s", &s))
+    {
+        debug("py Can't parse\n");
+        return NULL;
+    }
+    debug("py Argument : '%s'\n", s);
+    struct config_line *c = get_config(s);
+    debug("py config %p\n");
+    
+    if(c)
+        return Py_BuildValue("s", c->get(screen_list));
+    else 
+        return Py_BuildValue("s", "Invalid");
+
+}
 
 static PyObject*
@@ -47 +72 @@
 
 static PyMethodDef NeercsMethods[] = {
-    {"version", neercs_version, METH_VARARGS,
-        "Return the neercs version."},
+    {"version", neercs_version, METH_VARARGS,  "Return the neercs version."},
+    {"get", neercs_get, METH_VARARGS,  "Return the specified variable's value."},
     {NULL, NULL, 0, NULL}
 };
@@ -57 +82 @@
 };
 
-PyObject* PyInit_neercs(void)
+PyObject* PyInit_neercs(struct screen_list* sl)
 {
+    screen_list = sl;
     PyObject* o =  PyModule_Create(&NeercsModule);
     PyImport_AppendInittab("neercs", &PyInit_neercs);

neercs/trunk/src/py_module.h

@@ -18 +18 @@
 
 #include <Python.h>
+#include "neercs.h"
 
-PyObject* PyInit_neercs(void);
+PyObject* PyInit_neercs(struct screen_list* sl);
 
 

neercs/trunk/src/server.c

@@ -385 +385 @@
 {
     int i;
+    debug("Screen list at %p\n", screen_list);
+    
     /* Create socket and bind it */
     create_socket(screen_list, SOCK_SERVER);