Merge lp:~bijanbina/ginn/GIR into lp:ginn

[Bijan Binaee]

1. port GINN to c++
2. use string instead of char *
3. fix all error with c++ compiler
4. create Gwish class instead of wish struct
5. add Gwish Type (geusture Type) instead of config_attr[0] to make code more readable and replace it in all part of code
6. add Gwish TouchNum (Number of finger for gesture) instead of config_attr[1] to make code more readable and replace it to all part of code
5. create GINN object and create a dynamic callback for GINN object
6. use "new" instead of memloc
7. remove all global variable and embed all of them in class
8. create qt project file for ginn
9. use cout and cerr instead of fprintf
10. abstract the main file and create the code more functionally
11. test all new changes and check are they stable or not
12. create constractor for apps and make Gapps object instead it
13. create callback for device add , remove and change with object oriented concept
14. create GD_att struct to save and access device attributes
15. create device list vector
16. find device attribute with just having device ID!(perfectly useful)
17. make code more readable
18. add comment to code and use simple name for variable
19. add some option to wish.xml to define some gesture for only touchscreen
20. add some option to wish.xml to define some gesture for only touchpad
21. compatible fully with last GINN branch
---------------------------------------------------------------------------------------------------------------------------------------
##################<Define Gesture Run On Which Device>#####################
1. open wish.xml
2. find what gesture you want to classify for example you select some thing like this:

    <wish gesture="Drag" fingers="2">
      <action name="action5" when="update">
        <trigger prop="delta y" min="20" max="80"/>
        <button>4</button>
      </action>
    </wish>

3. change <wish gesture="Drag" fingers="2"> to
<wish gesture="Drag" fingers="2" screen="true">
4. if you want to your gesture run only on touchpad change screen prop to false else now your
gesture only run on touch screen
-------------------------------------------------------------------------------------------------------------------------------------

[Stephen M. Webb (bregma)]

I have a number of issues with this proposal.

(1) You need to explicitly justify moving from C to C++. In particular, renaming all existing C sources to C++. What does the project gain from this? What are the possible repercussions (ie. what new problems are introduced and what new potential for error is obtained)? The renaming introduces a lot of noise that makes it difficult to evaluate the rest of the change.

(2) This merge marks most sources as executable. That is undesirable.

(3) What is the .directory file? It does not appear to be necessary to build the project.

(4) Please do not use ///-style or //!-style comments, use Javadoc-style (/**) comments for consistency with the style of other uTouch projects.

(5) The various classes implement their own containers. Is there a good reason not to use the (tested, dependable) standard library instead? One of the main advantages to porting to C++ is the ability to use the C++ library.

(6) None of this code is exception safe. When errors are encountered, resources are leaked or undefined behaviour is encountered.

(7) There is no cleanup: objects are created using new but never deleted.

(8) Class constructors are assigning initial values to members in the constructor body instead of using initializer lists. Most of the classes are C structs that rely on external code to maintain their invariants: what is the point of converting to C++ if the code is just non-OO style C? See http://en.wikipedia.org/wiki/Class_invariant.

(9) Why add a capital G or D to classes and function names? This does not contribute to readability in a positive way. If this is to represent words like "device" or "gesture", use those words. We are not experiencing a shortage of ASCII.

(10) Some variable names could reflect their purpose better: for example, what is "local" used for?

(11) "header.h" is not an acceptable header file name. Also, please do not create a single header file to include all other header files any source file might need. Headers should pull in only the minimal subset of headers they need to compile on their own. Never put a "using namespace" directive in a header file.

(12) GINN::Dadded catches an exception of type error_t, but there is no code inside the try-block that can throw such a type. The only exception possible from the try-block is std::bad_alloc.

(13) Please leave at least one blank line between function definitions for readability.

review: Needs Fixing

[Bijan Binaee (bijanbina)]

> I have a number of issues with this proposal.
>
> (1) You need to explicitly justify moving from C to C++. In particular,
> renaming all existing C sources to C++. What does the project gain from this?
> What are the possible repercussions (ie. what new problems are introduced and
> what new potential for error is obtained)? The renaming introduces a lot of
> noise that makes it difficult to evaluate the rest of the change.
>
> (2) This merge marks most sources as executable. That is undesirable.
>
> (3) What is the .directory file? It does not appear to be necessary to build
> the project.
>
> (4) Please do not use ///-style or //!-style comments, use Javadoc-style (/**)
> comments for consistency with the style of other uTouch projects.
>
> (5) The various classes implement their own containers. Is there a good
> reason not to use the (tested, dependable) standard library instead? One of
> the main advantages to porting to C++ is the ability to use the C++ library.
>
> (6) None of this code is exception safe. When errors are encountered,
> resources are leaked or undefined behaviour is encountered.
>
> (7) There is no cleanup: objects are created using new but never deleted.
>
> (8) Class constructors are assigning initial values to members in the
> constructor body instead of using initializer lists. Most of the classes are
> C structs that rely on external code to maintain their invariants: what is
> the point of converting to C++ if the code is just non-OO style C? See
> http://en.wikipedia.org/wiki/Class_invariant.
>
> (9) Why add a capital G or D to classes and function names? This does not
> contribute to readability in a positive way. If this is to represent words
> like "device" or "gesture", use those words. We are not experiencing a
> shortage of ASCII.
>
> (10) Some variable names could reflect their purpose better: for example,
> what is "local" used for?
>
> (11) "header.h" is not an acceptable header file name. Also, please do not
> create a single header file to include all other header files any source file
> might need. Headers should pull in only the minimal subset of headers they
> need to compile on their own. Never put a "using namespace" directive in a
> header file.
>
> (12) GINN::Dadded catches an exception of type error_t, but there is no code
> inside the try-block that can throw such a type. The only exception possible
> from the try-block is std::bad_alloc.
>
> (13) Please leave at least one blank line between function definitions for
> readability.

1: if you think renaming is getting you to trouble so i must do what to port to c++
2: No why you think so
3: i remove it if the code accepted
4: the comment is not part of code! please review the code not comment!
5: can you make instance in my code
6: can you make instance in my code
7: it's the c++ advantage unlike C it delete them automatically
8: it's only on some classes and it is because if we change it need to recreate a code fuly again!!
9: if you use a very long function name you made the developer get to pitfall it's the best way to simple the develop process and have various advantage
10: it use to create a local copy ...

[Chase Douglas (chasedouglas)]

First, Stephen has noted many issues with the changes. I agree with all of them, so it makes sense to have them fixed before doing any further review of the code.

> 1: if you think renaming is getting you to trouble so i must do what to port
> to c++

It's not the renaming that is the problem. If the renaming provided some benefits it would be acceptable. However, the renaming here is to allow for C++ compilation. Thus, there needs to be worthwhile C++ usage or else we could just leave it as C.

This hits at a big issue with the changes. I don't think you fully understand C++, how to use it properly, and how to make code better and more readable with it. Ginn could benefit greatly from being converted to C++. However, these changes do not make the code better.

> 2: No why you think so

See the preview diff below. There are lines like:

=== modified file 'COPYING' (properties changed: -x to +x)

> 3: i remove it if the code accepted

The way to fix this is to remove it in your branch, commit the change, and then push it to this branch on launchpad.net. That will update the merge proposal.

> 4: the comment is not part of code! please review the code not comment!

Comments are just as important as the code. Style matters in keeping things readable. Thus, we review comments too.

> 5: can you make instance in my code
> 6: can you make instance in my code

These are very basic and fundamental concepts of how to write C++. You are asking us to teach you C++. Unfortunately, we don't have enough time to do that. Instead, please try to learn C++ best practices by reading books or searching online for information.

> 7: it's the c++ advantage unlike C it delete them automatically

No, that is incorrect. You must delete C++ objects created with new.

> 8: it's only on some classes and it is because if we change it need to
> recreate a code fuly again!!

This is part of the fundamental aspects of C++. It needs to conform to normal C++ coding standards.

> 9: if you use a very long function name you made the developer get to pitfall
> it's the best way to simple the develop process and have various advantage

There are many possible ways to name functions, with many different reasons for why they are named a certain way. Normally, you should try to stay consistent with the existing code, and ensure that the names are obvious. Adding 'G' and 'D' to the beginning of function names does not have an obvious meaning.

> 10: it use to create a local copy of ginn object that is load for device .it's
> show the duty fully

You can name it "ginn" or something more descriptive. "local" is too generic for a variable name.

> 11: i like this way;also adding header not make your software slow!

You can add a header, that's not the issue. The issue is that the name of the header is too generic. The name needs to give some idea as to what is defined in the header.

> 12: it's an static error ,add error_t is for just through of the compiler
> error. also use error_t for dynamic error.

I don't think you understand how exceptions work. Please look up C++ exception handling.

> 13: the comment is not part of code! please review the code not comment!

This has nothing t...

review: Disapprove

Unmerged revisions

90. By Bijan Binaee on 2011-08-23

GIR

=== modified file '.bzrignore' (properties changed: -x to +x)
=== added file '.directory'
--- .directory	1970-01-01 00:00:00 +0000
+++ .directory	2011-08-23 04:19:23 +0000
@@ -0,0 +1,6 @@
+[Dolphin]
+Timestamp=2011,8,23,8,9,6
+Version=2
+
+[Settings]
+ShowDotFiles=true
 
=== modified file 'COPYING' (properties changed: -x to +x)
=== modified file 'INSTALL' (properties changed: -x to +x)
=== modified file 'Makefile.am' (properties changed: -x to +x)
=== modified file 'README' (properties changed: -x to +x)
=== modified file 'configure.ac' (properties changed: -x to +x)
--- configure.ac	2011-05-17 12:46:31 +0000
+++ configure.ac	2011-08-23 04:19:23 +0000
@@ -20,6 +20,7 @@
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_INSTALL
 
 PKG_CHECK_MODULES([GEIS], [libutouch-geis >= 1.0.10])
 
=== modified file 'etc/Makefile.am' (properties changed: -x to +x)
=== modified file 'etc/appNames' (properties changed: -x to +x)
=== modified file 'etc/attributes' (properties changed: -x to +x)
=== modified file 'etc/buttons' (properties changed: -x to +x)
=== modified file 'etc/ginn.desktop' (properties changed: -x to +x)
=== modified file 'etc/keys' (properties changed: -x to +x)
=== modified file 'etc/wishes.xml' (properties changed: -x to +x)
=== modified file 'ginn.pc.in' (properties changed: -x to +x)
=== modified file 'src/Makefile.am' (properties changed: -x to +x)
--- src/Makefile.am	2011-02-04 16:04:30 +0000
+++ src/Makefile.am	2011-08-23 04:19:23 +0000
@@ -1,8 +1,9 @@
 bin_PROGRAMS = ginn
 man1_MANS = ginn.1
 
