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: make a couple of methods private to signal internal use
[staging/windowmanager.git]
/
src
/
app.hpp
diff --git
a/src/app.hpp
b/src/app.hpp
index
37122ef
..
6e18855
100644
(file)
--- a/
src/app.hpp
+++ b/
src/app.hpp
@@
-18,10
+18,12
@@
#define TMCAGLWM_APP_HPP
#include <json-c/json.h>
#define TMCAGLWM_APP_HPP
#include <json-c/json.h>
+
+#include <atomic>
#include <memory>
#include <unordered_map>
#include <unordered_set>
#include <memory>
#include <unordered_map>
#include <unordered_set>
-#include <
deque
>
+#include <
experimental/optional
>
#include "afb_binding_api.hpp"
#include "config.hpp"
#include "afb_binding_api.hpp"
#include "config.hpp"
@@
-41,6
+43,8
@@
struct controller;
namespace wm {
namespace wm {
+using std::experimental::optional;
+
struct id_allocator {
constexpr static const unsigned id_shift = 22;
constexpr static const unsigned id_mask = (1 << id_shift) - 1;
struct id_allocator {
constexpr static const unsigned id_shift = 22;
constexpr static const unsigned id_mask = (1 << id_shift) - 1;
@@
-98,17
+102,6
@@
struct id_allocator {
}
};
}
};
-struct LayoutState {
- enum States {
- LayoutSingle,
- LayoutSplit,
- };
-
- enum States state;
- int main;
- int sub;
-};
-
struct App {
struct binding_api api;
struct controller_hooks chooks;
struct App {
struct binding_api api;
struct controller_hooks chooks;
@@
-121,19
+114,17
@@
struct App {
struct config config;
struct config config;
- layouts_type layouts;
+ // track current layouts separately
+ std::map<int, struct LayoutState> layouts;
layer_map layers;
// ID allocation and proxy methods for lookup
struct id_allocator id_alloc;
layer_map layers;
// ID allocation and proxy methods for lookup
struct id_allocator id_alloc;
- optional<unsigned> lookup_id(char const *name) {
- return this->id_alloc.lookup(std::string(name));
- }
- optional<std::string> lookup_name(unsigned id) {
- return this->id_alloc.lookup(id);
- }
- struct LayoutState state;
+ // Set by AFB API when wayland events need to be dispatched
+ std::atomic<bool> pending_events;
+
+ std::vector<int> pending_end_draw;
explicit App(wl::display *d);
~App();
explicit App(wl::display *d);
~App();
@@
-144,23
+135,35
@@
struct App {
App &operator=(App &&) = delete;
int init();
App &operator=(App &&) = delete;
int init();
- int init_layers();
int dispatch_events();
int dispatch_events();
+ int dispatch_pending_events();
- void surface_init_layout(uint32_t surface_id);
-
- // Allocate a surface ID for this role
- result<int> request_surface(char const *drawing_name);
+ void surface_set_layout_full(uint32_t surface_id);
+ void surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id);
+ void set_pending_events();
- // Activate (i.e. make visible, if allowed!) a surface
- char const *activate_surface(char const *drawing_name);
- char const *deactivate_surface(char const *drawing_name);
+ result<int> api_request_surface(char const *drawing_name);
+ char const *api_activate_surface(char const *drawing_name);
+ char const *api_deactivate_surface(char const *drawing_name);
+ char const *api_enddraw(char const *drawing_name);
+ void api_ping();
// Events from the compositor we are interested in
void surface_created(uint32_t surface_id);
void surface_removed(uint32_t surface_id);
// Events from the compositor we are interested in
void surface_created(uint32_t surface_id);
void surface_removed(uint32_t surface_id);
+private:
+ optional<int> lookup_id(char const *name);
+ optional<std::string> lookup_name(int id);
+
+ bool pop_pending_events();
+
+ void enqueue_flushdraw(int surface_id);
+ void check_flushdraw(int surface_id);
+
+ int init_layers();
+
// TMC WM Events to clients
void emit_activated(char const *label);
void emit_deactivated(char const *label);
// TMC WM Events to clients
void emit_activated(char const *label);
void emit_deactivated(char const *label);
@@
-170,10
+173,10
@@
struct App {
void emit_invisible(char const *label);
void emit_visible(char const *label);
void emit_invisible(char const *label);
void emit_visible(char const *label);
- void activate(
unsigned
id);
- void deactivate(
unsigned
id);
+ void activate(
int
id);
+ void deactivate(
int
id);
- bool can_split(
unsigned
new_id);
+ bool can_split(
struct LayoutState const &state, int
new_id);
};
} // namespace wm
};
} // namespace wm