Changes to CMake, add keyboard lock

Author: RedFantom

CMakeLists.txt

@@ -17,9 +17,6 @@ FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0
         PATH_SUFFIXES lib)
 message("CMake found libusb: " ${LIBUSB_INCLUDE_DIR} ", usb-1.0")
 find_package(X11 REQUIRED)
-find_package(PythonInterp REQUIRED)
-find_package(PythonLibs REQUIRED)
-find_package(PythonExtensions)
 
 include_directories(${LIBUSB_INCLUDE_DIR} ${X11_INCLUDE_DIRS} libmk)
 link_libraries(usb-1.0 ${X11_LIBRARIES})
@@ -53,15 +50,15 @@ target_link_libraries(ctrl mk mkc)
 add_executable(ambilight examples/ambilight/ambilight.c)
 target_link_libraries(ambilight mk pthread)
 
-project(mk_notifications)
-add_library(mk_notifications MODULE
-    examples/notifications/mk_notifications.c)
-python_extension_module(mk_notifications)
-set_target_properties(mk_notifications PROPERTIES
-    OUTPUT_NAME "mk_notifications")
-
 # masterkeys Python module
 if (SKBUILD)   # python setup.py
+    find_package(PythonInterp REQUIRED)
+    find_package(PythonLibs REQUIRED)
+    find_package(PythonExtensions)
+
+    find_package(PythonInterp REQUIRED)
+    find_package(PythonLibs REQUIRED)
+    find_package(PythonExtensions)
     project(masterkeys VERSION 0.2.0 DESCRIPTION "Wrapper around libmk")
     add_library(masterkeys MODULE
         masterkeys/masterkeys.c

examples/notifications/CMakeLists.txt

@@ -13,6 +13,7 @@ typedef struct CaptureArgs {
     unsigned char* target_color;
     pthread_mutex_t* target_lock;
     pthread_mutex_t* exit_lock;
+    pthread_mutex_t* keyboard_lock;
     bool* exit_flag;
     Display* display;
     Window root;
@@ -32,9 +33,9 @@ typedef struct Screenshot {
 
 
 CaptureArgs* init_capture(int divider, int sat_bias, int lower, int upper,
-                          bool brightness_norm,
-                          unsigned char* target_color, pthread_mutex_t* target_lock,
-                          bool* exit_flag, pthread_mutex_t* exit_lock) {
+                          bool brightness_norm, unsigned char* target_color,
+                          pthread_mutex_t* target_lock, bool* exit_flag,
+                          pthread_mutex_t* exit_lock, pthread_mutex_t* kb_lock) {
     /** Initialize a CaptureArgs struct that can be passed as thread argument */
     CaptureArgs* args = (CaptureArgs*) malloc(sizeof(CaptureArgs));
 
@@ -47,6 +48,7 @@ CaptureArgs* init_capture(int divider, int sat_bias, int lower, int upper,
     args->target_lock = target_lock;
     args->exit_flag = exit_flag;
     args->exit_lock = exit_lock;
+    args->keyboard_lock = kb_lock;
 
     args->display = XOpenDisplay(NULL);
     args->root = DefaultRootWindow(args->display);
@@ -83,10 +85,12 @@ void capturer(struct CaptureArgs* args) {
         free(screenshot->data);
         free(screenshot);
 
+        pthread_mutex_lock(args->keyboard_lock);
         pthread_mutex_lock(args->target_lock);
         for (int i=0; i<3; i++)
             args->target_color[i] = target[i];
         pthread_mutex_unlock(args->target_lock);
+        pthread_mutex_unlock(args->keyboard_lock);
     }
 }
 

examples/notifications/capture.h

@@ -23,6 +23,7 @@ unsigned char target_color[3] = {0};
 /// Mutexes
 pthread_mutex_t exit_lock = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t target_lock = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t keyboard_lock = PTHREAD_MUTEX_INITIALIZER;
 
 /// Threads
 pthread_t keyboard_thread;
@@ -92,7 +93,7 @@ static PyObject* init(PyObject* self, PyObject* args) {
     }
 
     args = init_capture(divider, sat_bias, lower, upper, brightness_norm, &target_color,
-        &target_lock, &exit_requested, &exit_lock);
+        &target_lock, &exit_requested, &exit_lock, &keyboard_lock);
 
     if (args == NULL) {
         libmk_exit();
@@ -193,3 +194,33 @@ static PyObject* py_calculate_dominant_color(PyObject* self, PyObject* args) {
         PyTuple_SetItem(tuple, i, result[i]);
     return tuple;
 }
+
+
+void _flash_keyboard(unsigned char* color) {
+    unsigned char r = color[0], g = color[1], b = color[2];
+    for (int i=0; i<256; i++) {
+        pthread_mutex_unlock(&target_lock);
+        for (int j=0; j<3; j++)
+            target_color[j] = (unsigned char) ((double) color[j] * (double) j / 255.0);
+        pthread_mutex_unlock(&target_lock);
+    }
+    for (int i=255; i>-1; i--)
+        pthread_mutex_unlock(&target_lock);
+        for (int j=0; j<3; j++)
+            target_color[j] = (unsigned char) ((double) color[j] * (double) j / 255.0);
+        pthread_mutex_unlock(&target_lock);
+        
+    }
+    
+}
+
+
+static PyObject* flash_keyboard(PyObject* self, PyObject* args) {
+    /** Asynchronously flash the keyboard from Python in a sepcific color */
+    pthread_t thread;
+    unsigned char r, g, b;
+    if (!PyArg_ParseTuple(args, "bbb", &r, &g, &b))
+        return NULL;
+    unsigned char color[3] = {r, g, b};
+    pthread_create(&thread, NULL, _flash_keyboard, color);
+}