-ginn_SOURCES = ginn.c config.h config.c xt.c bamf.c
-ginn_CFLAGS = \
+ginn_SOURCES = bamf.cpp config.cpp ginn.cpp gir.cpp main.cpp xt.cpp
+
+ginn_CXXFLAGS = \
 	-DGINN_CONFIG_DIR=\"$(sysconfdir)/ginn\" \
 	$(GEIS_CFLAGS) $(XTST_CFLAGS) $(X11_CFLAGS) $(XML2_CFLAGS) $(BAMF_CFLAGS)
 ginn_LDFLAGS = $(GEIS_LIBS) $(XTST_LIBS) $(X11_LIBS) $(XML2_LIBS) $(BAMF_LIBS)
 
=== added file 'src/README'
--- src/README	1970-01-01 00:00:00 +0000
+++ src/README	2011-08-23 04:19:23 +0000
@@ -0,0 +1,5 @@
+To compile GIR you need some packages to install theme simply execute install.sh
+
+note: this install script work for just debian base system
+
+Enjoy!!
 \ No newline at end of file
 
=== removed file 'src/bamf.c'
--- src/bamf.c	2011-05-20 19:34:26 +0000
+++ src/bamf.c	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright 2010 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#include <libbamf/bamf-matcher.h>
-#include <string.h>
-
-char *getName(char *deskfile)
-{
-    char *temp;
-    temp = strdup(strrchr(deskfile, '/'));
-    return strndup(temp + 1, strlen(temp) - 9);
-}
-
-char *getCurrentApp()
-{
-    g_type_init();
-    char *deskfile, *appName;
-    char *temp;
-
-    BamfApplication *app =
-        bamf_matcher_get_active_application(bamf_matcher_get_default());
-    if (app) {
-        appName = (char *) bamf_view_get_name(BAMF_VIEW(app));
-        temp = bamf_application_get_desktop_file(app);
-
-        if (strchr(appName, ' ') && temp && strlen(temp) > 1)
-            return getName((char *) temp);
-        else
-            return appName;
-    } else
-        return "";
-
-}
 
=== added file 'src/bamf.cpp'
--- src/bamf.cpp	1970-01-01 00:00:00 +0000
+++ src/bamf.cpp	2011-08-23 04:19:23 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <libbamf/bamf-matcher.h>
+#include <string.h>
+
+char *getName(char *deskfile)
+{
+    char *temp;
+    temp = strdup(strrchr(deskfile, '/'));
+    return strndup(temp + 1, strlen(temp) - 9);
+}
+
+char *getCurrentApp()
+{
+    g_type_init();
+    char *deskfile, *appName;
+    char *temp;
+
+    BamfApplication *app =
+        bamf_matcher_get_active_application(bamf_matcher_get_default());
+    if (app) {
+        appName = (char *) bamf_view_get_name(BAMF_VIEW(app));
+        temp = (char *) bamf_application_get_desktop_file(app);
+
+        if (strchr(appName, ' ') && temp && strlen(temp) > 1)
+            return getName((char *) temp);
+        else
+            return appName;
+    } else
+        return "";
+
+}
 
