#include <string>
#include <map>
#include <memory>
-//#include <experimental/optional>
-#include "windowmanager-client.hpp"
+#include "wm-client.hpp"
#include "request.hpp"
+#include "wm-error.h"
namespace wm
{
/* using std::experimental::nullopt;
using std::experimental::optional; */
+struct FloatingSurface;
+
class AppList
{
public:
void addClient(const std::string &appid, const std::string &role);
void addClient(const std::string &appid, unsigned layer, unsigned surface, const std::string &role);
void removeClient(const std::string &appid);
- bool contains(const std::string &appid);
- int countClient();
+ bool contains(const std::string &appid) const;
+ int countClient() const;
std::shared_ptr<WMClient> lookUpClient(const std::string &appid);
void removeSurface(unsigned surface);
+ WMError lookUpFloatingSurface(unsigned pid, unsigned *surface);
+ WMError lookUpFloatingSurface(const std::string &appid, unsigned *surface);
+ WMError appendRole(const std::string &id, const std::string &role, unsigned surface);
// Request Interface
- unsigned currentSequenceNumber();
- unsigned getSequenceNumber(const std::string &appid);
+ unsigned currentRequestNumber() const;
+ unsigned getRequestNumber(const std::string &appid) const;
unsigned addAllocateRequest(WMRequest req);
/* TODO: consider, which is better WMClient or std::string appid?
if appid is key to manage resources, it is better to select std::string
otherwise WMClient is better, IMO */
- bool requestFinished();
- bool setAction(unsigned req_num, const struct WMAction &action);
- bool setAction(unsigned req_num, const std::string &appid, const std::string &role, const std::string &area, bool visible = true);
+ WMError setAction(unsigned req_num, const struct WMAction &action);
+ WMError setAction(unsigned req_num, const std::string &appid, const std::string &role, const std::string &area, bool visible = true);
bool setEndDrawFinished(unsigned req_num, const std::string &appid, const std::string &role);
bool endDrawFullfilled(unsigned req_num);
void removeRequest(unsigned req_num);
void next();
- bool haveRequest();
+ bool haveRequest() const;
struct WMTrigger getRequest(unsigned req_num);
const std::vector<struct WMAction> &getActions(unsigned req_num);
- void client_dump();
- void req_dump();
+ void clientDump();
+ void reqDump();
private:
std::vector<WMRequest> req_list;
- std::unordered_map<std::string, std::shared_ptr<WMClient>> client_list;
- unsigned current_seq;
+ std::unordered_map<std::string, std::shared_ptr<WMClient>> app2client;
+ unsigned current_req;
+
+ std::vector<struct FloatingSurface> floating_surfaces;
+ //std::vector<FloatingSurface> floating_clients;
};
} // namespace wm