Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Big Picture APIs. #63

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/greenheartgames/greenworks/blob/master/LICENSE"
}],
"dependencies": {
"nan": "2.0.8"
"nan": "^2.0.8"
},
"devDependencies": {
"mocha": "1.21.4"
Expand Down
64 changes: 63 additions & 1 deletion src/greenworks_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class SteamEvent : public greenworks::SteamClient::Observer {
virtual void OnSteamServersDisconnected();
virtual void OnSteamServerConnectFailure(int status_code);
virtual void OnSteamShutdown();
virtual void OnGamepadTextInputDismissed(bool submitted, uint32 text);
};

void SteamEvent::OnGameOverlayActivated(bool is_active) {
Expand Down Expand Up @@ -78,6 +79,16 @@ void SteamEvent::OnSteamShutdown() {
Nan::New(g_persistent_steam_events), "on", 1, argv);
}

void SteamEvent::OnGamepadTextInputDismissed(bool submitted, uint32 text) {
Nan::HandleScope scope;
v8::Local<v8::Value> argv[] = {
Nan::New("gamepad-text-input-dismissed").ToLocalChecked(),
Nan::New(submitted),
Nan::New(text) };
Nan::MakeCallback(
Nan::New(g_persistent_steam_events), "on", 3, argv);
}

v8::Local<v8::Object> GetSteamUserCountType(int type_id) {
v8::Local<v8::Object> account_type = Nan::New<v8::Object>();
std::string name;
Expand Down Expand Up @@ -703,6 +714,45 @@ NAN_METHOD(GetEncryptedAppTicket) {
info.GetReturnValue().Set(Nan::Undefined());
}

NAN_METHOD(ShowGamepadTextInput) {
Nan::HandleScope scope;
if (info.Length() < 5 || !info[0]->IsInt32() || !info[1]->IsInt32() ||
!info[2]->IsString() || !info[3]->IsInt32() || !info[4]->IsString()) {
THROW_BAD_ARGS("Bad arguments");
}
EGamepadTextInputMode input_mode = static_cast<EGamepadTextInputMode>(
info[0]->Int32Value());
EGamepadTextInputLineMode input_line_mode =
static_cast<EGamepadTextInputLineMode>(info[1]->Int32Value());
char* description =
*(static_cast<v8::String::Utf8Value>(info[2]->ToString()));
int char_max = info[3]->Int32Value();
char* existing_text =
*(static_cast<v8::String::Utf8Value>(info[4]->ToString()));
bool success = SteamUtils()->ShowGamepadTextInput(
input_mode, input_line_mode, description, char_max, existing_text);
info.GetReturnValue().Set(Nan::New(success));
}

NAN_METHOD(GetEnteredGamepadTextLength) {
Nan::HandleScope scope;
info.GetReturnValue().Set(
Nan::New(SteamUtils()->GetEnteredGamepadTextLength()));
}

NAN_METHOD(GetEnteredGamepadTextInput) {
Nan::HandleScope scope;
if (info.Length() < 1 || !info[0]->IsInt32()) {
THROW_BAD_ARGS("Bad arguments");
}
int length = SteamUtils()->GetEnteredGamepadTextLength();
char* text = new char[length+1];
text[length] = '\0';
SteamUtils()->GetEnteredGamepadTextInput(text, info[0]->Int32Value());
info.GetReturnValue().Set(Nan::New(text).ToLocalChecked());
delete text;
}

NAN_METHOD(ActivateGameOverlayToWebPage) {
Nan::HandleScope scope;
if (info.Length() < 1 || !info[0]->IsString()) {
Expand Down Expand Up @@ -847,12 +897,24 @@ NAN_MODULE_INIT(init) {
GetEncryptedAppTicket)->GetFunction());
Nan::Set(target,
Nan::New("cancelAuthTicket").ToLocalChecked(),
Nan::New<v8::FunctionTemplate>(CancelAuthTicket)->GetFunction());
Nan::New<v8::FunctionTemplate>(CancelAuthTicket)->GetFunction());
// Gamepad APIs.
Nan::Set(target,
Nan::New("showGamepadTextInput").ToLocalChecked(),
Nan::New<v8::FunctionTemplate>(ShowGamepadTextInput)->GetFunction());
Nan::Set(target,
Nan::New("getEnteredGamepadTextLength").ToLocalChecked(),
Nan::New<v8::FunctionTemplate>(GetEnteredGamepadTextLength)->GetFunction());
Nan::Set(target,
Nan::New("getEnteredGamepadTextInput").ToLocalChecked(),
Nan::New<v8::FunctionTemplate>(GetEnteredGamepadTextInput)->GetFunction());

utils::InitUgcMatchingTypes(target);
utils::InitUgcQueryTypes(target);
utils::InitUserUgcListSortOrder(target);
utils::InitUserUgcList(target);
utils::InitGamepadTextInputMode(target);
utils::InitGamepadTextInputLineMode(target);

// Utils related APIs.
InitUtilsObject(target);
Expand Down
24 changes: 24 additions & 0 deletions src/greenworks_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,30 @@ void InitUserUgcList(v8::Handle<v8::Object> exports) {
Nan::Set(exports, Nan::New("UserUGCList").ToLocalChecked(), ugc_list);
}

void InitGamepadTextInputMode(v8::Handle<v8::Object> exports) {
v8::Local<v8::Object> mode = Nan::New<v8::Object>();
mode->Set(Nan::New("Normal").ToLocalChecked(),
Nan::New(k_EGamepadTextInputModeNormal));
mode->Set(Nan::New("Password").ToLocalChecked(),
Nan::New(k_EGamepadTextInputModePassword));
Nan::Persistent<v8::Object> constructor;
constructor.Reset(mode);
Nan::Set(exports, Nan::New("GamepadTextInputMode").ToLocalChecked(), mode);
}

void InitGamepadTextInputLineMode(v8::Handle<v8::Object> exports) {
v8::Local<v8::Object> line_mode = Nan::New<v8::Object>();
line_mode->Set(Nan::New("SingleLine").ToLocalChecked(),
Nan::New(k_EGamepadTextInputLineModeSingleLine));
line_mode->Set(Nan::New("MultipleLines").ToLocalChecked(),
Nan::New(k_EGamepadTextInputLineModeMultipleLines));
Nan::Persistent<v8::Object> constructor;
constructor.Reset(line_mode);
Nan::Set(exports,
Nan::New("GamepadTextInputLineMode").ToLocalChecked(),
line_mode);
}

void InitUserUgcListSortOrder(v8::Handle<v8::Object> exports) {
v8::Local<v8::Object> ugc_list_sort_order = Nan::New<v8::Object>();
ugc_list_sort_order->Set(Nan::New("CreationOrderDesc").ToLocalChecked(),
Expand Down
4 changes: 4 additions & 0 deletions src/greenworks_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ void InitUserUgcListSortOrder(v8::Handle<v8::Object> exports);

void InitUserUgcList(v8::Handle<v8::Object> exports);

void InitGamepadTextInputMode(v8::Handle<v8::Object> exports);

void InitGamepadTextInputLineMode(v8::Handle<v8::Object> exports);

void sleep(int milliseconds);

bool ReadFile(const char* path, char* &content, int& length);
Expand Down
10 changes: 10 additions & 0 deletions src/steam_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ SteamClient::SteamClient() :
steam_servers_disconnected_(this, &SteamClient::OnSteamServersDisconnected),
steam_server_connect_failure_(this,
&SteamClient::OnSteamServerConnectFailure),
gamepad_text_input_dismissed_(this,
&SteamClient::OnGamepadTextInputDismissed),
steam_shutdown_(this, &SteamClient::OnSteamShutdown) {
}

Expand Down Expand Up @@ -85,6 +87,14 @@ void SteamClient::OnSteamServerConnectFailure(
}
}

void SteamClient::OnGamepadTextInputDismissed(
GamepadTextInputDismissed_t* callback) {
for (size_t i = 0; i < observer_list_.size(); ++i) {
observer_list_[i]->OnGamepadTextInputDismissed(
callback->m_bSubmitted, callback->m_unSubmittedText);
}
}

void SteamClient::OnSteamShutdown(SteamShutdown_t* callback) {
for (size_t i = 0; i < observer_list_.size(); ++i) {
observer_list_[i]->OnSteamShutdown();
Expand Down
3 changes: 3 additions & 0 deletions src/steam_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class SteamClient {
virtual void OnSteamServersDisconnected() = 0;
virtual void OnSteamServerConnectFailure(int status_code) = 0;
virtual void OnSteamShutdown() = 0;
virtual void OnGamepadTextInputDismissed(bool submitted, uint32 text) = 0;

virtual ~Observer() {}
};
Expand All @@ -45,6 +46,8 @@ class SteamClient {
SteamServersDisconnected_t, steam_servers_disconnected_);
STEAM_CALLBACK(SteamClient, OnSteamServerConnectFailure,
SteamServerConnectFailure_t, steam_server_connect_failure_);
STEAM_CALLBACK(SteamClient, OnGamepadTextInputDismissed,
GamepadTextInputDismissed_t, gamepad_text_input_dismissed_);
STEAM_CALLBACK(SteamClient, OnSteamShutdown, SteamShutdown_t, steam_shutdown_);
};

Expand Down