Code Review
/
apps
/
agl-service-windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove unused header
[apps/agl-service-windowmanager.git]
/
src
/
app.hpp
diff --git
a/src/app.hpp
b/src/app.hpp
index
14dbca3
..
af7cd8f
100644
(file)
--- a/
src/app.hpp
+++ b/
src/app.hpp
@@
-22,14
+22,10
@@
#include <atomic>
#include <memory>
#include <unordered_map>
#include <atomic>
#include <memory>
#include <unordered_map>
-#include <unordered_set>
#include <experimental/optional>
#include <experimental/optional>
-#include "config.hpp"
#include "controller_hooks.hpp"
#include "layers.hpp"
#include "layout.hpp"
#include "controller_hooks.hpp"
#include "layers.hpp"
#include "layout.hpp"
-#include "policy.hpp"
-#include "result.hpp"
#include "wayland_ivi_wm.hpp"
#include "hmi-debug.h"
#include "request.hpp"
#include "wayland_ivi_wm.hpp"
#include "hmi-debug.h"
#include "request.hpp"
@@
-76,7
+72,6
@@
struct id_allocator
// Surfaces that where requested but not yet created
std::unordered_map<unsigned, std::string> id2name;
// Surfaces that where requested but not yet created
std::unordered_map<unsigned, std::string> id2name;
- // std::unordered_set<unsigned> pending_surfaces;
std::unordered_map<std::string, unsigned> name2id;
id_allocator(id_allocator const &) = delete;
std::unordered_map<std::string, unsigned> name2id;
id_allocator(id_allocator const &) = delete;
@@
-89,7
+84,6
@@
struct id_allocator
{
unsigned sid = this->next++;
this->id2name[sid] = name;
{
unsigned sid = this->next++;
this->id2name[sid] = name;
- // this->pending_surfaces.insert({sid});
this->name2id[name] = sid;
HMI_DEBUG("wm", "allocated new id %u with name %s", sid, name.c_str());
return sid;
this->name2id[name] = sid;
HMI_DEBUG("wm", "allocated new id %u with name %s", sid, name.c_str());
return sid;
@@
-181,8
+175,6
@@
struct App
std::unique_ptr<struct compositor::controller> controller;
std::vector<std::unique_ptr<struct wl::output>> outputs;
std::unique_ptr<struct compositor::controller> controller;
std::vector<std::unique_ptr<struct wl::output>> outputs;
- struct config config;
-
// track current layouts separately
layer_map layers;
// track current layouts separately
layer_map layers;
@@
-192,10
+184,6
@@
struct App
// Set by AFB API when wayland events need to be dispatched
std::atomic<bool> pending_events;
// Set by AFB API when wayland events need to be dispatched
std::atomic<bool> pending_events;
- std::vector<int> pending_end_draw;
-
- Policy policy;
-
std::map<const char *, struct afb_event> map_afb_event;
// Surface are info (x, y, w, h)
std::map<const char *, struct afb_event> map_afb_event;
// Surface are info (x, y, w, h)
@@
-246,9
+234,6
@@
struct App
bool pop_pending_events();
bool pop_pending_events();
- void enqueue_flushdraw(int surface_id);
- void check_flushdraw(int surface_id);
-
int init_layers();
void surface_set_layout(int surface_id, const std::string& area = "");
int init_layers();
void surface_set_layout(int surface_id, const std::string& area = "");
@@
-277,8
+262,7
@@
struct App
WMError setSurfaceSize(unsigned surface, const std::string& area);
WMError changeCurrentState(unsigned req_num);
WMError setSurfaceSize(unsigned surface, const std::string& area);
WMError changeCurrentState(unsigned req_num);
- void
- setTimer();
+ void setTimer();
void stopTimer();
void processNextRequest();
void stopTimer();
void processNextRequest();
@@
-288,9
+272,6
@@
struct App
void deactivate(int id);
bool can_split(struct LayoutState const &state, int new_id);
void deactivate(int id);
bool can_split(struct LayoutState const &state, int new_id);
- void try_layout(struct LayoutState &state,
- struct LayoutState const &new_layout,
- std::function<void(LayoutState const &nl)> apply);
private:
std::unordered_map<std::string, struct compositor::rect> area2size;
private:
std::unordered_map<std::string, struct compositor::rect> area2size;