Skip to content

Feature/91/check requirements #96

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Dec 31, 2021
Merged

Feature/91/check requirements #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
badec8a
(#91) Added start checks for requirements on macOS and Linux
s1hofmann Dec 22, 2021
fff9884
(#91) Forgot to wrap the Linux startup code in a proper function
s1hofmann Dec 22, 2021
1936725
(#91) Fixed unused variable
s1hofmann Dec 22, 2021
348ed15
(#91) Fixed include
s1hofmann Dec 22, 2021
9cc21f6
(#91) Use XOpenDisplay directly for startup checks
s1hofmann Dec 31, 2021
535c3ed
(#91) Added missing parameter to XOpenDisplay
s1hofmann Dec 31, 2021
7efb57f
(#91) Adjusted test constant to new execution environment on macOS wh…
s1hofmann Dec 31, 2021
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
184 changes: 96 additions & 88 deletions src/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "screen.h"
#include "screengrab.h"
#include "window_manager.h"
#include "startup.h"

int mouseDelay = 10;
int keyboardDelay = 10;
Expand Down Expand Up @@ -256,85 +257,85 @@ struct KeyNames
};

static KeyNames key_names[] =
{
{"backspace", K_BACKSPACE},
{"delete", K_DELETE},
{"enter", K_RETURN},
{"tab", K_TAB},
{"escape", K_ESCAPE},
{"up", K_UP},
{"down", K_DOWN},
{"right", K_RIGHT},
{"left", K_LEFT},
{"home", K_HOME},
{"end", K_END},
{"pageup", K_PAGEUP},
{"pagedown", K_PAGEDOWN},
{"f1", K_F1},
{"f2", K_F2},
{"f3", K_F3},
{"f4", K_F4},
{"f5", K_F5},
{"f6", K_F6},
{"f7", K_F7},
{"f8", K_F8},
{"f9", K_F9},
{"f10", K_F10},
{"f11", K_F11},
{"f12", K_F12},
{"f13", K_F13},
{"f14", K_F14},
{"f15", K_F15},
{"f16", K_F16},
{"f17", K_F17},
{"f18", K_F18},
{"f19", K_F19},
{"f20", K_F20},
{"f21", K_F21},
{"f22", K_F22},
{"f23", K_F23},
{"f24", K_F24},
{"command", K_META},
{"alt", K_ALT},
{"control", K_CONTROL},
{"shift", K_SHIFT},
{"right_shift", K_RIGHTSHIFT},
{"space", K_SPACE},
{"printscreen", K_PRINTSCREEN},
{"insert", K_INSERT},
{"menu", K_MENU},

{"audio_mute", K_AUDIO_VOLUME_MUTE},
{"audio_vol_down", K_AUDIO_VOLUME_DOWN},
{"audio_vol_up", K_AUDIO_VOLUME_UP},
{"audio_play", K_AUDIO_PLAY},
{"audio_stop", K_AUDIO_STOP},
{"audio_pause", K_AUDIO_PAUSE},
{"audio_prev", K_AUDIO_PREV},
{"audio_next", K_AUDIO_NEXT},
{"audio_rewind", K_AUDIO_REWIND},
{"audio_forward", K_AUDIO_FORWARD},
{"audio_repeat", K_AUDIO_REPEAT},
{"audio_random", K_AUDIO_RANDOM},

{"numpad_0", K_NUMPAD_0},
{"numpad_1", K_NUMPAD_1},
{"numpad_2", K_NUMPAD_2},
{"numpad_3", K_NUMPAD_3},
{"numpad_4", K_NUMPAD_4},
{"numpad_5", K_NUMPAD_5},
{"numpad_6", K_NUMPAD_6},
{"numpad_7", K_NUMPAD_7},
{"numpad_8", K_NUMPAD_8},
{"numpad_9", K_NUMPAD_9},

{"lights_mon_up", K_LIGHTS_MON_UP},
{"lights_mon_down", K_LIGHTS_MON_DOWN},
{"lights_kbd_toggle", K_LIGHTS_KBD_TOGGLE},
{"lights_kbd_up", K_LIGHTS_KBD_UP},
{"lights_kbd_down", K_LIGHTS_KBD_DOWN},

{NULL, K_NOT_A_KEY} /* end marker */
{
{"backspace", K_BACKSPACE},
{"delete", K_DELETE},
{"enter", K_RETURN},
{"tab", K_TAB},
{"escape", K_ESCAPE},
{"up", K_UP},
{"down", K_DOWN},
{"right", K_RIGHT},
{"left", K_LEFT},
{"home", K_HOME},
{"end", K_END},
{"pageup", K_PAGEUP},
{"pagedown", K_PAGEDOWN},
{"f1", K_F1},
{"f2", K_F2},
{"f3", K_F3},
{"f4", K_F4},
{"f5", K_F5},
{"f6", K_F6},
{"f7", K_F7},
{"f8", K_F8},
{"f9", K_F9},
{"f10", K_F10},
{"f11", K_F11},
{"f12", K_F12},
{"f13", K_F13},
{"f14", K_F14},
{"f15", K_F15},
{"f16", K_F16},
{"f17", K_F17},
{"f18", K_F18},
{"f19", K_F19},
{"f20", K_F20},
{"f21", K_F21},
{"f22", K_F22},
{"f23", K_F23},
{"f24", K_F24},
{"command", K_META},
{"alt", K_ALT},
{"control", K_CONTROL},
{"shift", K_SHIFT},
{"right_shift", K_RIGHTSHIFT},
{"space", K_SPACE},
{"printscreen", K_PRINTSCREEN},
{"insert", K_INSERT},
{"menu", K_MENU},

{"audio_mute", K_AUDIO_VOLUME_MUTE},
{"audio_vol_down", K_AUDIO_VOLUME_DOWN},
{"audio_vol_up", K_AUDIO_VOLUME_UP},
{"audio_play", K_AUDIO_PLAY},
{"audio_stop", K_AUDIO_STOP},
{"audio_pause", K_AUDIO_PAUSE},
{"audio_prev", K_AUDIO_PREV},
{"audio_next", K_AUDIO_NEXT},
{"audio_rewind", K_AUDIO_REWIND},
{"audio_forward", K_AUDIO_FORWARD},
{"audio_repeat", K_AUDIO_REPEAT},
{"audio_random", K_AUDIO_RANDOM},

{"numpad_0", K_NUMPAD_0},
{"numpad_1", K_NUMPAD_1},
{"numpad_2", K_NUMPAD_2},
{"numpad_3", K_NUMPAD_3},
{"numpad_4", K_NUMPAD_4},
{"numpad_5", K_NUMPAD_5},
{"numpad_6", K_NUMPAD_6},
{"numpad_7", K_NUMPAD_7},
{"numpad_8", K_NUMPAD_8},
{"numpad_9", K_NUMPAD_9},

{"lights_mon_up", K_LIGHTS_MON_UP},
{"lights_mon_down", K_LIGHTS_MON_DOWN},
{"lights_kbd_toggle", K_LIGHTS_KBD_TOGGLE},
{"lights_kbd_up", K_LIGHTS_KBD_UP},
{"lights_kbd_down", K_LIGHTS_KBD_DOWN},

{NULL, K_NOT_A_KEY} /* end marker */
};

int CheckKeyCodes(std::string &keyName, MMKeyCode *key)
Expand Down Expand Up @@ -659,29 +660,33 @@ Napi::Number _highlight(const Napi::CallbackInfo &info)
return Napi::Number::New(env, 1);
}

Napi::Number _getActiveWindow(const Napi::CallbackInfo &info) {
Napi::Number _getActiveWindow(const Napi::CallbackInfo &info)
{
Napi::Env env = info.Env();

WindowHandle windowHandle = getActiveWindow();
return Napi::Number::New(env, (double)windowHandle);
}

Napi::Array _getWindows(const Napi::CallbackInfo &info) {
Napi::Array _getWindows(const Napi::CallbackInfo &info)
{
Napi::Env env = info.Env();

std::vector<WindowHandle> windowHandles = getWindows();
auto arr = Napi::Array::New(env, windowHandles.size());

for (size_t idx = 0; idx < windowHandles.size(); ++idx) {
for (size_t idx = 0; idx < windowHandles.size(); ++idx)
{
arr[(uint32_t)idx] = windowHandles[idx];
}

return arr;
}

Napi::Object _getWindowRect(const Napi::CallbackInfo &info) {
Napi::Object _getWindowRect(const Napi::CallbackInfo &info)
{
Napi::Env env = info.Env();

WindowHandle windowHandle = info[0].As<Napi::Number>().Int64Value();
MMRect windowRect = getWindowRect(windowHandle);

Expand All @@ -694,7 +699,8 @@ Napi::Object _getWindowRect(const Napi::CallbackInfo &info) {
return obj;
}

Napi::String _getWindowTitle(const Napi::CallbackInfo &info) {
Napi::String _getWindowTitle(const Napi::CallbackInfo &info)
{
Napi::Env env = info.Env();

WindowHandle windowHandle = info[0].As<Napi::Number>().Int64Value();
Expand Down Expand Up @@ -748,8 +754,9 @@ Napi::Object _captureScreen(const Napi::CallbackInfo &info)
}

MMBitmapRef bitmap = copyMMBitmapFromDisplayInRect(MMRectMake(x, y, w, h));

if (bitmap == NULL) {

if (bitmap == NULL)
{
throw Napi::Error::New(env, "Error: Failed to capture screen");
}

Expand All @@ -769,7 +776,8 @@ Napi::Object _captureScreen(const Napi::CallbackInfo &info)
return obj;
}

Napi::Object Init(Napi::Env env, Napi::Object exports) {
Napi::Object Init(Napi::Env env, Napi::Object exports)
{
exports.Set(Napi::String::New(env, "dragMouse"), Napi::Function::New(env, _dragMouse));
exports.Set(Napi::String::New(env, "moveMouse"), Napi::Function::New(env, _moveMouse));
exports.Set(Napi::String::New(env, "getMousePos"), Napi::Function::New(env, _getMousePos));
Expand Down
36 changes: 36 additions & 0 deletions src/startup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#include "os.h"
#include <iostream>

#if defined(IS_MACOSX)

#include <ApplicationServices/ApplicationServices.h>

static void startupCheck(void) __attribute__((constructor));
static void startupCheck(void)
{
bool isTrustedProcess = AXIsProcessTrusted();
if (!isTrustedProcess) {
std::cout << "##### WARNING! The application running this script is not a trusted process! Please visit https://github.com/nut-tree/nut.js#macos #####" << std::endl;
}
}

#elif defined(USE_X11)

#include "xdisplay.h"

static void startupCheck(void) __attribute__((constructor));
static void startupCheck(void)
{
Display *display = XOpenDisplay(NULL);

int32_t majorOpcode;
int32_t firstEvent;
int32_t firstError;
bool isXTestAvailable = XQueryExtension(display, "XTEST", &majorOpcode, &firstEvent, &firstError);

if (!isXTestAvailable) {
std::cout << "##### WARNING! Your system is missing libXtst! Please visit https://github.com/nut-tree/nut.js#linux #####" << std::endl;
}
}

#endif
2 changes: 1 addition & 1 deletion test/window-integration-tests/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ describe("getActiveWindow", () => {
it("should determine correct coordinates for our application after moving the window", async () => {
// GIVEN
const xPosition = 42;
const yPosition = 23;
const yPosition = 25;
await app.browserWindow.setPosition(xPosition, yPosition);
await sleep(1000);

Expand Down