binding/afbclient: use the correct binding names

[staging/windowmanager.git] / generate-binding-glue.py

diff --git a/generate-binding-glue.py b/generate-binding-glue.py
index 43bc742..177b8c2 100644 (file)
--- a/generate-binding-glue.py
+++ b/generate-binding-glue.py
@@ -49,6 +49,10 @@ def emit_func_impl(api, f):
 
 def emit_func(api, f):
     p('void %(impl_name)s(afb_req req) noexcept {' % f)
+    p('   std::lock_guard<std::mutex> guard(binding_m);')
+    p('   #ifdef ST')
+    p('   ST();')
+    p('   #endif')
     p('   if (g_afb_instance == nullptr) {',
       '      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");',
       '      return;',
@@ -69,7 +73,8 @@ def emit_afb_verbs(api):
     p('   {}', '};')
 
 def emit_binding(api):
-    p('namespace {', '')
+    p('namespace {')
+    p('std::mutex binding_m;', '')
     for func in api['functions']:
         emit_func(api, func)
     p('} // namespace', '')
@@ -87,10 +92,11 @@ def emit_afb_api(api):
     p('struct binding_api {')
     p('   typedef wm::result<json_object *> result_type;')
     p('   struct wm::App *app;')
+    p('   void send_event(char const *evname, char const *label);')
     for f in api['functions']:
         p('   result_type %(name)s(' % f + ', '.join(map(lambda x: '%(type)s %(name)s' % x, f.get('args', []))) + ');')
     p('};', '')
-    p('} // namespace wm')
+    p('} // namespace wm', '')
 
 # names must always be valid in c and unique for each function (that is its arguments)
 # arguments will be looked up from json request, range checking needs to be implemented
@@ -100,15 +106,33 @@ API = {
         'api': 'g_afb_instance->app.api.', # where are our API functions
         'functions': [
             {
-                'name': 'register_surface',
+                'name': 'requestsurface',
                 #'return_type': 'int', # Or do they return all just some json?
                 'args': [ # describes the functions arguments, and their names as found in the json request
-                    { 'name': 'appid', 'type': 'uint32_t', 'jtype': 'int' }, # XXX: lookup jtypes automatically? i.e. char*|const char* would be string?
-                    { 'name': 'surfaceid', 'type': 'uint32_t', 'jtype': 'int' },
+                    { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' },
                 ],
             },
-            { 'name': 'demo_activate_surface', 'args': [ { 'name': 'surfaceid', 'type': 'uint32_t', 'jtype': 'int' } ] },
-            { 'name': 'demo_activate_all' },
+            {
+                'name': 'activatesurface',
+                'args': [
+                    { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' },
+                ],
+            },
+            {
+                'name': 'deactivatesurface',
+                'args': [
+                    { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' },
+                ],
+            },
+            {
+                'name': 'enddraw',
+                'args': [
+                    { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' },
+                ],
+            },
+            { 'name': 'list_drawing_names', },
+            { 'name': 'ping' },
+
             { 'name': 'debug_status', },
             { 'name': 'debug_layers', },
             { 'name': 'debug_surfaces', },