(#20) Split screen.c

Author: s1hofmann

src/screen.c src/linux/screen.c

@@ -1,30 +1,17 @@
-#include "screen.h"
-#include "os.h"
-#include "highlightwindow.h"
+#include "../screen.h"
+#include "../os.h"
+#include "../highlightwindow.h"
 
-#if defined(IS_MACOSX)
-	#include <ApplicationServices/ApplicationServices.h>
-#elif defined(USE_X11)
-	#include <X11/Xlib.h>
-	#include "xdisplay.h"
-#endif
+#include <X11/Xlib.h>
+#include "../xdisplay.h"
 
 MMSize getMainDisplaySize(void)
 {
-#if defined(IS_MACOSX)
-	CGDirectDisplayID displayID = CGMainDisplayID();
-	return MMSizeMake(CGDisplayPixelsWide(displayID),
-	                  CGDisplayPixelsHigh(displayID));
-#elif defined(USE_X11)
 	Display *display = XGetMainDisplay();
 	const int screen = DefaultScreen(display);
 
 	return MMSizeMake((size_t)DisplayWidth(display, screen),
 	                  (size_t)DisplayHeight(display, screen));
-#elif defined(IS_WINDOWS)
-	return MMSizeMake((size_t)GetSystemMetrics(SM_CXSCREEN),
-	                  (size_t)GetSystemMetrics(SM_CYSCREEN));
-#endif
 }
 
 bool pointVisibleOnMainDisplay(MMPoint point)

src/macos/screen.c

@@ -0,0 +1,22 @@
+#include "../screen.h"
+#include "../os.h"
+#include "../highlightwindow.h"
+
+#include <ApplicationServices/ApplicationServices.h>
+
+MMSize getMainDisplaySize(void)
+{
+	CGDirectDisplayID displayID = CGMainDisplayID();
+	return MMSizeMake(CGDisplayPixelsWide(displayID),
+	                  CGDisplayPixelsHigh(displayID));
+}
+
+bool pointVisibleOnMainDisplay(MMPoint point)
+{
+	MMSize displaySize = getMainDisplaySize();
+	return point.x < displaySize.width && point.y < displaySize.height;
+}
+
+void highlight(int32_t x, int32_t y, int32_t width, int32_t height, long duration, float opacity) {
+	showHighlightWindow(x, y, width, height, duration, opacity);
+}

src/win32/screen.c

@@ -0,0 +1,19 @@
+#include "../screen.h"
+#include "../os.h"
+#include "../highlightwindow.h"
+
+MMSize getMainDisplaySize(void)
+{
+	return MMSizeMake((size_t)GetSystemMetrics(SM_CXSCREEN),
+	                  (size_t)GetSystemMetrics(SM_CYSCREEN));
+}
+
+bool pointVisibleOnMainDisplay(MMPoint point)
+{
+	MMSize displaySize = getMainDisplaySize();
+	return point.x < displaySize.width && point.y < displaySize.height;
+}
+
+void highlight(int32_t x, int32_t y, int32_t width, int32_t height, long duration, float opacity) {
+	showHighlightWindow(x, y, width, height, duration, opacity);
+}