Changeset 4046 for neercs/trunkTweet

Timestamp:

Nov 26, 2009, 2:32:27 PM (11 years ago)

Author:

Jean-Yves Lamoureux

Message:

• mini-command now recognizes commands like window_manager="full" or borders=0 or eyecandy=False

Location:

neercs/trunk/src

Files:

• configuration.c (modified) (8 diffs)
• neercs.h (modified) (1 diff)
• python/interpreter.c (modified) (4 diffs)
• python/py_module.c (modified) (4 diffs)
• python/py_module.h (modified) (1 diff)

neercs/trunk/src/configuration.c

@@ -57 +57 @@
     {.name = "borders",.set = set_border,.get = get_border},
     {.name = "cube_duration",.set = set_cube_duration,.get =
-     get_window_manager},
-    {.name = "thumbnails",.set = set_thumbnails,.get = get_window_manager},
-    {.name = "status_bar",.set = set_status_bar,.get = get_window_manager},
+     get_cube_duration},
+    {.name = "thumbnails",.set = set_thumbnails,.get = get_thumbnails},
+    {.name = "status_bar",.set = set_status_bar,.get = get_status_bar},
     {.name = "screensaver_timeout",.set = set_screensaver_timeout,.get =
-     get_window_manager},
+     get_screensaver_timeout},
     {.name = "autolock_timeout",.set = set_autolock_timeout,.get =
-     get_window_manager},
+     get_autolock_timeout},
     {.name = "lock_on_detach",.set = set_lock_on_detach,.get =
-     get_window_manager},
-    {.name = "socket_dir",.set = set_socket_dir,.get = get_window_manager},
+     get_lock_on_detach},
+    {.name = "socket_dir",.set = set_socket_dir,.get = get_socket_dir},
     {.name = "delay",.set = set_delay,.get = get_delay},
 
@@ -136 +136 @@
 }
 
+struct config_line *get_config_option(void)
+{
+        return config_option;   
+}
 
 int parse_conf_line(char *buf, int size, struct screen_list *screen_list)
@@ -371 +375 @@
 
 #define IS_OPTION(t) (!strncmp(argv, t, strlen(argv)))
-#define IS_OPTION_TRUE (IS_OPTION("true") || IS_OPTION("1"))
+#define IS_OPTION_TRUE (IS_OPTION("true") || IS_OPTION("True") || IS_OPTION("1"))
 
 int set_window_manager(const char *argv, struct screen_list *screen_list)
@@ -507 +511 @@
 {
     if (screen_list->mini)
-        return "yes";
-    return "no";
+        return "true";
+    return "false";
 }
 
@@ -514 +518 @@
 {
     if (screen_list->status)
-        return "yes";
-    return "no";
+        return "true";
+    return "false";
 }
 
@@ -521 +525 @@
 {
     if (screen_list->eyecandy)
-        return "yes";
-    return "no";
+        return "true";
+    return "false";
 }
 
@@ -528 +532 @@
 {
     if (screen_list->border_size)
-        return "yes";
-    return "no";
+        return "true";
+    return "false";
 }
 
@@ -549 +553 @@
 {
     if (screen_list->lock_on_detach)
-        return "yes";
-    else
-        return "no";
+        return "true";
+    else
+        return "false";
 }
 

neercs/trunk/src/neercs.h

@@ -364 +364 @@
 int fill_config(struct screen_list *screen_list);
 struct config_line *get_config(const char *name);
+struct config_line *get_config_option(void);
 
 /* Python interpreter */

neercs/trunk/src/python/interpreter.c

@@ -41 +41 @@
 static void del_char(struct screen_list *sl);
 static int python_execute(struct screen_list *sl);
-static char *getStringFromPyObject(PyObject * p);
+ char *getStringFromPyObject(PyObject * p);
 static char *getPythonError(void);
 
@@ -230 +230 @@
         goto end;
     }
-
-
+    
     pModule = PyImport_Import(pName);
     Py_DECREF(pName);
