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
App: rename api call implementations to api_*
[staging/windowmanager.git]
/
src
/
app.cpp
diff --git
a/src/app.cpp
b/src/app.cpp
index
ee02717
..
da149b9
100644
(file)
--- a/
src/app.cpp
+++ b/
src/app.cpp
@@
-365,16
+365,16
@@
void App::surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id)
// set source reactangle, even if we should not need to set it.
ss->set_source_rectangle(0, 0, w, h);
// set destination to the display rectangle
// set source reactangle, even if we should not need to set it.
ss->set_source_rectangle(0, 0, w, h);
// set destination to the display rectangle
- ss->set_destination_rectangle(x
+x_off, y+
y_off, w, h);
+ ss->set_destination_rectangle(x
+ x_off, y +
y_off, w, h);
- //redraw_fix(this, s, x, y, w, h);
- //redraw_fix(this, ss, x+x_off, y+y_off, w, h);
+ //
redraw_fix(this, s, x, y, w, h);
+ //
redraw_fix(this, ss, x+x_off, y+y_off, w, h);
logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
surface_id, layer_id, x, y, w, h);
}
logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
surface_id, layer_id, x, y, w, h);
}
-char const *App::activate_surface(char const *drawing_name) {
+char const *App::a
pi_a
ctivate_surface(char const *drawing_name) {
ST();
auto const &surface_id = this->lookup_id(drawing_name);
ST();
auto const &surface_id = this->lookup_id(drawing_name);
@@
-491,7
+491,7
@@
char const *App::activate_surface(char const *drawing_name) {
return nullptr;
}
return nullptr;
}
-char const *App::deactivate_surface(char const *drawing_name) {
+char const *App::
api_
deactivate_surface(char const *drawing_name) {
ST();
auto const &surface_id = this->lookup_id(drawing_name);
ST();
auto const &surface_id = this->lookup_id(drawing_name);
@@
-559,7
+559,7
@@
char const *App::deactivate_surface(char const *drawing_name) {
return nullptr;
}
return nullptr;
}
-char const *App::enddraw(char const *drawing_name) {
+char const *App::
api_
enddraw(char const *drawing_name) {
for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) {
auto n = this->lookup_name(this->pending_end_draw[i]);
if (n && *n == drawing_name) {
for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) {
auto n = this->lookup_name(this->pending_end_draw[i]);
if (n && *n == drawing_name) {
@@
-595,8
+595,8
@@
void App::surface_created(uint32_t surface_id) {
if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
logdebug("Activating main_surface (%d)", surface_id);
if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
logdebug("Activating main_surface (%d)", surface_id);
- this->activate_surface(
-
this->lookup_name(surface_id).value_or("unknown-name").c_str());
+ this->a
pi_a
ctivate_surface(
+ this->lookup_name(surface_id).value_or("unknown-name").c_str());
}
}
}
}
@@
-605,7
+605,7
@@
void App::surface_removed(uint32_t surface_id) {
auto drawing_name = this->lookup_name(surface_id);
if (drawing_name) {
auto drawing_name = this->lookup_name(surface_id);
if (drawing_name) {
- this->deactivate_surface(drawing_name->c_str());
+ this->
api_
deactivate_surface(drawing_name->c_str());
}
this->id_alloc.remove_id(surface_id);
}
this->id_alloc.remove_id(surface_id);
@@
-631,11
+631,13
@@
void App::emit_visible(char const *label, bool is_visible) {
this->api.send_event(is_visible ? "visible" : "invisible", label);
}
this->api.send_event(is_visible ? "visible" : "invisible", label);
}
-void App::emit_invisible(char const *label) { return emit_visible(label, false); }
+void App::emit_invisible(char const *label) {
+ return emit_visible(label, false);
+}
void App::emit_visible(char const *label) { return emit_visible(label, true); }
void App::emit_visible(char const *label) { return emit_visible(label, true); }
-result<int> App::request_surface(char const *drawing_name) {
+result<int> App::
api_
request_surface(char const *drawing_name) {
auto lid = this->layers.get_layer_id(std::string(drawing_name));
if (!lid) {
// XXX: to we need to put these applications on the App layer?
auto lid = this->layers.get_layer_id(std::string(drawing_name));
if (!lid) {
// XXX: to we need to put these applications on the App layer?