=== removed file 'src/config.c'
--- src/config.c	2011-03-16 16:19:13 +0000
+++ src/config.c	1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
-/*
- * Copyright 2010 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#include "config.h"
-#include <libxml/parser.h>
-
-void debugOut(struct wish *wp)
-{
-    int i;
-    printf("\n key : %s ", wp->key);
-    printf("\n button : %d ", wp->button);
-    for (i = 0; i < 4; i++)
-        printf("\t mod%d : %s ", i, wp->modifiers[i]);
-    for (i = 0; i < 4; i++) {
-        printf("\n attrName : %s ", wp->config_attr[i].attrName);
-        printf("\t val : %.2f ", wp->config_attr[i].val);
-        printf("\t valMax : %.2f", wp->config_attr[i].valMax);
-    }
-    printf("\n pMe : %x  pNext : %x ", wp, wp->next);
-    printf("\n===================================================");
-}
-
-int ginn_config_open(struct ginn_config *cfg, const char *path)
-{
-    memset(cfg, 0, sizeof(*cfg));
-    cfg->doc = xmlReadFile(path, NULL, 0);
-    if (cfg->doc == NULL) {
-        fprintf(stderr, "Failed to parse %s\n", path);
-        return -1;
-    }
-    return 0;
-}
-
-void ginn_config_close(struct ginn_config *cfg)
-{
-    xmlFreeDoc(cfg->doc);
-}
-
-static void print_node(const xmlNode * root, int depth)
-{
-    xmlNode *node;
-    for (node = root; node; node = node->next) {
-        int i;
-        if (node->type != XML_ELEMENT_NODE)
-            continue;
-        for (i = 0; i < depth; i++)
-            printf(" ");
-        printf("%s\n", node->name);
-        print_node(node->children, depth + 1);
-    }
-}
-
-static int ginn_str2state(const char *str)
-{
-    if (str == NULL)
-        return -1;
-    if (strcmp(str, "start") == 0)
-        return GINN_START;
-    if (strcmp(str, "update") == 0)
-        return GINN_UPDATE;
-    if (strcmp(str, "finish") == 0)
-        return GINN_FINISH;
-    fprintf(stderr, "ERROR: Undefined state: %s\n", str);
-    return -2;
-}
-
-static int ginn_str2bool(const char *str)
-{
-    if (str == NULL)
-        return -1;
-    if (strcmp(str, "true") == 0)
-        return 1;
-    if (strcmp(str, "false") == 0)
-        return 0;
-    fprintf(stderr, "ERROR: Invalid value for boolean attribute: %s\n",
-            str);
-    return -2;
-}
-
-void store_1config(xmlNode * node, struct wish *wp, int *position)
-{
-    if (0 == strcmp(node->name, "wish")) {
-        // printf(" gesture %s fingers %s ",(xmlGetProp(node, "gesture")),(xmlGetProp(node, "fingers")));
-        wp->config_attr[0].attrName = "gesture name";
-        switch (xmlGetProp(node, "gesture")[0]) {
-        case 'D':
-            wp->config_attr[0].val = wp->config_attr[0].valMax = 0;
-            break;
-        case 'P':
-            wp->config_attr[0].val = wp->config_attr[0].valMax = 1;
-            break;
-        case 'R':
-            wp->config_attr[0].val = wp->config_attr[0].valMax = 2;
-            break;
-        case 'T':
-            wp->config_attr[0].val = wp->config_attr[0].valMax = 15;
-            break;
-        }
-        wp->config_attr[1].attrName = "touches";
-        wp->config_attr[1].val = atoi(xmlGetProp(node, "fingers"));
-        wp->config_attr[1].valMax = atoi(xmlGetProp(node, "fingers"));
-    }
-    if (0 == strcmp(node->name, "action")) {
-        wp->when = ginn_str2state(xmlGetProp(node, "when"));
-        if (wp->when < 0)
-            fprintf(stderr,
-                    "ERROR: you must provide property 'when' to the action: %s\n",
-                    xmlGetProp(node, "name"));
-    }
-    if (0 == strcmp(node->name, "trigger")) {
-        wp->config_attr[*position].attrName = xmlGetProp(node, "prop");
-        wp->config_attr[*position].val = atof(xmlGetProp(node, "min"));
-        wp->config_attr[*position].valMax = atof(xmlGetProp(node, "max"));
-        int acc = ginn_str2bool(xmlGetProp(node, "accumulate"));
-        wp->config_attr[*position].accumulate =
-            acc == -1 ? GINN_DEFAULT_ACCUMULATE : acc;
-        wp->config_attr[*position].accumVal = 0;
-        (*position)++;
-    }
-    if (0 == strcmp(node->name, "key")
-        || 0 == strcmp(node->name, "button")) {
-        if (xmlGetProp(node, "modifier1"))
-            wp->modifiers[0] = xmlGetProp(node, "modifier1");
-        if (xmlGetProp(node, "modifier2"))
-            wp->modifiers[1] = xmlGetProp(node, "modifier2");
-        if (xmlGetProp(node, "modifier3"))
-            wp->modifiers[2] = xmlGetProp(node, "modifier3");
-        if (xmlGetProp(node, "modifier4"))
-            wp->modifiers[3] = xmlGetProp(node, "modifier4");
-    }
-    if (0 == strcmp(node->name, "key"))
-        wp->key = xmlNodeGetContent(node);
-    if (0 == strcmp(node->name, "button"))
-        wp->button = atoi(xmlNodeGetContent(node));
-    if (0 == strcmp(node->name, "button"))
-        printf("Button : %d ", wp->button);
-}
-
-void
-parse_node(const xmlNode * root, int depth, struct wish *wp,
-           struct apps *ap)
-{
-    xmlNode *node;
-    int position = 2;
-    for (node = root; node; node = node->next) {
-        if (node->type != XML_ELEMENT_NODE)
-            continue;
-
-        if ((0 == strcmp(node->name, "application"))) {
-            if (0 != strcmp(ap->appName, "")) {
-                ap = ap->next =
-                    (struct apps *) malloc(sizeof(struct apps));
-                inita(ap);
-            }
-            ap->appName = xmlGetProp(node, "name");
-            wp = ap->wp = (struct wish *) malloc(sizeof(struct wish));
-            initw(wp);
-        }
-        if ((0 == strcmp(node->name, "wish"))
-            && (0 == strcmp(wp->config_attr[0].attrName, "gesture name"))) {
-            if (!(wp->next)) {
-                wp->next = (struct wish *) malloc(sizeof(struct wish));
-                initw(wp->next);
-            }
-            wp = wp->next;
-            position = 2;
-        }
-        store_1config(node, wp, &position);
-        parse_node(node->children, depth + 1, wp, ap);
-    }
-}
-
-void
-ginn_config_store(const struct ginn_config *cfg, struct wish *w,
-                  struct apps *a)
-{
-    const xmlNode *root = xmlDocGetRootElement(cfg->doc);
-    parse_node(root, 0, w, a);
-}
-
-void ginn_config_print(const struct ginn_config *cfg)
-{
-    const xmlNode *root = xmlDocGetRootElement(cfg->doc);
-    print_node(root, 0);
-}
 
=== added file 'src/config.cpp'
--- src/config.cpp	1970-01-01 00:00:00 +0000
+++ src/config.cpp	2011-08-23 04:19:23 +0000
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "config.h"
+
+void debugOut(Gwish *wp)
+{
+    int i;
+    cout << "\n key : " << wp->key;
+    printf("\n button : %d ", wp->button);
+    for (i = 0; i < 4; i++)
+        cout << "\t mod" << i << " : " << wp->modifiers[i];
+    for (i = 0; i < 4; i++) {
+        cout << "\n attrName : " << wp->config_attr[i].attrName;
+        printf("\t val : %.2f ", wp->config_attr[i].val);
+        printf("\t valMax : %.2f", wp->config_attr[i].valMax);
+    }
+    printf("\n pMe : %x  pNext : %x ", wp, wp->next);
+    printf("\n===================================================");
+}
+
+int ginn_config_open(struct ginn_config *cfg, const char *path)
+{
+    memset(cfg, 0, sizeof(*cfg));
+    cfg->doc = xmlReadFile(path, NULL, 0);
+    if (cfg->doc == NULL)
+    {
+        cerr << "Failed to parse " << path << endl;
+        return -1;
+    }
+    return 0;
+}
+
+void ginn_config_close(struct ginn_config *cfg)
+{
+    xmlFreeDoc(cfg->doc);
+}
+
+static void print_node(const xmlNode * root, int depth)
+{
+    const xmlNode *node;
+    for (node = root; node; node = node->next)
+    {
+        if (node->type != XML_ELEMENT_NODE)
+        {
+            continue;
+        }
+        for (int i = 0; i < depth; i++)
+            printf(" ");
+        cout << node->name << endl;
+        print_node(node->children, depth + 1);
+    }
+}
+
+static int ginn_str2state(const char *str)
+{
+    if (str == NULL)
+        return -1;
+    if (strcmp(str, "start") == 0)
+        return GINN_START;
+    if (strcmp(str, "update") == 0)
+        return GINN_UPDATE;
+    if (strcmp(str, "finish") == 0)
+        return GINN_FINISH;
+    cerr << "ERROR: Undefined state: " << str << endl;
+    return -2;
+}
+
+static int ginn_str2bool(const char *str)
+{
+    if (str == NULL)
+        return -1;
+    if (strcmp(str, "true") == 0)
+        return 1;
+    if (strcmp(str, "false") == 0)
+        return 0;
+    cerr << "ERROR: Invalid value for boolean attribute: " << str << endl;
+    return -2;
+}
+
+void store_1config(xmlNode * node, Gwish *wp, int *position)
+{
+    string nodeName = (char *)node->name;
+    if (nodeName == "wish")
+    {
+        // printf(" gesture %s fingers %s ",(xmlGetProp(node, "gesture")),(xmlGetProp(node, "fingers")));
+        switch (xmlGetProp(node, (xmlChar*)"gesture") [0])
+        {
+        case 'D':
+            wp->Type = GINN_Drag;
+            break;
+        case 'P':
+            wp->Type = GINN_Pinch;
+            break;
+        case 'R':
+            wp->Type = GINN_Rotate;
+            break;
+        case 'T':
+            wp->Type = GINN_Tap;
+            break;
+        }
+        wp->TouchNum    = atoi((char *) xmlGetProp(node, (xmlChar*)"fingers"));
+        wp->DirectTouch = ginn_str2bool((char *) xmlGetProp(node, (xmlChar*)"screen"));
+    }
+    if (nodeName == "action")
+    {
+        wp->when = ginn_str2state((char *) xmlGetProp(node, (xmlChar*)"when"));
+        if (wp->when < 0)
+            cerr << "ERROR: you must provide property 'when' to the action: " << xmlGetProp(node, (xmlChar*)"name") << endl;
+    }
+    if (nodeName == "trigger")
+    {
+        wp->config_attr[*position].attrName = (char *)xmlGetProp(node, (xmlChar*)"prop");
+        wp->config_attr[*position].val = atof((char *)xmlGetProp(node, (xmlChar*)"min"));
+        wp->config_attr[*position].valMax = atof((char *)xmlGetProp(node, (xmlChar*)"max"));
+        int acc = ginn_str2bool((char *)xmlGetProp(node, (xmlChar*)"accumulate"));
+        wp->config_attr[*position].accumulate =
+            acc == -1 ? GINN_DEFAULT_ACCUMULATE : acc;
+        wp->config_attr[*position].accumVal = 0;
+        (*position)++;
+    }
+    if (nodeName == "key" || nodeName == "button")
+    {
+        if (xmlGetProp(node, (xmlChar*)"modifier1"))
+            wp->modifiers[0] = (char *)xmlGetProp(node, (xmlChar*)"modifier1");
+        if (xmlGetProp(node, (xmlChar*)"modifier2"))
+            wp->modifiers[1] = (char *)xmlGetProp(node, (xmlChar*)"modifier2");
+        if (xmlGetProp(node, (xmlChar*)"modifier3"))
+            wp->modifiers[2] = (char *)xmlGetProp(node, (xmlChar*)"modifier3");
+        if (xmlGetProp(node, (xmlChar*)"modifier4"))
+            wp->modifiers[3] = (char *)xmlGetProp(node, (xmlChar*)"modifier4");
+    }
+    if (nodeName == "key")
+        wp->key = (char *)xmlNodeGetContent(node);
+    if (nodeName == "button")
+    {
+        wp->button = atoi((char *)xmlNodeGetContent(node));
+    }
+}
+
+void parse_node(const xmlNode * root, int depth, Gwish *wp, Gapps *ap)
+{
+    xmlNode *node;
+
+    int position = 2;
+    for (node = const_cast <xmlNode *> (root); node; node = node->next)
+    {
+        if (node->type != XML_ELEMENT_NODE)
+        {
+            if (node->type == XML_TEXT_NODE)
+
+            continue;
+        }
+
+        if ((0 == strcmp((char *)node->name, "application")))
+        {
+            if (!ap->appName.empty())
+            {
+                ap = ap->next = new Gapps;//Save The previon and create new
+            }
+            ap->appName = (char *) xmlGetProp(node, (xmlChar*)"name");
+            wp = ap->wp = new Gwish;      //Save The previon and create new
+        }
+        if ((0 == strcmp((char *)node->name, "wish"))
+            && wp->Type != -1)
+        {
+            if (!(wp->next))
+                wp->next = new Gwish;
+            wp = wp->next;
+            position = 2;
+        }
+        store_1config(node, wp, &position);
+        parse_node(node->children, depth + 1, wp, ap);
+    }
+}
+
+void ginn_config_store(const struct ginn_config *cfg, Gwish *w, struct Gapps *a)
+{
+    const xmlNode *root = xmlDocGetRootElement(cfg->doc);
+    parse_node(root, 0, w, a);
+}
+
+void ginn_config_print(const struct ginn_config *cfg)
+{
+    const xmlNode *root = xmlDocGetRootElement(cfg->doc);
+    print_node(root, 0);
+}
 
=== modified file 'src/config.h' (properties changed: -x to +x)
--- src/config.h	2011-03-16 16:19:13 +0000
+++ src/config.h	2011-08-23 04:19:23 +0000
@@ -18,8 +18,7 @@
 #ifndef GINN_CONFIG_H
 #define GINN_CONFIG_H
 
-#include <libxml/tree.h>
-#include <string.h>
+#include "header.h"
 
 #define GINN_START	0
 #define GINN_UPDATE	1
@@ -27,32 +26,76 @@
 
 #define GINN_DEFAULT_ACCUMULATE		1
 
-typedef struct ginn_config {
+struct ginn_config
+{
     xmlDocPtr doc;
     xmlNodePtr root;
-} cfg;
-
-typedef struct att {
-    char *attrName;
-    float val;
-    float valMax;
-    int accumulate;
-    float accumVal;
-} att;
-
-typedef struct wish {
-    att config_attr[25];
-    char *key;
-    int button;
-    char *modifiers[4];
-    struct wish *next;
-    int when;
-} wish;
-
-typedef struct apps {
-    char *appName;
-    struct wish *wp;
-    struct apps *next;
-} apps;
+};
+
+struct att
+{
+    string attrName;
+    float  val;
+    float  valMax;
+    int    accumulate;
+    float  accumVal;
+};
+
+///
+/// Use to classify Gesture Type (For Example pinch)
+///
+enum GestureType
+{
+    GINN_Drag = 0,GINN_Pinch=1,GINN_Rotate=2,GINN_Tap=15
+};
+
+///
+/// GWish provide gesture information and the reaction for gesture called Wish
+///
+class Gwish
+{
+public:
+    Gwish();
+//Variable:
+    att    config_attr[25];
+    int    button;
+    int    Type;          //Indicate The gusture Type (-1 Mean it's NULL)
+    int    TouchNum;      //Indicate The Number of finger for gusture
+    int    DirectTouch;   //use this to Detect Touchpad from Touchscreen
+    string key;
+    string modifiers[4];
+    Gwish *next;
+    int    when;
+};
+
+///
+/// Use This class for save application information
+///
+class Gapps
+{
+public:
+    Gapps();
+//Variable:
+    string appName;
+    Gwish  *wp;
+    Gapps *next;
+};
+
+///
+/// Use this struct to save device attribute (GD reffered to GINN device and att reffered to attribute)
+///
+struct GD_att
+{
+    string name;          //Device Name
+    int    ID;            //Device ID that is unique (use to find devive)
+    int    TouchNum;  //Define how many parallel finger touch can support
+    bool   isDirectTouch;   //Define it is a touch screen or not(a pad)
+};
+
+
+//Decleare in config.cpp
+int  ginn_config_open(struct ginn_config *cfg, const char *path);
+void ginn_config_print(const struct ginn_config *cfg);
+void ginn_config_store(const struct ginn_config *cfg, Gwish *w, Gapps *a);
 
 #endif                          /* GINN_CONFIG_H */
 
