From 8a7279daea883f86c2a500c368d252394faeea5b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 13 Dec 2015 19:37:50 +0300 Subject: Move nacl messages related functions into separate file. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/utils/copynpaste.cpp | 2 +- src/utils/naclmessages.cpp | 99 ++++++++++++++++++++++++++++++++++++++++++++++ src/utils/naclmessages.h | 41 +++++++++++++++++++ src/utils/process.cpp | 77 ++---------------------------------- src/utils/process.h | 12 ------ 7 files changed, 149 insertions(+), 86 deletions(-) create mode 100644 src/utils/naclmessages.cpp create mode 100644 src/utils/naclmessages.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6501974bb..3c6346036 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -797,6 +797,8 @@ SET(SRCS utils/timer.cpp utils/timer.h utils/mutex.h + utils/naclmessages.cpp + utils/naclmessages.h utils/mkdir.cpp utils/mkdir.h utils/xml.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 992a7b396..e9a7818ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -445,6 +445,8 @@ SRC += events/actionevent.h \ utils/timer.cpp \ utils/timer.h \ utils/mutex.h \ + utils/naclmessages.cpp \ + utils/naclmessages.h \ utils/xml.cpp \ utils/xml.h \ utils/xmlutils.cpp \ diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index 0f43c9127..fc8441dff 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -472,7 +472,7 @@ static bool runxsel(std::string& text, const char *p1, const char *p2) #elif defined __native_client__ -#include "utils/process.h" +#include "utils/naclmessages.h" bool retrieveBuffer(std::string& text, size_t& pos) { diff --git a/src/utils/naclmessages.cpp b/src/utils/naclmessages.cpp new file mode 100644 index 000000000..1723f7180 --- /dev/null +++ b/src/utils/naclmessages.cpp @@ -0,0 +1,99 @@ +/* + * The ManaPlus Client + * Copyright (C) 2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef __native_client__ + +#include "utils/naclmessages.h" + +#include +#include +#include +#include + +#include +#include + +#include "debug.h" + +struct NaclMessageHandle final +{ + bool handled; + std::string type; + std::string message; + std::condition_variable condv; +}; + +void naclPostMessage(const std::string &type, + const std::string &message) +{ + pp::Var msgVar = pp::Var(std::string(type).append(":").append(message)); + pp::Instance(PSGetInstanceId()).PostMessage(msgVar); +} + +static void naclMessageHandlerFunc(struct PP_Var key, + struct PP_Var value, + void* user_data) +{ + NaclMessageHandle *handle = (NaclMessageHandle *)user_data; + + if (key.type != PP_VARTYPE_STRING || value.type != PP_VARTYPE_STRING) + return; + if (pp::Var(key).AsString() != handle->type) + return; + + handle->handled = true; + handle->message = pp::Var(value).AsString(); + + handle->condv.notify_one(); +} + +NaclMessageHandle *naclRegisterMessageHandler(const std::string &type) +{ + NaclMessageHandle *handle = new NaclMessageHandle; + handle->handled = false; + handle->type = type; + + PSEventRegisterMessageHandler(type.c_str(), + naclMessageHandlerFunc, + (void *)handle); + return handle; +} + +void naclUnregisterMessageHandler(NaclMessageHandle *handle) +{ + PSEventRegisterMessageHandler(handle->type.c_str(), + nullptr, + nullptr); + delete handle; +} + +std::string naclWaitForMessage(NaclMessageHandle *handle) +{ + std::mutex mtx; + std::unique_lock lck(mtx); + + while (!handle->handled) + handle->condv.wait(lck); + + handle->handled = false; + return handle->message; +} + +#endif // __native_client__ diff --git a/src/utils/naclmessages.h b/src/utils/naclmessages.h new file mode 100644 index 000000000..d5edf4759 --- /dev/null +++ b/src/utils/naclmessages.h @@ -0,0 +1,41 @@ +/* + * The ManaPlus Client + * Copyright (C) 2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef UTILS_NACLMESSAGES_H +#define UTILS_NACLMESSAGES_H + +#ifdef __native_client__ + +#include + +#include "localconsts.h" + +struct NaclMessageHandle; + +void naclPostMessage(const std::string &type, const std::string &message); + +NaclMessageHandle *naclRegisterMessageHandler(const std::string &type); + +void naclUnregisterMessageHandler(NaclMessageHandle *handle); + +std::string naclWaitForMessage(NaclMessageHandle *handle); + +#endif // __native_client__ +#endif // UTILS_NACLMESSAGES_H diff --git a/src/utils/process.cpp b/src/utils/process.cpp index 6da177eb9..a037baef8 100644 --- a/src/utils/process.cpp +++ b/src/utils/process.cpp @@ -39,6 +39,7 @@ const int timeOut = 10; #ifdef WIN32 #include "utils/stringutils.h" + #include int execFileWait(const std::string &pathName, const std::string &name A_UNUSED, @@ -275,6 +276,9 @@ bool openBrowser(std::string url) return execFile("/usr/bin/xdg-open", "/usr/bin/xdg-open", url, ""); } #elif defined __native_client__ + +#include "utils/naclmessages.h" + bool openBrowser(std::string url) { naclPostMessage("open-browser", url); @@ -302,76 +306,3 @@ void setPriority(const bool big A_UNUSED) { } #endif - -#ifdef __native_client__ -#include -#include -#include -#include - -#include -#include - -struct _NaclMessageHandle final -{ - bool handled; - std::string type; - std::string message; - std::condition_variable condv; -}; - -void naclPostMessage(const std::string &type, const std::string &message) -{ - pp::Var msgVar = pp::Var(std::string(type).append(":").append(message)); - pp::Instance(PSGetInstanceId()).PostMessage(msgVar); -} - -static void naclMessageHandlerFunc(struct PP_Var key, - struct PP_Var value, - void* user_data) -{ - NaclMessageHandle *handle = (NaclMessageHandle *)user_data; - - if (key.type != PP_VARTYPE_STRING || value.type != PP_VARTYPE_STRING) - return; - if (pp::Var(key).AsString() != handle->type) - return; - - handle->handled = true; - handle->message = pp::Var(value).AsString(); - - handle->condv.notify_one(); -} - -NaclMessageHandle *naclRegisterMessageHandler(const std::string &type) -{ - NaclMessageHandle *handle = new NaclMessageHandle; - handle->handled = false; - handle->type = type; - - PSEventRegisterMessageHandler(type.c_str(), - naclMessageHandlerFunc, - (void *)handle); - return handle; -} - -void naclUnregisterMessageHandler(NaclMessageHandle *handle) -{ - PSEventRegisterMessageHandler(handle->type.c_str(), - nullptr, - nullptr); - delete handle; -} - -std::string naclWaitForMessage(NaclMessageHandle *handle) -{ - std::mutex mtx; - std::unique_lock lck(mtx); - - while (!handle->handled) - handle->condv.wait(lck); - - handle->handled = false; - return handle->message; -} -#endif diff --git a/src/utils/process.h b/src/utils/process.h index 44c1d2286..5ceddd032 100644 --- a/src/utils/process.h +++ b/src/utils/process.h @@ -34,16 +34,4 @@ bool openBrowser(std::string url); void setPriority(const bool big); -#ifdef __native_client__ - -typedef struct _NaclMessageHandle NaclMessageHandle; - -void naclPostMessage(const std::string &type, const std::string &message); - -NaclMessageHandle *naclRegisterMessageHandler(const std::string &type); -void naclUnregisterMessageHandler(NaclMessageHandle *handle); -std::string naclWaitForMessage(NaclMessageHandle *handle); - -#endif - #endif // UTILS_PROCESS_H -- cgit v1.2.3-60-g2f50