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: do some clang-format
[staging/windowmanager.git]
/
src
/
app.cpp
diff --git
a/src/app.cpp
b/src/app.cpp
index
ee02717
..
9292585
100644
(file)
--- a/
src/app.cpp
+++ b/
src/app.cpp
@@
-53,8
+53,7
@@
result<json> file_to_json(char const *filename) {
return Ok(j);
}
return Ok(j);
}
-struct result<layer_map>
- load_layer_map(char const *filename) {
+struct result<layer_map> load_layer_map(char const *filename) {
logdebug("loading IDs from %s", filename);
auto j = file_to_json(filename);
logdebug("loading IDs from %s", filename);
auto j = file_to_json(filename);
@@
-210,8
+209,9
@@
int App::init_layers() {
auto &l = layers[i.layer_id];
l->set_destination_rectangle(0, 0, o->width, o->height);
l->set_visibility(1);
auto &l = layers[i.layer_id];
l->set_destination_rectangle(0, 0, o->width, o->height);
l->set_visibility(1);
- logdebug("Setting up layer %s (%d) for surfaces %d-%d and role match \"%s\"", i.name.c_str(),
- i.layer_id, i.id_min, i.id_max, i.role.c_str());
+ logdebug(
+ "Setting up layer %s (%d) for surfaces %d-%d and role match \"%s\"",
+ i.name.c_str(), i.layer_id, i.id_min, i.id_max, i.role.c_str());
this->layouts[l->id] = LayoutState{};
}
this->layouts[l->id] = LayoutState{};
}
@@
-299,13
+299,14
@@
void App::surface_set_layout_full(uint32_t surface_id) {
// set destination to the display rectangle
s->set_destination_rectangle(x, y, w, h);
// set destination to the display rectangle
s->set_destination_rectangle(x, y, w, h);
- //redraw_fix(this, s, x, y, w, h);
+ //
redraw_fix(this, s, x, y, w, h);
- logdebug("Surface %u now with rect { %d, %d, %d, %d }",
-
surface_id, x, y, w,
h);
+ logdebug("Surface %u now with rect { %d, %d, %d, %d }",
surface_id, x, y, w,
+ h);
}
}
-void App::surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id) {
+void App::surface_set_layout_split(uint32_t surface_id,
+ uint32_t sub_surface_id) {
if (!this->controller->surface_exists(surface_id)) {
logerror("Surface %d does not exist", int(surface_id));
return;
if (!this->controller->surface_exists(surface_id)) {
logerror("Surface %d does not exist", int(surface_id));
return;
@@
-365,16
+366,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);
@@
-388,13
+389,13
@@
char const *App::activate_surface(char const *drawing_name) {
auto layer_id = this->layers.get_layer_id(*surface_id);
auto layer_id = this->layers.get_layer_id(*surface_id);
- if (!
layer_id) {
+ if (!layer_id) {
return "Surface is not on any layer!";
}
auto o_state = *this->layers.get_layout_state(*surface_id);
return "Surface is not on any layer!";
}
auto o_state = *this->layers.get_layout_state(*surface_id);
- if (!
o_state) {
+ if (!o_state) {
return "Could not find layer for surface";
}
return "Could not find layer for surface";
}
@@
-491,7
+492,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);
@@
-505,7
+506,7
@@
char const *App::deactivate_surface(char const *drawing_name) {
auto o_state = *this->layers.get_layout_state(*surface_id);
auto o_state = *this->layers.get_layout_state(*surface_id);
- if (!
o_state) {
+ if (!o_state) {
return "Could not find layer for surface";
}
return "Could not find layer for surface";
}
@@
-537,7
+538,7
@@
char const *App::deactivate_surface(char const *drawing_name) {
this->deactivate(*surface_id);
state.main = -1;
}
this->deactivate(*surface_id);
state.main = -1;
}
- }else if (state.sub == *surface_id) {
+ }
else if (state.sub == *surface_id) {
std::string main = std::move(*this->lookup_name(state.main));
this->emit_syncdraw(main.c_str());
std::string main = std::move(*this->lookup_name(state.main));
this->emit_syncdraw(main.c_str());
@@
-559,7
+560,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) {
@@
-581,22
+582,23
@@
char const *App::enddraw(char const *drawing_name) {
// |_|
void App::surface_created(uint32_t surface_id) {
auto layer_id = this->layers.get_layer_id(surface_id);
// |_|
void App::surface_created(uint32_t surface_id) {
auto layer_id = this->layers.get_layer_id(surface_id);
- if (! layer_id) {
- logdebug("Newly created surfce %d is not associated with any layer!", surface_id);
+ if (!layer_id) {
+ logdebug("Newly created surfce %d is not associated with any layer!",
+ surface_id);
return;
}
logdebug("surface_id is %u, layer_id is %u", surface_id, *layer_id);
return;
}
logdebug("surface_id is %u, layer_id is %u", surface_id, *layer_id);
- this->controller->layers[*layer_id]
-
->add_surface(
this->controller->surfaces[surface_id].get());
+ this->controller->layers[*layer_id]
->add_surface(
+ this->controller->surfaces[surface_id].get());
// activate the main_surface right away
if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
logdebug("Activating main_surface (%d)", surface_id);
// activate the main_surface right away
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
+607,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
+633,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?
@@
-686,8
+690,7
@@
void App::deactivate(int id) {
bool App::can_split(struct LayoutState const &state, int new_id) {
if (state.main != -1 && state.main != new_id) {
auto new_id_layer = this->layers.get_layer_id(new_id).value();
bool App::can_split(struct LayoutState const &state, int new_id) {
if (state.main != -1 && state.main != new_id) {
auto new_id_layer = this->layers.get_layer_id(new_id).value();
- auto current_id_layer =
- this->layers.get_layer_id(state.main).value();
+ auto current_id_layer = this->layers.get_layer_id(state.main).value();
// surfaces are on separate layers, don't bother.
if (new_id_layer != current_id_layer) {
// surfaces are on separate layers, don't bother.
if (new_id_layer != current_id_layer) {
@@
-695,8
+698,7
@@
bool App::can_split(struct LayoutState const &state, int new_id) {
}
std::string const &new_id_str = this->lookup_name(new_id).value();
}
std::string const &new_id_str = this->lookup_name(new_id).value();
- std::string const &cur_id_str =
- this->lookup_name(state.main).value();
+ std::string const &cur_id_str = this->lookup_name(state.main).value();
auto const &layer = this->layers.get_layer(new_id_layer);
auto const &layer = this->layers.get_layer(new_id_layer);