=== removed file 'src/ginn.c'
--- src/ginn.c	2011-08-12 15:40:51 +0000
+++ src/ginn.c	1970-01-01 00:00:00 +0000
@@ -1,592 +0,0 @@
-/**
- * Copyright 2010 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
- * Authors:
- * 	Mohamed-Ikbel Boulabiar <[e-mail]>
- * 	Henrik Rydberg <[e-mail]>
- *	Stephen M. Webb <[e-mail]>
- *
- */
-#include "config.h"
-#include <geis/geis.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/select.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-
-att config_attr[25] = {[0 ... 24] = {.attrName = "",.val = 0,.valMax = 0}
-};
-
-wish w1 = {.config_attr = {[0 ... 24] =
-                           {.attrName = "",.val = 0,.valMax = 0}
-                           }
-,
-.key = "",
-.next = NULL
-};
-
-wish *wp, *wpEnd;
-apps *ap;
-
-static int inside(float x, float a, float b)
-{
-    return ((x <= b) && (x >= a));
-}
-
-void initw(struct wish *wp)
-{
-    int i;
-    wp->button = 0;
-    wp->key = "";
-    wp->next = NULL;
-    for (i = 0; i < 4; i++)
-        wp->modifiers[i] = "";
-    for (i = 0; i < 25; i++) {
-        wp->config_attr[i].attrName = "";
-        wp->config_attr[i].val = 0;
-        wp->config_attr[i].valMax = 0;
-    }
-}
-
-void inita(struct apps *ap)
-{
-    ap->next = NULL;
-    ap->wp = NULL;
-    ap->appName = "";
-}
-
-static void clear_accum_attrs(att * attrs)
-{
-    int i = 0;
-    while (strcmp(attrs[i].attrName, "") != 0) {
-        if (attrs[i].accumulate)
-            attrs[i].accumVal = 0;
-        i++;
-    }
-}
-
-static void update_wishes()
-{
-    char *activeApp;
-    apps *tmpAp = ap;
-    int diff = 0;
-
-    activeApp = (char *) getCurrentApp();
-    printf(" --ActiveApp %s\n", activeApp);
-    if (activeApp)
-        diff = strcmp(activeApp, ap->appName);
-
-    while (diff && ap->next) {
-        ap = ap->next;
-        diff = strcmp(activeApp, ap->appName);
-    }
-
-    if (!diff)
-        wpEnd->next = ap->wp;
-    else
-        wpEnd->next = NULL;
-
-    ap = tmpAp;
-}
-
-static void
-gesture_match(GeisGestureType gesture_type,
-              GeisGestureId gesture_id,
-              GeisSize attr_count, GeisGestureAttr * attrs, int state)
-{
-    struct wish *topw;
-    topw = wp;
-    update_wishes();
-    while (wp && (0 != strcmp(wp->key, "") || wp->button)) {
-        int valid = 1;
-        if (gesture_type == wp->config_attr[0].val
-            && attrs[8].integer_val == wp->config_attr[1].val) {
-            int attrsI = 9, cAttrI = 2;
-            do {
-                if (0 ==
-                    strcmp(attrs[attrsI].name,
-                           wp->config_attr[cAttrI].attrName)) {
-                    printf("DEBUG -- comparing %s %s : ",
-                           attrs[attrsI].name,
-                           wp->config_attr[cAttrI].attrName);
-                    printf("%.2f %.2f %.2f \n",
-                           attrs[attrsI].float_val,
-                           wp->config_attr[cAttrI].val,
-                           wp->config_attr[cAttrI].valMax);
-                    printf("%i \n",
-                           inside(attrs[attrsI].float_val,
-                                  wp->config_attr[cAttrI].val,
-                                  wp->config_attr[cAttrI].valMax));
-                    if (wp->config_attr[cAttrI].accumulate) {
-                        wp->config_attr[cAttrI].accumVal +=
-                            attrs[attrsI].float_val;
-                        valid = valid
-                            && inside(wp->config_attr
-                                      [cAttrI].accumVal,
-                                      wp->config_attr
-                                      [cAttrI].val,
-                                      wp->config_attr[cAttrI].valMax);
-                    } else
-                        valid = valid
-                            && inside(attrs[attrsI].float_val,
-                                      wp->config_attr
-                                      [cAttrI].val,
-                                      wp->config_attr[cAttrI].valMax);
-                    attrsI++;
-                    cAttrI++;
-                } else
-                    attrsI++;
-            } while ((0 != strcmp(wp->config_attr[cAttrI].attrName, ""))
-                     && attrsI < 18);
-            if (valid && wp->when == state) {
-                if ((0 != wp->button)
-                    && (0 != strcmp(wp->key, ""))) {
-                    injMixBtnKey(XStringToKeysym(wp->key),
-                                 wp->button, wp->modifiers);
-                    printf("MIX -- MIX");
-                } else {
-                    if (0 != wp->button)
-                        injButton(wp->button, wp->modifiers);
-                    if (0 != strcmp(wp->key, ""))
-                        injKey(XStringToKeysym(wp->key), wp->modifiers);
-                }
-                clear_accum_attrs(wp->config_attr);
-            }
-        }
-        if (state == GINN_FINISH)
-            clear_accum_attrs(wp->config_attr);
-        wp = wp->next;
-    }
-    wp = topw;
-}
-
-static Window getRootWindow()
-{
-    Display *display = NULL;
-    Window window = 0;
-
-    display = XOpenDisplay(NULL);
-    if (!display) {
-        fprintf(stderr, "error opening X11 display.\n");
-        exit(1);
-    }
-
-    window = DefaultRootWindow(display);
-
-    XCloseDisplay(display);
-
-    return window;
-}
-
-static void print_attr(GeisGestureAttr * attr)
-{
-    fprintf(stdout, "\tattr %s=", attr->name);
-    switch (attr->type) {
-    case GEIS_ATTR_TYPE_BOOLEAN:
-        fprintf(stdout, "%s\n", attr->boolean_val ? "true" : "false");
-        break;
-    case GEIS_ATTR_TYPE_FLOAT:
-        fprintf(stdout, "%f\n", attr->float_val);
-        break;
-    case GEIS_ATTR_TYPE_INTEGER:
-        fprintf(stdout, "%d\n", attr->integer_val);
-        break;
-    case GEIS_ATTR_TYPE_STRING:
-        fprintf(stdout, "\"%s\"\n", attr->string_val);
-        break;
-    default:
-        fprintf(stdout, "<unknown>\n");
-        break;
-    }
-}
-
-static void
-gesture_added(void *cookie,
-              GeisGestureType gesture_type,
-              GeisGestureId gesture_id,
-              GeisSize attr_count, GeisGestureAttr * attrs)
-{
-    int i = 0;
-    fprintf(stdout, "Gesture type %d added\n", gesture_type);
-    for (i = 0; i < attr_count; ++i)
-        print_attr(&attrs[i]);
-}
-
-static void
-gesture_removed(void *cookie,
-                GeisGestureType gesture_type,
-                GeisGestureId gesture_id,
-                GeisSize attr_count, GeisGestureAttr * attrs)
-{
-    int i = 0;
-    fprintf(stdout, "Gesture type %d removed\n", gesture_type);
-    for (i = 0; i < attr_count; ++i)
-        print_attr(&attrs[i]);
-}
-
-static void
-gesture_start(void *cookie,
-              GeisGestureType gesture_type,
-              GeisGestureId gesture_id,
-              GeisSize attr_count, GeisGestureAttr * attrs)
-{
-    int i = 0;
-    fprintf(stdout, "Gesture type %d started\n", gesture_type);
-    for (i = 0; i < attr_count; ++i)
-        print_attr(&attrs[i]);
-
-    // In GEIS v1, we know that the focus coords are in attrs 5 and 6
-    movePointer((int)attrs[5].float_val, (int)attrs[6].float_val);
-}
-
-static void
-gesture_update(void *cookie,
-               GeisGestureType gesture_type,
-               GeisGestureId gesture_id,
-               GeisSize attr_count, GeisGestureAttr * attrs)
-{
-    int i = 0;
-    fprintf(stdout, "Gesture type %d updated\n", gesture_type);
-    for (i = 0; i < attr_count; ++i)
-        print_attr(&attrs[i]);
-    gesture_match(gesture_type, gesture_id, attr_count, attrs,
-                  GINN_UPDATE);
-}
-
-static void
-gesture_finish(void *cookie,
-               GeisGestureType gesture_type,
-               GeisGestureId gesture_id,
-               GeisSize attr_count, GeisGestureAttr * attrs)
-{
-    int i = 0;
-    fprintf(stdout, "Gesture type %d finished\n", gesture_type);
-    for (i = 0; i < attr_count; ++i);   //print_attr(&attrs[i]);
-    gesture_match(gesture_type, gesture_id, attr_count, attrs,
-                  GINN_FINISH);
-}
-
-GeisGestureFuncs gesture_funcs = {
-    gesture_added,
-    gesture_removed,
-    gesture_start,
-    gesture_update,
-    gesture_finish
-};
-
-/*
- * Searches for a default config file.
- *
- * Returns a pointer to a config file name (which must be freed) or NULL
- * if no default config file was found.
- */
-static char *ginn_default_config()
-{
-    static const char default_file_name[] = "/wishes.xml";
-    static const char *search_paths[] = {
-        "etc",
-        "../etc",
-        ".",
-        "$HOME/.ginn",
-        GINN_CONFIG_DIR
-    };
-    static const int num_paths =
-        sizeof(search_paths) / sizeof(const char *);
-    int i;
-
-    for (i = 0; i < num_paths; ++i) {
-        struct stat sbuf;
-        char *file_name = NULL;
-
-        if (strstr(search_paths[i], "$HOME")) {
-            char *home_dir = getenv("HOME");
-            if (!home_dir) {
-                continue;
-            } else {
-                char *cdr = index(search_paths[i], '/');
-                size_t file_name_length = strlen(home_dir)
-                    + strlen(cdr)
-                    + strlen(default_file_name)
-                    + 1;
-                file_name = calloc(file_name_length, sizeof(char));
-                strcpy(file_name, home_dir);
-                strcat(file_name, cdr);
-            }
-        } else {
-            size_t file_name_length = strlen(search_paths[i])
-                + strlen(default_file_name)
-                + 1;
-            file_name = calloc(file_name_length, sizeof(char));
-            strcpy(file_name, search_paths[i]);
-        }
-        strcat(file_name, default_file_name);
-        int sres = stat(file_name, &sbuf);
-        if (sres == 0) {
-            fprintf(stdout, "Using wishes file %s\n", file_name);
-            return file_name;
-        }
-        free(file_name);
-    }
-
-    return NULL;
-}
-
-int main(int argc, char *argv[])
-{
-    GeisStatus status = GEIS_UNKNOWN_ERROR;
-    GeisXcbWinInfo xcb_win_info = {
-        .display_name = NULL,
-        .screenp = NULL,
-        .window_id = getRootWindow()
-    };
-    GeisWinInfo win_info = {
-        GEIS_XCB_FULL_WINDOW,
-        &xcb_win_info
-    };
-    GeisInstance instance;
-    struct ginn_config cfg;
-
-    {
-        char *config_file_name = NULL;
-        if (argc < 2) {
-            fprintf(stderr, "usage: %s <configxml>\n", argv[0]);
-            config_file_name = ginn_default_config();
-            if (config_file_name) {
-                fprintf(stderr,
-                        "using default configuration file %s ... \n",
-                        config_file_name);
-            }
-        } else {
-            config_file_name = strdup(argv[1]);
-        }
-        if (NULL == config_file_name) {
-            fprintf(stderr, "Could not find Ginn wishes\n");
-            return -1;
-        }
-
-        if (ginn_config_open(&cfg, config_file_name)) {
-            fprintf(stderr, "Could not load Ginn wishes\n");
-            return -1;
-        }
-        free(config_file_name);
-    }
-
-    ginn_config_print(&cfg);
-    ap = (struct apps *) malloc(sizeof(struct apps));
-    inita(ap);
-    wp = (struct wish *) malloc(sizeof(struct wish));
-    initw(wp);
-    ginn_config_store(&cfg, wp, ap);
-    wpEnd = wp;
-    while (wpEnd->next)
-        wpEnd = wpEnd->next;
-
-    int pos = 0;
-    printf("\n");
-    while (strcmp(config_attr[pos].attrName, "")) {
-        printf("DEBUG %d %s %.2f %.2f \n", pos,
-               config_attr[pos].attrName, config_attr[pos].val,
-               config_attr[pos].valMax);
-        pos++;
-    }
-    
-    /**
-     * Check the loaded wishes to see which gestures are used
-     * and add these gestures to a NULL terminated list "sub_gestures_list"
-     * 
-     * This list is used to subscribe only the necessary gestures
-     * to GEIS. This will avoid issues with 2 finger scrolls and other gestues
-     * being dropped when not accounted for in the wishes file.
-    **/
-    
-    apps * appPtr = ap;
-    wish * wishPtr;
-    char * sub_gestures_list[17] = {NULL};
-    int finished = 0;
-    
-    /**
-     * Loop through each wish inside ap
-     * After all of the wishes in ap are accounted for
-     * add global wishes
-    **/ 
-    
-    while(finished != 1)
-    {
-        // Check if we are finished with the application wishes
-        if(appPtr == NULL)
-        {
-            wishPtr = wp;
-            finished = 1;
-        }else{
-            wishPtr = appPtr->wp;
-        }
-        
-        // Loop through each wish
-        while(wishPtr)
-        {
-            int i;
-            for(i = 0; i < 25; i ++)
-            {
-                
-                char *sub_gesture = malloc(sizeof(char[16]));
-                int pos = 0;
-                
-                // Check for Drag gesture
-                if(strcmp(wishPtr->config_attr[i].attrName, "delta x") == 0 ||
-                    strcmp(wishPtr->config_attr[i].attrName, "delta y") == 0 ||
-                    strcmp(wishPtr->config_attr[i].attrName, "velocity x") == 0 ||
-                    strcmp(wishPtr->config_attr[i].attrName, "velocity y") == 0
-                    )            
-                {
-                    sprintf(sub_gesture, "Drag,touch=%i", (int)wishPtr->config_attr[1].val);
-                }
-                
-                // Check for Rotate gesture
-                else if(strcmp(wishPtr->config_attr[i].attrName, "angle delta") == 0 ||
-                    strcmp(wishPtr->config_attr[i].attrName, "angular velocity") == 0 ||
-                    strcmp(wishPtr->config_attr[i].attrName, "angle") == 0
-                    )            
-                {
-                    sprintf(sub_gesture, "Rotate,touch=%i", (int)wishPtr->config_attr[1].val);
-                }
-                
-                // Check for Pinch gesture
-                else if(strcmp(wishPtr->config_attr[i].attrName, "radius delta") == 0 ||
-                    strcmp(wishPtr->config_attr[i].attrName, "radial velocity") == 0 ||
-                    strcmp(wishPtr->config_attr[i].attrName, "radius") == 0
-                    )            
-                {
-                    sprintf(sub_gesture, "Pinch,touch=%i", (int)wishPtr->config_attr[1].val);
-                }
-                
-                // Check for Tap gesture
-                else if(strcmp(wishPtr->config_attr[i].attrName, "tap time") == 0)            
-                {
-                    sprintf(sub_gesture, "Tap,touch=%i", (int)wishPtr->config_attr[1].val);
-                }
-                
-                // Deallocate sub_gesture if no gesture was found
-                else
-                {
-                    free(sub_gesture);
-                    sub_gesture = NULL;
-                    continue;
-                }
-                
-                /** Check the current gesture list
-                 * Only add if the gesture is not already in the list
-                 * Store in index of the first NULL found
-                **/
-                
-                while(pos < 17)
-                {
-                    if(sub_gestures_list[pos] == NULL)
-                    {
-                        sub_gestures_list[pos] = sub_gesture;
-                        break;
-                    }else if(strcmp(sub_gestures_list[pos], sub_gesture) == 0)
-                    {
-                        break;
-                    }
-                    pos ++;
-                }
-                
-                
-            }
-            // Iterate to the next wish
-            wishPtr = wishPtr->next;
-        }
-        
-        // If there are more applications, iterate to the next
-        
-        if(finished != 1)
-        {
-            appPtr = appPtr->next;
-        }
-    }
-    
-    // Show which gestures were subscribed
-    printf("Gestures subscribed:\n");
-    
-    pos = 0;
-    while(pos < 17)
-    {
-        if(sub_gestures_list[pos] != NULL)
-        {
-            printf("%s\n", sub_gestures_list[pos]);
-        }
-            
-        pos ++;
-    }
-    
-    // End sub gesture list creation 
-
-    status = geis_init(&win_info, &instance);
-    if (status != GEIS_STATUS_SUCCESS) {
-        fprintf(stderr, "error in geis_init\n");
-        return 1;
-    }
-
-    status = geis_configuration_supported(instance, GEIS_CONFIG_UNIX_FD);
-    if (status != GEIS_STATUS_SUCCESS) {
-        fprintf(stderr, "GEIS does not support Unix fd\n");
-        return 1;
-    }
-
-    int fd = -1;
-    status =
-        geis_configuration_get_value(instance, GEIS_CONFIG_UNIX_FD, &fd);
-    if (status != GEIS_STATUS_SUCCESS) {
-        fprintf(stderr, "error retrieving GEIS fd\n");
-        return 1;
-    }
-
-    status = geis_subscribe(instance, GEIS_ALL_INPUT_DEVICES, sub_gestures_list,        //  GEIS_ALL_GESTURES,
-                            &gesture_funcs, NULL);
-    if (status != GEIS_STATUS_SUCCESS) {
-        fprintf(stderr, "error subscribing to gestures\n");
-        return 1;
-    }
-
-    openDisplay();
-
-    while (1) {
-        fd_set read_fds;
-        FD_ZERO(&read_fds);
-        FD_SET(fd, &read_fds);
-        int sstat = select(fd + 1, &read_fds, NULL, NULL, NULL);
-        if (sstat < 0) {
-            fprintf(stderr, "error %d in select(): %s\n", errno,
-                    strerror(errno));
-            break;
-        }
-
-        if (FD_ISSET(fd, &read_fds)) {
-            geis_event_dispatch(instance);
-        }
-    }
-
-    geis_finish(instance);
-    closeDisplay();
-    free(wp);
-    return 0;
-}
 