+
     if (pModule != NULL)
     {
-                PyObject *o = PyRun_String(sl->interpreter_props.command, Py_eval_input, PyModule_GetDict(pModule), NULL);
-        debug("py object is %p\n", o);
+        PyObject * dictionary = PyModule_GetDict(pModule);
+        
+        getExportedValues(dictionary);
+        
+                PyObject *o = PyRun_String(sl->interpreter_props.command, Py_single_input, dictionary, NULL);
         if(!o) 
         {
@@ -245 +248 @@
         else
         {
-            debug("py res : %s\n", getStringFromPyObject(o));
+            setExportedValues(dictionary);
+            
             sl->interpreter_props.output_res = getStringFromPyObject(o);
             err = 1;
@@ -293 +297 @@
 }
 
-static char *getStringFromPyObject(PyObject * p)
+ char *getStringFromPyObject(PyObject * p)
 {
     PyObject *str = PyObject_Repr(p);

neercs/trunk/src/python/py_module.c

@@ -41 +41 @@
 
 PyObject *PyInit_neercs(void);
+void removeTrailingStuff(char *b);
+
+
+static void addVariableFromConfig(PyObject * dictionary,
+                                  const char *varname, const char *configname)
+{
+    char *v = get_config(configname)->get(screen_list);
+    if (v != NULL)
+    {
+        PyObject *value = Py_BuildValue("s", v);
+        PyDict_SetItemString(dictionary, varname, value);
+    }
+
+    debug("py get '%s' to '%s'\n", varname,
+          get_config(configname)->get(screen_list));
+
+}
+
+void removeTrailingStuff(char *b)
+{
+        if(!b) return;
+    if(b[0]=='\'') 
+    {
+        memmove(b, &b[1], strlen(b)-1);   
+        b[strlen(b)-2] = 0;
+    }
+}
+
+void setExportedValues(PyObject * dictionary)
+{
+    struct config_line *config_option = get_config_option();
+    int i = 0;
+
+    while (strncmp(config_option[i].name, "last", strlen("last")))
+    {
+        /* Get variable */
+        PyObject *res =
+            PyDict_GetItemString(dictionary, config_option[i].name);
+
+        /* Got it */
+        if (res)
+        {
+
+            /* Get object representation 
+             * FIXME : find a way to check object's type */
+            PyObject *str = PyObject_Repr(res);
+            
+            /* Make sure it's a string */
+            char *err =
+                PyBytes_AS_STRING(PyUnicode_AsEncodedString
+                                  (str, "utf-8", "Error ~"));
+                        /* FIXME leak leak leak */
+            char *s = strdup(err);
+
+            if (s != NULL)
+            {
+                /* Representation can include '' around strings */
+                removeTrailingStuff(s);
+                get_config(config_option[i].name)->set(s, screen_list);
+            }
+        }
+        i++;
+    }
+}
+
+void getExportedValues(PyObject * dictionary)
+{
+    struct config_line *config_option = get_config_option();
+    int i = 0;
+    while (strncmp(config_option[i].name, "last", strlen("last")))
+    {
+        addVariableFromConfig(dictionary, config_option[i].name,
+                              config_option[i].name);
+        i++;
+    }
+}
+
 
 static PyObject *neercs_get(PyObject * self, PyObject * args)
@@ -50 +127 @@
     if (!PyArg_ParseTuple(args, "s", &s))
     {
+        PyErr_SetString(PyExc_ValueError, "Can't parse argument");
         debug("py Can't parse");
         return NULL;
@@ -55 +133 @@
     debug("py Argument : '%s'", s);
     struct config_line *c = get_config(s);
-    debug("py config %p");
 
     if (c)
         return Py_BuildValue("s", c->get(screen_list));
-    else
-        return Py_BuildValue("s", "Invalid");
 
+
+    PyErr_SetString(PyExc_ValueError,
+                    "Can't get value for specified variable");
+    return NULL;
 }
 
 static PyObject *neercs_version(PyObject * self, PyObject * args)
 {
-    if (!PyArg_ParseTuple(args, ":version"))
-        return NULL;
     return Py_BuildValue("s", PACKAGE_VERSION);
 }
 
 static PyMethodDef NeercsMethods[] = {
-    {"version", neercs_version, METH_VARARGS, "Return the neercs version."},
+    {"version", neercs_version, METH_NOARGS, "Return the neercs version."},
     {"get", neercs_get, METH_VARARGS,
      "Return the specified variable's value."},
@@ -93 +170 @@
 {
     screen_list = sl;
-        PyInit_neercs();
+    PyInit_neercs();
 }
 

neercs/trunk/src/python/py_module.h

@@ -21 +21 @@
 
 void initNeercsModule(struct screen_list *sl);
-
+void getExportedValues(PyObject * dictionary);
+void setExportedValues(PyObject * dictionary);