Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
binding/afbclient: use the correct binding names
[staging/windowmanager.git]
/
src
/
afb_binding_api.cpp
diff --git
a/src/afb_binding_api.cpp
b/src/afb_binding_api.cpp
index
41eed13
..
9311700
100644
(file)
--- a/
src/afb_binding_api.cpp
+++ b/
src/afb_binding_api.cpp
@@
-32,19
+32,19
@@
namespace wm {
// | |_) | | | | | (_| | | | | | (_| | | (_| | |_) | | | | | | | | | |_) | |
// |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___\__,_| .__/|_| |_|_| |_| |_| .__/|_|
// |___/_____| |_| |_|
// | |_) | | | | | (_| | | | | | (_| | | (_| | |_) | | | | | | | | | |_) | |
// |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___\__,_| .__/|_| |_|_| |_| |_| .__/|_|
// |___/_____| |_| |_|
-binding_api::result_type binding_api::request
_
surface(
+binding_api::result_type binding_api::requestsurface(
char const *drawing_name) {
char const *drawing_name) {
- auto r = this->app->request_surface(drawing_name);
+ auto r = this->app->
api_
request_surface(drawing_name);
if (r.is_err()) {
return Err<json_object *>(r.unwrap_err());
}
return Ok(json_object_new_int(r.unwrap()));
}
if (r.is_err()) {
return Err<json_object *>(r.unwrap_err());
}
return Ok(json_object_new_int(r.unwrap()));
}
-binding_api::result_type binding_api::activate
_
surface(
+binding_api::result_type binding_api::activatesurface(
char const *drawing_name) {
logdebug("%s drawing_name %s", __func__, drawing_name);
char const *drawing_name) {
logdebug("%s drawing_name %s", __func__, drawing_name);
- auto r = this->app->activate_surface(drawing_name);
+ auto r = this->app->a
pi_a
ctivate_surface(drawing_name);
if (r != nullptr) {
logdebug("%s failed with error: %s", __func__, r);
return Err<json_object *>(r);
if (r != nullptr) {
logdebug("%s failed with error: %s", __func__, r);
return Err<json_object *>(r);
@@
-52,9
+52,9
@@
binding_api::result_type binding_api::activate_surface(
return Ok(json_object_new_object());
}
return Ok(json_object_new_object());
}
-binding_api::result_type binding_api::deactivate
_
surface(char const* drawing_name) {
+binding_api::result_type binding_api::deactivatesurface(char const* drawing_name) {
logdebug("%s drawing_name %s", __func__, drawing_name);
logdebug("%s drawing_name %s", __func__, drawing_name);
- auto r = this->app->deactivate_surface(drawing_name);
+ auto r = this->app->
api_
deactivate_surface(drawing_name);
if (r != nullptr) {
logdebug("%s failed with error: %s", __func__, r);
return Err<json_object *>(r);
if (r != nullptr) {
logdebug("%s failed with error: %s", __func__, r);
return Err<json_object *>(r);
@@
-64,7
+64,12
@@
binding_api::result_type binding_api::deactivate_surface(char const* drawing_nam
binding_api::result_type binding_api::enddraw(char const* drawing_name) {
logdebug("%s drawing_name %s", __func__, drawing_name);
binding_api::result_type binding_api::enddraw(char const* drawing_name) {
logdebug("%s drawing_name %s", __func__, drawing_name);
- return Err<json_object*>("not implemented");
+ auto r = this->app->api_enddraw(drawing_name);
+ if (r != nullptr) {
+ logdebug("%s failed with error: %s", __func__, r);
+ return Err<json_object *>(r);
+ }
+ return Ok(json_object_new_object());
}
binding_api::result_type binding_api::list_drawing_names() {
}
binding_api::result_type binding_api::list_drawing_names() {
@@
-94,13
+99,15
@@
binding_api::result_type binding_api::debug_status() {
binding_api::result_type binding_api::debug_terminate() {
logdebug("%s", __func__);
binding_api::result_type binding_api::debug_terminate() {
logdebug("%s", __func__);
- raise(SIGKILL); // XXX afb-daemon kills it's pgroup using TERM, which
- // doesn't play well with perf
+ if (getenv("WINMAN_DEBUG_TERMINATE") != nullptr) {
+ raise(SIGKILL); // XXX afb-daemon kills it's pgroup using TERM, which
+ // doesn't play well with perf
+ }
return Ok(json_object_new_object());
}
binding_api::result_type binding_api::ping() {
return Ok(json_object_new_object());
}
binding_api::result_type binding_api::ping() {
- this->app->
dispatch_pending_events
();
+ this->app->
api_ping
();
return Ok(json_object_new_object());
}
return Ok(json_object_new_object());
}