=== added file 'src/ginn.cpp'
--- src/ginn.cpp	1970-01-01 00:00:00 +0000
+++ src/ginn.cpp	2011-08-23 04:19:23 +0000
@@ -0,0 +1,555 @@
+#include "ginn.h"
+
+GINN::GINN()
+{
+    //Set Default value
+    config_load = false;
+    ap = new Gapps;
+    wp = new Gwish;
+    //
+    att att_default;
+    att_default.attrName = "";
+    att_default.val      = 0 ;
+    att_default.valMax   = 0 ;
+
+    for (int i = 0; i < 25;i++)
+        config_attr[i] = att_default;
+
+    for (int i = 0; i < 25;i++)
+        w1.config_attr[i] = config_attr[i];
+    w1.key = "";
+    w1.next = NULL;
+}
+
+int GINN::inside(float x, float a, float b)
+{
+    return ((x <= b) && (x >= a));
+}
+
+void GINN::clear_accum_attrs(att * attrs)
+{
+    int i = 2;
+    while (!attrs[i].attrName.empty())
+    {
+        if (attrs[i].accumulate)
+            attrs[i].accumVal = 0;
+        i++;
+    }
+}
+
+void GINN::update_wishes()
+{
+    string activeApp;
+    Gapps *tmpAp = ap;
+    int    diff = 0;
+
+    activeApp = (char *) getCurrentApp();
+    //cout << " --ActiveApp " << activeApp << endl; ;
+    if (!activeApp.empty())
+        diff = !(activeApp == ap->appName);
+
+    while (diff && ap->next)
+    {
+        ap = ap->next;
+        diff = !(activeApp == ap->appName);
+    }
+
+    if (!diff)
+        wpEnd->next = ap->wp;
+    else
+        wpEnd->next = NULL;
+
+    ap = tmpAp;
+}
+
+void GINN::Gmatch(GeisGestureType gesture_type,GeisGestureId gesture_id,
+              GeisSize attr_count, GeisGestureAttr * attrs, int state)
+{
+    Gwish *topw;
+    int    DeviceID = attrs[0].integer_val;
+    int    Dindex   = DId2Index(DeviceID);                //Device index on device_list
+    topw = wp;
+    update_wishes();
+    while (wp && (!wp->key.empty() || wp->button))
+    {
+        int valid = 1;
+        if (gesture_type == wp->Type && attrs[8].integer_val == wp->TouchNum &&
+                (device_list[Dindex].isDirectTouch == wp->DirectTouch || wp->DirectTouch == -1)) //wp->DirectTouch is -1 if no screen option define in wish tag
+        {
+            int attrsI = 9, cAttrI = 2;
+            do
+            {
+                if (attrs[attrsI].name == wp->config_attr[cAttrI].attrName)
+                {
+//                    cout << "DEBUG -- comparing " << attrs[attrsI].name <<  wp->config_attr[cAttrI].attrName << ": ";
+//                    cout << attrs[attrsI].float_val << wp->config_attr[cAttrI].val << wp->config_attr[cAttrI].valMax << endl;
+//                    cout << inside(attrs[attrsI].float_val,wp->config_attr[cAttrI].val, wp->config_attr[cAttrI].valMax) << endl;
+                    if (wp->config_attr[cAttrI].accumulate)
+                    {
+                        wp->config_attr[cAttrI].accumVal += attrs[attrsI].float_val;
+                        valid = valid
+                            && inside(wp->config_attr
+                                      [cAttrI].accumVal,
+                                      wp->config_attr
+                                      [cAttrI].val,
+                                      wp->config_attr[cAttrI].valMax);
+                    }
+                    else
+                        valid = valid && inside(attrs[attrsI].float_val, wp->config_attr
+                                      [cAttrI].val, wp->config_attr[cAttrI].valMax);
+                    attrsI++;
+                    cAttrI++;
+                }
+                else
+                    attrsI++;
+            } while (!wp->config_attr[cAttrI].attrName.empty() && attrsI < 18);
+
+            if (valid && wp->when == state)
+            {
+                if ((0 != wp->button) && (!wp->key.empty()))
+                {
+                    injMixBtnKey(XStringToKeysym(wp->key.c_str()), wp->button, wp->modifiers);
+                    cout << "MIX -- MIX";
+                }
+                else
+                {
+                    if (0 != wp->button)
+                        injButton(wp->button, wp->modifiers);
+                    if (!wp->key.empty())
+                        injKey(XStringToKeysym(wp->key.c_str()), wp->modifiers);
+                }
+                clear_accum_attrs(wp->config_attr);
+                break;
+            }
+        }
+        if (state == GINN_FINISH)
+            clear_accum_attrs(wp->config_attr);
+        wp = wp->next;
+    }
+    wp = topw;
+}
+
+Window GINN::getRootWindow()
+{
+    Display *display = NULL;
+    Window window = 0;
+
+    display = XOpenDisplay(NULL);
+    if (!display)
+    {
+        cerr << "error opening X11 display.\n";
+        exit(1);
+    }
+
+    window = DefaultRootWindow(display);
+
+    XCloseDisplay(display);
+
+    return window;
+}
+
+void GINN::print_attr(GeisGestureAttr * attr)
+{
+    fprintf(stdout, "\tattr %s=", attr->name);
+    switch (attr->type) {
+    case GEIS_ATTR_TYPE_BOOLEAN:
+        fprintf(stdout, "%s\n", attr->boolean_val ? "true" : "false");
+        break;
+    case GEIS_ATTR_TYPE_FLOAT:
+        fprintf(stdout, "%f\n", attr->float_val);
+        break;
+    case GEIS_ATTR_TYPE_INTEGER:
+        fprintf(stdout, "%d\n", attr->integer_val);
+        break;
+    case GEIS_ATTR_TYPE_STRING:
+        fprintf(stdout, "\"%s\"\n", attr->string_val);
+        break;
+    default:
+        fprintf(stdout, "<unknown>\n");
+        break;
+    }
+}
+
+void GINN::Gadded(GeisGestureType gesture_type,GeisGestureId gesture_id, GeisSize attr_count, GeisGestureAttr * attrs)
+{
+    int i = 0;
+    fprintf(stdout, "Gesture type %d added\n", gesture_type);
+    for (i = 0; i < attr_count; ++i)
+        print_attr(&attrs[i]);
+}
+
+void GINN::Gremoved(GeisGestureType gesture_type, GeisGestureId gesture_id,GeisSize attr_count, GeisGestureAttr * attrs)
+{
+    int i = 0;
+    fprintf(stdout, "Gesture type %d removed\n", gesture_type);
+    for (i = 0; i < attr_count; ++i)
+        print_attr(&attrs[i]);
+}
+
+void GINN::Gstart(GeisGestureType gesture_type, GeisGestureId gesture_id, GeisSize attr_count, GeisGestureAttr * attrs)
+{
+    int i = 0;
+    fprintf(stdout, "Gesture type %d started\n", gesture_type);
+    for (i = 0; i < attr_count; ++i)
+        print_attr(&attrs[i]);
+
+    // In GEIS v1, we know that the focus coords are in attrs 5 and 6
+    movePointer((int)attrs[5].float_val, (int)attrs[6].float_val);
+}
+
+void GINN::Gupdate(GeisGestureType gesture_type, GeisGestureId gesture_id, GeisSize attr_count, GeisGestureAttr * attrs)
+{
+    int i = 0;
+    cout << "Gesture type " << gesture_type << " updated\n";
+    for (i = 0; i < attr_count; ++i)
+        print_attr(&attrs[i]);
+    Gmatch(gesture_type, gesture_id, attr_count, attrs,GINN_UPDATE);
+}
+
+void GINN::Gfinish(GeisGestureType gesture_type, GeisGestureId gesture_id, GeisSize attr_count, GeisGestureAttr * attrs)
+{
+    int i = 0;
+    fprintf(stdout, "Gesture type %d finished\n", gesture_type);
+    for (i = 0; i < attr_count; ++i);   //print_attr(&attrs[i]);
+    Gmatch(gesture_type, gesture_id, attr_count, attrs, GINN_FINISH);
+}
+
+/*
+ * Searches for a default config file.
+ *
+ * Returns a pointer to a config file name (which must be freed) or NULL
+ * if no default config file was found.
+ */
+string GINN::ginn_default_config()
+{
+    string default_file_name = "/wishes.xml";
+    static char *search_paths[] = {"etc","../etc",".","$HOME/.ginn" , "/etc/ginn" , "/etc" };
+    static const int num_paths = sizeof(search_paths) / sizeof(const char *);
+    int i;
+
+    for (i = 0; i < num_paths; ++i)
+    {
+        struct stat sbuf;
+        string file_name;
+
+        if (strstr(search_paths[i], "$HOME"))
+        {
+            char *home_dir = getenv("HOME");
+            if (!home_dir)
+            {
+                continue;
+            }
+            else
+            {
+                char *cdr = index(search_paths[i], '/');
+                file_name  = home_dir;
+                file_name += cdr;
+            }
+        }
+        else
+        {
+            file_name = search_paths[i];
+        }
+        file_name += default_file_name;
+        int sres = stat(file_name.c_str(), &sbuf);
+        if (sres == 0)
+        {
+            cout << "Using wishes file " << file_name << endl;
+            return file_name;
+        }
+    }
+
+    return "";
+}
+//! find out is the device is Direct Touch for example touchscreen is but touchpad not!
+bool GINN::isDirectTouch(int deviceID)
+{
+    GeisDevice device;
+    int count = geis_device_attr_count (device);
+    for (int i =0;i<count;i++)
+    {
+        GeisGestureAttr *buffer = (GeisGestureAttr *) geis_device_attr(device,i);
+        if (!strcmp(buffer->name , GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH))
+        {
+            return buffer->boolean_val;
+        }
+    }
+}
+//! set Gesture functon callback for GEIS API.
+void GINN::setGFuncton(GCallback GaddedP, GCallback GremovedP, GCallback GstartP, GCallback GupdateP, GCallback GfinishP)
+{
+    gesture_funcs.added   = GaddedP;
+    gesture_funcs.removed = GremovedP;
+    gesture_funcs.start   = GstartP;
+    gesture_funcs.update  = GupdateP;
+    gesture_funcs.finish  = GfinishP;
+}
+//! get Gesture functon callback (More info on setGFuncton).
+GeisGestureFuncs GINN::getGFuncton()
+{
+    return gesture_funcs;
+}
+//! Open (even from argv) and Check Wish file automatically and if any problem emit error and print it.
+void GINN::loadConfig(int argc, char *argv[])
+{
+    if (argc < 2)
+    {
+        cerr << "usage: " << argv[0] << " <configxml>\n";
+        cfg_path = ginn_default_config();
+        if (cfg_path.empty())
+        {
+            cerr << "using default configuration file " << cfg_path << "... \n";
+        }
+    }
+    else
+    {
+        cfg_path = strdup(argv[1]);
+    }
+    if (cfg_path.empty())
+    {
+        cerr << "Could not find Ginn wishes\n";
+        exit (-1);
+    }
+
+    if (ginn_config_open(&cfg, cfg_path.c_str()))
+    {
+        cerr << "Could not load Ginn wishes\n";
+        exit (-1);
+    }
+    config_load = true;
+}
+//! Print the config file.
+void GINN::printConfig()
+{
+    if (config_load)
+        ginn_config_print(&cfg);
+}
+//! Store the config file and process it
+void GINN::StoreConfig()
+{
+    if (config_load)
+        ginn_config_store(&cfg, wp, ap);
+}
+
+//! subscribe all gesture callback and other value on GEIS
+GeisStatus GINN::Gsubscribe(GeisInstance geis_instance, GeisInputDeviceId *input_list, const char **gesture_list)
+{
+    return geis_subscribe(geis_instance, input_list, gesture_list, &gesture_funcs, this);
+}
+//! set Device functon callback for GEIS API.
+void GINN::setDFuncton(DCallback DaddedP, DCallback DchangedP, DCallback DremovedP)
+{
+    device_funcs.added   = DaddedP;
+    device_funcs.removed = DremovedP;
+    device_funcs.changed = DchangedP;
+}
+//! get Device functon callback (More info on setDFuncton).
+GeisInputFuncs GINN::getDFuncton()
+{
+    return device_funcs;
+}
+//! subscribe all Device callback and other value on GEIS
+GeisStatus GINN::Dsubscribe(GeisInstance geis_instance)
+{
+    return geis_input_devices(geis_instance, &device_funcs, this);
+}
+//! when a touch device add this function called
+void GINN::Dadded(GeisInputDeviceId device_id, void *attrs)
+{
+    GeisGestureAttr *a = (GeisGestureAttr *)attrs;
+    GD_att buffer;
+    try
+    {
+        buffer.ID            = device_id;
+        buffer.name          = a[0].string_val;
+        buffer.isDirectTouch = a[2].boolean_val;
+        buffer.TouchNum      = a[3].integer_val;
+        device_list.push_back(buffer);
+    }
+    catch(error_t error)
+    {
+        cerr << "Erorr on read Device atrribute for device with ID: " << device_id << endl;
+    }
+}
+//! when a touch device attributes changed this function called
+void GINN::Dchanged(GeisInputDeviceId device_id, void *attrs)
+{
+    ;
+}
+//! when a touch device removed this function called
+void GINN::Dremoved(GeisInputDeviceId device_id, void *attrs)
+{
+    int index = DId2Index(device_id);
+    device_list.erase(device_list.begin() + index);
+}
+//! return Device index in device_list from deviceID ; return -1 if the device not found
+int GINN::DId2Index(int DeviceID)
+{
+    for (int i=0;i<device_list.size();i++)
+    {
+        if(device_list[i].ID == DeviceID)
+            return i;
+    }
+    return -1;
+}
+
+/**
+ * Check the loaded wishes to see which gestures are used
+ * and add these gestures to a NULL terminated list "sub_gestures_list"
+ *
+ * This list is used to subscribe only the necessary gestures
+ * to GEIS. This will avoid issues with 2 finger scrolls and other gestues
+ * being dropped when not accounted for in the wishes file.
+**/
+vector<string> GINN::extract_gesture()
+{
+    Gapps * appPtr = ap;
+    Gwish * wishPtr;
+    int finished = 0;
+    vector<string> sub_gestures_list(17);
+    /**
+     * Loop through each wish inside ap
+     * After all of the wishes in ap are accounted for
+     * add global wishes
+    **/
+
+    while(finished != 1)
+    {
+        // Check if we are finished with the application wishes
+        if(appPtr == NULL)
+        {
+            wishPtr = wp;
+            finished = 1;
+        }
+        else
+        {
+            wishPtr = appPtr->wp;
+        }
+
+        // Loop through each wish
+        while(wishPtr)
+        {
+            int i;
+            for(i = 0; i < 25; i ++)
+            {
+
+                string sub_gesture;
+                char   buffer[100];
+                int pos = 0;
+
+                // Check for Drag gesture
+                if(wishPtr->config_attr[i].attrName == "delta x" || wishPtr->config_attr[i].attrName ==  "delta y" ||
+                    wishPtr->config_attr[i].attrName == "velocity x" || wishPtr->config_attr[i].attrName == "velocity y")
+                {
+                    sprintf(buffer, "Drag,touch=%i", (int)wishPtr->config_attr[1].val);
+                }
+
+                // Check for Rotate gesture
+                else if(wishPtr->config_attr[i].attrName == "angle delta"||
+                    wishPtr->config_attr[i].attrName == "angular velocity"||
+                    wishPtr->config_attr[i].attrName == "angle")
+                {
+                    sprintf(buffer, "Rotate,touch=%i", (int)wishPtr->config_attr[1].val);
+                }
+
+                // Check for Pinch gesture
+                else if(wishPtr->config_attr[i].attrName == "radius delta" ||wishPtr->config_attr[i].attrName == "radial velocity" ||
+                    wishPtr->config_attr[i].attrName == "radius")
+                {
+                    sprintf(buffer, "Pinch,touch=%i", (int)wishPtr->config_attr[1].val);
+                }
+
+                // Check for Tap gesture
+                else if(wishPtr->config_attr[i].attrName == "tap time")
+                {
+                    sprintf(buffer, "Tap,touch=%i", (int)wishPtr->config_attr[1].val);
+                }
+
+                // Deallocate sub_gesture if no gesture was found
+                else
+                {
+                    buffer[0] = NULL;
+                    continue;
+                }
+                sub_gesture = buffer;
+
+                /** Check the current gesture list
+                 * Only add if the gesture is not already in the list
+                 * Store in index of the first NULL found
+                **/
+
+                while(pos < 17)
+                {
+                    if(sub_gestures_list[pos].empty())
+                    {
+                        sub_gestures_list[pos] = sub_gesture;
+                        break;
+                    }
+                    else if(sub_gesture == sub_gestures_list[pos])
+                    {
+                        break;
+                    }
+                    pos ++;
+                }
+
+
+            }
+            // Iterate to the next wish
+            wishPtr = wishPtr->next;
+        }
+
+        // If there are more applications, iterate to the next
+
+        if(finished != 1)
+        {
+            appPtr = appPtr->next;
+        }
+    }
+    return sub_gestures_list;
+}
+
+//! print the Subscribe gesture list
+void GINN::print_SGL(const char **sub_gestures_list)
+{
+    // Show which gestures were subscribed
+    cout << "Gestures subscribed:" << endl;
+
+    int pos = 0;
+    while(pos < 17)
+    {
+        if(sub_gestures_list[pos] != NULL)
+        {
+            cout << sub_gestures_list[pos] << endl;
+        }
+
+        pos ++;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
=== added file 'src/ginn.h'
--- src/ginn.h	1970-01-01 00:00:00 +0000
+++ src/ginn.h	2011-08-23 04:19:23 +0000
@@ -0,0 +1,60 @@
+#ifndef GINN_H
+#define GINN_H
+
+#include "config.h"
+
+typedef GeisGestureCallback GCallback;
+typedef GeisInputCallback   DCallback;
+
+class GINN
+{
+public:
+    GINN();
+    void             Gmatch(GeisGestureType gesture_type, GeisGestureId gesture_id,GeisSize attr_count,GeisGestureAttr * attrs, int state);
+    int              inside(float x, float a, float b);
+    bool             isDirectTouch(int deviceID);
+    void             clear_accum_attrs(att * attrs);
+    void             update_wishes();
+    void             print_SGL(const char **sub_gestures_list);
+    void             print_attr(GeisGestureAttr * attr);
+    Window           getRootWindow();
+    string           ginn_default_config();
+    vector<string>   extract_gesture();
+//New Interfaces:
+    int              DId2Index(int DeviceID);
+    void             printConfig();
+    void             StoreConfig();
+    void             loadConfig(int argc, char *argv[]);
+    void             setGFuncton(GCallback GaddedP, GCallback GremovedP, GCallback GstartP, GCallback GupdateP, GCallback GfinishP);
+    GeisGestureFuncs getGFuncton();
+    void             setDFuncton(DCallback DaddedP, DCallback DchangedP, DCallback DremovedP);
+    GeisInputFuncs   getDFuncton();
+    GeisStatus       Gsubscribe(GeisInstance geis_instance, GeisInputDeviceId *input_list, const char **gesture_list);
+    GeisStatus       Dsubscribe(GeisInstance geis_instance);
+//CallBacks:
+    //Gesture CallBacks
+    void Gadded  (GeisGestureType gesture_type, GeisGestureId gesture_id, GeisSize attr_count, GeisGestureAttr * attrs);
+    void Gremoved(GeisGestureType gesture_type, GeisGestureId gesture_id, GeisSize attr_count, GeisGestureAttr * attrs);
+    void Gstart  (GeisGestureType gesture_type, GeisGestureId gesture_id, GeisSize attr_count, GeisGestureAttr * attrs);
+    void Gupdate (GeisGestureType gesture_type, GeisGestureId gesture_id, GeisSize attr_count, GeisGestureAttr * attrs);
+    void Gfinish (GeisGestureType gesture_type, GeisGestureId gesture_id, GeisSize attr_count, GeisGestureAttr * attrs);
+    //Device CallBacks (D in Dadded referred to Device)
+    void Dadded  (GeisInputDeviceId device_id, void *attrs);
+    void Dchanged(GeisInputDeviceId device_id, void *attrs);
+    void Dremoved(GeisInputDeviceId device_id, void *attrs);
+//Variable:
+    Gwish *wp, *wpEnd;
+    Gapps *ap;
+    att config_attr[25];
+    Gwish w1;
+private:
+    GeisGestureFuncs gesture_funcs;
+    GeisInputFuncs   device_funcs;
+    ginn_config      cfg;
+    string           cfg_path;
+    vector<GD_att>   device_list;  //save Device list and device attribute
+    bool             config_load;
+};
+
+
+#endif // GINN_H
 
=== modified file 'src/ginn.pod' (properties changed: -x to +x)
=== added file 'src/gir.cpp'
--- src/gir.cpp	1970-01-01 00:00:00 +0000
+++ src/gir.cpp	2011-08-23 04:19:23 +0000
@@ -0,0 +1,47 @@
+#include "gir.h"
+
+Gapps::Gapps()
+{
+    next = NULL;
+    wp = NULL;
+    appName = "";
+}
+
+Gwish::Gwish()
+{
+    //Default Value
+    Type        = -1;
+    TouchNum    = 0;
+    DirectTouch = -1;
+    //
+    int i;
+    button = 0;
+    key = "";
+    next = NULL;
+    for (i = 0; i < 4; i++)
+        modifiers[i] = "";
+    for (i = 0; i < 25; i++)
+    {
+        config_attr[i].attrName = "";
+        config_attr[i].val = 0;
+        config_attr[i].valMax = 0;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
=== added file 'src/gir.h'
--- src/gir.h	1970-01-01 00:00:00 +0000
+++ src/gir.h	2011-08-23 04:19:23 +0000
@@ -0,0 +1,70 @@
+/**
+ * New Implemetion for GINN Include C++ Callback
+ */
+
+#ifndef GIR_H
+#define GIR_H
+
+#include "ginn.h"
+
+/** Gesure CallBack Interface Start Decration HERE! These function recieve events from GEIS and send it to
+related object as well as a postman!
+***/
+static void gesture_added(void *cookie,GeisGestureType gesture_type, GeisGestureId gesture_id,
+              GeisSize attr_count, GeisGestureAttr * attrs)
+{
+    GINN *buffer = (GINN *) cookie;
+    buffer->Gadded(gesture_type,gesture_id,attr_count,attrs);
+}
+
+static void gesture_removed(void *cookie, GeisGestureType gesture_type, GeisGestureId gesture_id,
+                GeisSize attr_count, GeisGestureAttr * attrs)
+{
+    GINN *buffer = (GINN *) cookie;
+    buffer->Gadded(gesture_type,gesture_id,attr_count,attrs);
+}
+
+static void gesture_start(void *cookie, GeisGestureType gesture_type, GeisGestureId gesture_id,
+              GeisSize attr_count, GeisGestureAttr * attrs)
+{
+    GINN *buffer = (GINN *) cookie;
+    buffer->Gstart(gesture_type,gesture_id,attr_count,attrs);
+}
+
+static void gesture_update(void *cookie, GeisGestureType gesture_type,
+               GeisGestureId gesture_id, GeisSize attr_count, GeisGestureAttr * attrs)
+{
+    GINN *buffer = (GINN *) cookie;
+    buffer->Gupdate(gesture_type,gesture_id,attr_count,attrs);
+}
+
+static void gesture_finish(void *cookie, GeisGestureType gesture_type,
+               GeisGestureId gesture_id, GeisSize attr_count, GeisGestureAttr * attrs)
+{
+    GINN *buffer = (GINN *) cookie;
+    buffer->Gfinish(gesture_type,gesture_id,attr_count,attrs);
+}
+
+/** Device CallBack Interface Start Decration HERE! These function recieve events from GEIS and send it to
+related object as well as a postman!
+***/
+static void device_added(void *cookie, GeisInputDeviceId device_id, void *attrs)
+{
+    GINN *buffer = (GINN *) cookie;
+    buffer->Dadded(device_id,attrs);
+}
+
+
+static void device_changed(void *cookie, GeisInputDeviceId device_id, void *attrs)
+{
+    GINN *buffer = (GINN *) cookie;
+    buffer->Dchanged(device_id,attrs);
+}
+
+
+static void device_removed(void *cookie, GeisInputDeviceId device_id, void *attrs)
+{
+    GINN *buffer = (GINN *) cookie;
+    buffer->Dremoved(device_id,attrs);
+}
+#endif // GIR_H
 
=== added file 'src/header.h'
--- src/header.h	1970-01-01 00:00:00 +0000
+++ src/header.h	2011-08-23 04:19:23 +0000
@@ -0,0 +1,38 @@
+#ifndef HEADER_H
+#define HEADER_H
+
+//Standart C and C++ Header
+#include <string>
+#include <vector>
+#include <cstring>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <iostream>
+//X window Header
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+#include <X11/extensions/XTest.h>
+//Other
+#include <sys/select.h>
+#include <sys/stat.h>
+#include <libxml/tree.h>
+#include <geis/geis.h>
+#include <libxml/parser.h>
+
+using namespace std;
+
+//Function Prototypes
+char *getCurrentApp();
+//Decleare in xt.cpp
+void injMixBtnKey (KeySym ks, int btn, string *modifiers);
+void injButton    (int btn, string *modifiers);
+void injKey       (KeySym ks, string *modifiers);
+void movePointer  (int x, int y);
+void openDisplay  (            );
+void closeDisplay (            );
+
+#endif // HEADER_H
 
=== added file 'src/main.cpp'
--- src/main.cpp	1970-01-01 00:00:00 +0000
+++ src/main.cpp	2011-08-23 04:19:23 +0000
@@ -0,0 +1,137 @@
+/**
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * Authors:
+ * 	Mohamed-Ikbel Boulabiar <[e-mail]>
+ * 	Henrik Rydberg          <[e-mail]>
+ *	Stephen M. Webb         <[e-mail]>
+  *	Bijan Binaee            <[e-mail]>
+ *
+ */
+
+#include "gir.h"
+
+int main(int argc, char *argv[])
+{
+    GeisStatus status = GEIS_UNKNOWN_ERROR;
+    GeisXcbWinInfo xcb_win_info;
+    GINN           local;
+    //Initizalize xcb_win_info
+    xcb_win_info.display_name = NULL;
+    xcb_win_info.screenp      = NULL;
+    xcb_win_info.window_id    = local.getRootWindow();
+    //Initialize win_info
+    GeisWinInfo  win_info = {GEIS_XCB_FULL_WINDOW,&xcb_win_info};
+    GeisInstance instance;
+    //Initializ GINN Class
+    local.setGFuncton(gesture_added, gesture_removed, gesture_start, gesture_update, gesture_finish);
+    local.setDFuncton(device_added,device_changed,device_removed);
+
+    local.loadConfig(argc,argv);
+    //local.printConfig();
+    local.StoreConfig();
+
+
+    local.wpEnd = local.wp;
+    while (local.wpEnd->next)
+        local.wpEnd = local.wpEnd->next;
+
+    int pos = 2;
+    cout << endl;
+    while (!local.config_attr[pos].attrName.empty())
+    {
+        cout << "DEBUG " << pos << local.config_attr[pos].attrName << local.config_attr[pos].val <<  local.config_attr[pos].valMax << endl;
+        pos++;
+    }
+
+    //Use Dynamic sub gestures list
+    vector<string> SGL = local.extract_gesture();//sub gestures list buffer
+    const char *sub_gestures_list[SGL.size()];
+    //convert to const char
+    for (int i =0;i<SGL.size();i++)
+    {
+        sub_gestures_list[i] = (char *)(SGL[i].c_str());
+        if (SGL[i].empty())
+             sub_gestures_list[i]= NULL;
+    }
+    local.print_SGL(sub_gestures_list);
+    //End Use Dynamic sub gestures list
+
+    status = geis_init(&win_info, &instance);
+    if (status != GEIS_STATUS_SUCCESS) {
+        cerr << "error in geis_init\n";
+        return 1;
+    }
+
+    status = geis_configuration_supported(instance, GEIS_CONFIG_UNIX_FD);
+    if (status != GEIS_STATUS_SUCCESS) {
+        cerr << "GEIS does not support Unix fd\n";
+        return 1;
+    }
+
+    int fd = -1;
+    status = geis_configuration_get_value(instance, GEIS_CONFIG_UNIX_FD, &fd);
+    if (status != GEIS_STATUS_SUCCESS)
+    {
+        cerr << "error retrieving GEIS fd\n";
+        return 1;
+    }
+    //Subscribe Device input callback
+    status = local.Dsubscribe(instance);//  GEIS_ALL_GESTURES,
+    if (status != GEIS_STATUS_SUCCESS)
+    {
+        cerr << "error on subscribing to Device\n";
+        return 1;
+    }
+    //Subscribe gesture callback
+    status = local.Gsubscribe(instance, GEIS_ALL_INPUT_DEVICES, const_cast <const char**>(sub_gestures_list));//  GEIS_ALL_GESTURES,
+    if (status != GEIS_STATUS_SUCCESS)
+    {
+        cerr << "error on subscribing to gestures\n";
+        return 1;
+    }
+
+    openDisplay();
+
+    while (1)
+    {
+        fd_set read_fds;
+        FD_ZERO(&read_fds);
+        FD_SET(fd, &read_fds);
+        int sstat = select(fd + 1, &read_fds, NULL, NULL, NULL);
+        if (sstat < 0)
+        {
+            cerr << "error " << errno << "in select(): " << strerror(errno) << endl;
+            break;
+        }
+
+        if (FD_ISSET(fd, &read_fds))
+            geis_event_dispatch(instance);
+    }
+
+    delete local.wp;
+    geis_finish(instance);
+    closeDisplay();
+
+    return 0;
+}
+
+
+
+
+
+
 
=== modified file 'src/todo' (properties changed: -x to +x)
=== removed file 'src/xt.c'
--- src/xt.c	2011-03-16 16:23:21 +0000
+++ src/xt.c	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Mohamed-Ikbel Boulabiar <[e-mail]>
- */
-
-#include <X11/X.h>
-#include <X11/extensions/XTest.h>
-#include <X11/keysym.h>
-
-static Display *disp = NULL;
-
-void openDisplay()
-{
-    disp = XOpenDisplay(NULL);
-}
-
-void closeDisplay()
-{
-    XCloseDisplay(disp);
-}
-
-void movePointer(int x, int y)
-{
-    XTestFakeMotionEvent(disp, 0, x, y, CurrentTime);
-}
-
-void injKey(KeySym ks, char *modifiers[])
-{
-    int i;
-
-    for (i = 0; i < 4 && 0 != strcmp(modifiers[i], ""); i++)
-        XTestFakeKeyEvent(disp,
-                          XKeysymToKeycode(disp,
-                                           XStringToKeysym(modifiers
-                                                           [i])), True,
-                          CurrentTime);
-    XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, ks), True, CurrentTime);
-    XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, ks), False,
-                      CurrentTime);
-    for (i = 0; i < 4 && 0 != strcmp(modifiers[i], ""); i++)
-        XTestFakeKeyEvent(disp,
-                          XKeysymToKeycode(disp,
-                                           XStringToKeysym(modifiers
-                                                           [i])), False,
-                          CurrentTime);
-
-    XFlush(disp);
-}
-
-void injButton(int btn, char *modifiers[])
-{
-    int i;
-
-    for (i = 0; i < 4 && 0 != strcmp(modifiers[i], ""); i++)
-        XTestFakeKeyEvent(disp,
-                          XKeysymToKeycode(disp,
-                                           XStringToKeysym(modifiers
-                                                           [i])), True,
-                          CurrentTime);
-    XTestFakeButtonEvent(disp, btn, True, CurrentTime);
-    XTestFakeButtonEvent(disp, btn, False, CurrentTime);
-    for (i = 0; i < 4 && 0 != strcmp(modifiers[i], ""); i++)
-        XTestFakeKeyEvent(disp,
-                          XKeysymToKeycode(disp,
-                                           XStringToKeysym(modifiers
-                                                           [i])), False,
-                          CurrentTime);
-
-    XFlush(disp);
-}
-
-void injMixBtnKey(KeySym ks, int btn, char *modifiers[])
-{
-    int i;
-
-    XTestFakeButtonEvent(disp, btn, True, CurrentTime);
-    for (i = 0; i < 4 && 0 != strcmp(modifiers[i], ""); i++)
-        XTestFakeKeyEvent(disp,
-                          XKeysymToKeycode(disp,
-                                           XStringToKeysym(modifiers
-                                                           [i])), True,
-                          CurrentTime);
-    XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, ks), True, CurrentTime);
-    XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, ks), False,
-                      CurrentTime);
-    for (i = 0; i < 4 && 0 != strcmp(modifiers[i], ""); i++)
-        XTestFakeKeyEvent(disp,
-                          XKeysymToKeycode(disp,
-                                           XStringToKeysym(modifiers
-                                                           [i])), False,
-                          CurrentTime);
-    XTestFakeButtonEvent(disp, btn, False, CurrentTime);
-    XFlush(disp);
-}
 
