Merge pull request #21 from nut-tree/feature/19/os_folders

Feature/19/os_folders

Author: s1hofmann

CMakeLists.txt

@@ -6,11 +6,11 @@ project(libnut)
 # Source
 set(SOURCE_FILES "src/main.cc" "src/deadbeef_rand.c" "src/keycode.c" "src/keypress.c" "src/MMBitmap.c" "src/mouse.c" "src/screen.c" "src/screengrab.c")
 if (UNIX AND NOT APPLE)
-    set(SOURCE_FILES "${SOURCE_FILES}" "src/xdisplay.c" "src/highlightwindow_linux.c")
+    set(SOURCE_FILES "${SOURCE_FILES}" "src/linux/xdisplay.c" "src/linux/highlightwindow.c")
 elseif (UNIX AND APPLE)
-    set(SOURCE_FILES "${SOURCE_FILES}" "src/highlightwindow_macos.m")
+    set(SOURCE_FILES "${SOURCE_FILES}" "src/macos/highlightwindow.m")
 elseif (WIN32)
-    set(SOURCE_FILES "${SOURCE_FILES}" "src/highlightwindow_win32.c")
+    set(SOURCE_FILES "${SOURCE_FILES}" "src/win32/highlightwindow.c")
 endif()
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC})
 

src/highlightwindow_linux.c renamed to src/linux/highlightwindow.c

@@ -1,7 +1,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <unistd.h>
-#include "highlightwindow.h"
+#include "../highlightwindow.h"
 
 void showHighlightWindow(int32_t x, int32_t y, int32_t width, int32_t height, long duration, float opacity) {
     Display *d = XOpenDisplay(NULL);
@@ -23,7 +23,7 @@ void showHighlightWindow(int32_t x, int32_t y, int32_t width, int32_t height, lo
     Window overlay = XCreateWindow(
         d, root,
         x, y, width, height, 0,
-        vinfo.depth, InputOutput, 
+        vinfo.depth, InputOutput,
         vinfo.visual,
         CWOverrideRedirect | CWColormap | CWBackPixel | CWBorderPixel, &attrs
     );

src/xdisplay.c renamed to src/linux/xdisplay.c

@@ -1,4 +1,4 @@
-#include "xdisplay.h"
+#include "../xdisplay.h"
 #include <stdio.h> /* For fputs() */
 #include <stdlib.h> /* For atexit() */
 #include <string.h> /* For strdup() */

src/highlightwindow_macos.m renamed to src/macos/highlightwindow.m

@@ -1,4 +1,4 @@
-#include "highlightwindow.h"
+#include "../highlightwindow.h"
 #import <Cocoa/Cocoa.h>
 
 void showHighlightWindow(int32_t x, int32_t y, int32_t width, int32_t height, long duration, float opacity) {
@@ -24,4 +24,4 @@ void showHighlightWindow(int32_t x, int32_t y, int32_t width, int32_t height, lo
             }];
     [NSApp run];
     [pool release];
-}
+}

src/highlightwindow_win32.c renamed to src/win32/highlightwindow.c

@@ -1,9 +1,9 @@
 #ifndef UNICODE
 #define UNICODE
-#endif 
+#endif
 
 #include <windows.h>
-#include "highlightwindow.h"
+#include "../highlightwindow.h"
 
 #define ID_CLOSE_TIMER 1001
 
@@ -20,7 +20,7 @@ void showHighlightWindow(int32_t x, int32_t y, int32_t width, int32_t height, lo
     wc.lpszClassName = CLASS_NAME;
     wc.hbrBackground = CreateSolidBrush(RGB(255, 0, 0));
 
-    RegisterClass(&wc); 
+    RegisterClass(&wc);
 
     HWND hwnd = CreateWindowEx(
         WS_EX_LAYERED|WS_EX_TOPMOST|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW,