binding/afbclient: use the correct binding names

[staging/windowmanager.git] / client-lib / AFBClient.cpp

diff --git a/client-lib/AFBClient.cpp b/client-lib/AFBClient.cpp
index 1677509..e0c4efa 100644 (file)
--- a/client-lib/AFBClient.cpp
+++ b/client-lib/AFBClient.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include "AFBClient.h"
 
 #include <cassert>
@@ -223,7 +239,7 @@ int AFBClient::Impl::requestSurface(const char *label) {
     int rc = -1;
     /* send the request */
     int rc2 =
-        this->api_call("request_surface", j, [&rc](bool ok, json_object *j) {
+        this->api_call("RequestSurface", j, [&rc](bool ok, json_object *j) {
             if (ok) {
                 int id =
                     json_object_get_int(json_object_object_get(j, "response"));
@@ -259,7 +275,7 @@ int AFBClient::Impl::requestSurface(const char *label) {
 int AFBClient::Impl::activateSurface(const char *label) {
     TRACE();
     json_object *j = drawing_name_json_argument(label);
-    return this->api_call("activate_surface", j, [](bool ok, json_object *j) {
+    return this->api_call("ActivateSurface", j, [](bool ok, json_object *j) {
         if (!ok) {
             fprintf(stderr, "API Call activate_surface() failed: %s\n",
                     j != nullptr ? json_object_to_json_string_ext(
@@ -272,7 +288,7 @@ int AFBClient::Impl::activateSurface(const char *label) {
 int AFBClient::Impl::deactivateSurface(const char *label) {
     TRACE();
     json_object *j = drawing_name_json_argument(label);
-    return this->api_call("deactivate_surface", j, [](bool ok, json_object *j) {
+    return this->api_call("DeactivateSurface", j, [](bool ok, json_object *j) {
         if (!ok) {
             fprintf(stderr, "API Call deactivate_surface() failed: %s\n",
                     j != nullptr ? json_object_to_json_string_ext(
@@ -285,7 +301,7 @@ int AFBClient::Impl::deactivateSurface(const char *label) {
 int AFBClient::Impl::endDraw(const char *label) {
     TRACE();
     json_object *j = drawing_name_json_argument(label);
-    return this->api_call("enddraw", j, [](bool ok, json_object *j) {
+    return this->api_call("EndDraw", j, [](bool ok, json_object *j) {
         if (!ok) {
             fprintf(stderr, "API Call endDraw() failed: %s\n",
                     j != nullptr ? json_object_to_json_string_ext(
@@ -320,8 +336,8 @@ std::pair<bool, AFBClient::EventType> make_event_type(char const *et) {
                 true, CONCAT(AFBClient::Event_, A));      \
     } while (false)
 
-    ET("activated", Active);
-    ET("deactivated", Inactive);
+    ET("active", Active);
+    ET("inactive", Inactive);
     ET("visible", Visible);
     ET("invisible", Invisible);
     ET("syncdraw", SyncDraw);