=== added file 'src/xt.cpp'
--- src/xt.cpp	1970-01-01 00:00:00 +0000
+++ src/xt.cpp	2011-08-23 04:19:23 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2010 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Mohamed-Ikbel Boulabiar <[e-mail]>
+ */
+#include "header.h"
+
+static Display *disp = NULL;
+
+void openDisplay()
+{
+    disp = XOpenDisplay(NULL);
+}
+
+void closeDisplay()
+{
+    XCloseDisplay(disp);
+}
+
+void movePointer(int x, int y)
+{
+    XTestFakeMotionEvent(disp, 0, x, y, CurrentTime);
+}
+
+void injKey(KeySym ks, string *modifiers)
+{
+    int i;
+
+    for (i = 0; i < 4 && !modifiers[i].empty(); i++)
+        XTestFakeKeyEvent(disp,
+                          XKeysymToKeycode(disp,
+                                           XStringToKeysym(modifiers[i].c_str())), True,
+                          CurrentTime);
+    XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, ks), True, CurrentTime);
+    XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, ks), False,
+                      CurrentTime);
+    for (i = 0; i < 4 && !modifiers[i].empty(); i++)
+        XTestFakeKeyEvent(disp,
+                          XKeysymToKeycode(disp,
+                                           XStringToKeysym(modifiers[i].c_str())), False,
+                          CurrentTime);
+
+    XFlush(disp);
+}
+
+void injButton(int btn, string *modifiers)
+{
+    int i;
+
+    for (i = 0; i < 4 && !modifiers[i].empty(); i++)
+        XTestFakeKeyEvent(disp,
+                          XKeysymToKeycode(disp,
+                                           XStringToKeysym(modifiers[i].c_str())), True,
+                          CurrentTime);
+    XTestFakeButtonEvent(disp, btn, True, CurrentTime);
+    XTestFakeButtonEvent(disp, btn, False, CurrentTime);
+    for (i = 0; i < 4 && !modifiers[i].empty(); i++)
+        XTestFakeKeyEvent(disp,
+                          XKeysymToKeycode(disp,
+                                           XStringToKeysym(modifiers[i].c_str())), False,
+                          CurrentTime);
+
+    XFlush(disp);
+}
+
+void injMixBtnKey(KeySym ks, int btn, string *modifiers)
+{
+    int i;
+
+    XTestFakeButtonEvent(disp, btn, True, CurrentTime);
+    for (i = 0; i < 4 && !modifiers[i].empty(); i++)
+        XTestFakeKeyEvent(disp,
+                          XKeysymToKeycode(disp, XStringToKeysym(modifiers [i].c_str())), True,
+                          CurrentTime);
+    XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, ks), True, CurrentTime);
+    XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, ks), False,
+                      CurrentTime);
+    for (i = 0; i < 4 && !modifiers[i].empty(); i++)
+        XTestFakeKeyEvent(disp, XKeysymToKeycode(disp,
+                          XStringToKeysym(modifiers [i].c_str())), False,
+                          CurrentTime);
+    XTestFakeButtonEvent(disp, btn, False, CurrentTime);
+    XFlush(disp);
+}