Maybe Add Support For The Corsair Harpoon

README.md

@@ -188,13 +188,18 @@ If you're using **Unity** and the tray icon doesn't appear correctly, run `sudo
 
 #### OS X
 
-- **“ckb.pkg” can’t be opened because it is from an unidentified developer.**
-- Open `System Preferences > Security & Privacy > General` and click `Open Anyway`.
-- **Modifier keys (Shift, Ctrl, etc.) are not rebound correctly.**
-- ckb does not recognize modifier keys rebound from System Preferences. You can rebind them again within the application.
-- **`~` key prints `§±`**
-- Check your keyboard layout on ckb's Settings screen. Choose the layout that matches your physical keyboard.
-- **Compile problems** can usually be resolved by rebooting your computer and/or reinstalling Qt. Make sure that Xcode works on its own. If a compile fails, delete the `ckb-master` directory as well as any automatically generated `build-ckb` folders and try again from a new download.
+- **“ckb.pkg” can’t be opened because it is from an unidentified developer**    
+    Open `System Preferences > Security & Privacy > General` and click `Open Anyway`.
+- **Modifier keys (Shift, Ctrl, etc.) are not rebound correctly**    
+    ckb does not recognize modifier keys rebound from System Preferences. You can rebind them again within the application.
+- **`~` key prints `§±`**    
+    Check your keyboard layout on ckb's Settings screen. Choose the layout that matches your physical keyboard.
+- **Compile problems**    
+    Can usually be resolved by rebooting your computer and/or reinstalling Qt. Make sure that Xcode works on its own. If a compile fails, delete the `ckb-master` directory as well as any automatically generated `build-ckb` folders and try again from a new download.
+- **Scroll wheel does not scroll**    
+    As of #c3474d2 it's now possible to **disable scroll acceleration** from the GUI. You can access it under "OSX tweaks" in the "More settings" screen. Once disabled, the scroll wheel should behave consistently.
+
+
 
 #### General
 

VERSION

@@ -1 +1 @@
-beta-v0.2.6
+beta-v0.2.6+t04

qmake-auto

@@ -11,7 +11,7 @@ if [[ "$QMAKE" != "" ]]; then
 fi
 if [[ "$OSTYPE" == "darwin"* ]]; then
     # OSX: Look for qmake in standard install locations
-    QMAKE=`find ~/Qt/*/clang_64/bin ~/Qt5*/*/clang_64/bin ~/Applications/Qt/*/clang_64/bin ~/Applications/Qt5*/*/clang_64/bin /Applications/Qt/*/clang_64/bin /Applications/Qt5*/*/clang_64/bin -name qmake -print -quit 2>/dev/null`
+    QMAKE=`find /usr/local/opt/qt5/bin ~/Qt/*/clang_64/bin ~/Qt5*/*/clang_64/bin ~/Applications/Qt/*/clang_64/bin ~/Applications/Qt5*/*/clang_64/bin /Applications/Qt/*/clang_64/bin /Applications/Qt5*/*/clang_64/bin -name qmake -print -quit 2>/dev/null`
     [[ $QMAKE == "" ]] && die
 else
     # Linux: Look for system-installed Qt5

src/ckb-daemon/command.c

@@ -8,6 +8,7 @@
 
 static const char* const cmd_strings[CMD_COUNT - 1] = {
     // NONE is implicit
+    "delay",
     "mode",
     "switch",
     "layout",
@@ -111,7 +112,7 @@ int readcmd(usbdevice* kb, const char* line){
 
         // Reject unrecognized commands. Reject bind or notify related commands if the keyboard doesn't have the feature enabled.
         if(command == NONE
-                || ((!HAS_FEATURES(kb, FEAT_BIND) && (command == BIND || command == UNBIND || command == REBIND || command == MACRO))
+                || ((!HAS_FEATURES(kb, FEAT_BIND) && (command == BIND || command == UNBIND || command == REBIND || command == MACRO || command == DELAY))
                            || (!HAS_FEATURES(kb, FEAT_NOTIFY) && command == NOTIFY))){
             next_loop:
             continue;
@@ -197,6 +198,9 @@ int readcmd(usbdevice* kb, const char* line){
             }
             continue;
         }
+        case DELAY:
+            kb->delay = (!strcmp (word, "on")); // independendant from parameter to handle false commands like "delay off"
+            continue;
         default:;
         }
 

src/ckb-daemon/command.h

@@ -6,8 +6,9 @@
 // Command operations
 typedef enum {
     // Special - handled by readcmd, no device functions
-    NONE        = -10,
-    MODE        = -9,   CMD_FIRST = MODE,
+    NONE        = -11,
+    DELAY       = -10,   CMD_FIRST = DELAY,
+    MODE        = -9,
     SWITCH      = -8,
     LAYOUT      = -7,
     ACCEL       = -6,

src/ckb-daemon/device_vtable.c

@@ -95,6 +95,7 @@ const devcmd vtable_keyboard_nonrgb = {
     .bind = cmd_bind,
     .unbind = cmd_unbind,
     .rebind = cmd_rebind,
+    .macro = cmd_macro,
 
     .dpi = cmd_macro_none,
     .dpisel = cmd_none,
@@ -140,6 +141,7 @@ const devcmd vtable_mouse = {
     .bind = cmd_bind,
     .unbind = cmd_unbind,
     .rebind = cmd_rebind,
+    .macro = cmd_macro,
 
     .dpi = cmd_dpi,
     .dpisel = cmd_dpisel,

src/ckb-daemon/input.c

@@ -5,7 +5,8 @@
 int macromask(const uchar* key1, const uchar* key2){
     // Scan a macro against key input. Return 0 if any of them don't match
     for(int i = 0; i < N_KEYBYTES_INPUT; i++){
-        if((key1[i] & key2[i]) != key2[i])
+        // if((key1[i] & key2[i]) != key2[i])
+        if(key1[i] != key2[i])  // Changed to detect G-keys + modifiers
             return 0;
     }
     return 1;
@@ -32,8 +33,13 @@ static void inputupdate_keys(usbdevice* kb){
                         macroaction* action = macro->actions + a;
                         if(action->rel_x != 0 || action->rel_y != 0)
                             os_mousemove(kb, action->rel_x, action->rel_y);
-                        else
+                        else {
                             os_keypress(kb, action->scan, action->down);
+                            if (kb->delay) {
+                                if (a > 200) usleep (100);
+                                else if (a > 20) usleep(30);
+                            }
+                        }
                     }
                 }
             } else {
@@ -130,7 +136,6 @@ void inputupdate(usbdevice* kb){
         input->rel_x = input->rel_y = 0;
     }
     // Finish up
-    os_isync(kb);
     memcpy(input->prevkeys, input->keys, N_KEYBYTES_INPUT);
 }
 

src/ckb-daemon/input.h

@@ -43,8 +43,6 @@ void cmd_macro(usbdevice* kb, usbmode* mode, const int notifynumber, const char*
 void os_keypress(usbdevice* kb, int scancode, int down);
 // Generate mouse movement
 void os_mousemove(usbdevice* kb, int x, int y);
-// Synchronize input (called after sending key presses)
-void os_isync(usbdevice* kb);
 
 // Perform OS-specific setup for indicator lights. Called when the device is created. Return 0 on success.
 int os_setupindicators(usbdevice* kb);

src/ckb-daemon/input_linux.c

@@ -97,6 +97,18 @@ void os_inputclose(usbdevice* kb){
     kb->uinput_mouse = 0;
 }
 
+// Generate SYN reports to synchronize device
+static void isync(usbdevice* kb){
+    struct input_event event;
+    memset(&event, 0, sizeof(event));
+    event.type = EV_SYN;
+    event.code = SYN_REPORT;
+    if(write(kb->uinput_kb - 1, &event, sizeof(event)) <= 0)
+        ckb_warn("uinput write failed: %s\n", strerror(errno));
+    if(write(kb->uinput_mouse - 1, &event, sizeof(event)) <= 0)
+        ckb_warn("uinput write failed: %s\n", strerror(errno));
+}
+
 void os_keypress(usbdevice* kb, int scancode, int down){
     struct input_event event;
     memset(&event, 0, sizeof(event));
@@ -118,6 +130,8 @@ void os_keypress(usbdevice* kb, int scancode, int down){
     }
     if(write((is_mouse ? kb->uinput_mouse : kb->uinput_kb) - 1, &event, sizeof(event)) <= 0)
         ckb_warn("uinput write failed: %s\n", strerror(errno));
+    else
+        isync(kb);
 }
 
 void os_mousemove(usbdevice* kb, int x, int y){
@@ -129,26 +143,19 @@ void os_mousemove(usbdevice* kb, int x, int y){
         event.value = x;
         if(write(kb->uinput_mouse - 1, &event, sizeof(event)) <= 0)
             ckb_warn("uinput write failed: %s\n", strerror(errno));
+        else
+            isync(kb);
     }
     if(y != 0){
         event.code = REL_Y;
         event.value = y;
         if(write(kb->uinput_mouse - 1, &event, sizeof(event)) <= 0)
             ckb_warn("uinput write failed: %s\n", strerror(errno));
+        else
+            isync(kb);
     }
 }
 
-void os_isync(usbdevice* kb){
-    struct input_event event;
-    memset(&event, 0, sizeof(event));
-    event.type = EV_SYN;
-    event.code = SYN_REPORT;
-    if(write(kb->uinput_kb - 1, &event, sizeof(event)) <= 0)
-        ckb_warn("uinput write failed: %s\n", strerror(errno));
-    if(write(kb->uinput_mouse - 1, &event, sizeof(event)) <= 0)
-        ckb_warn("uinput write failed: %s\n", strerror(errno));
-}
-
 void* _ledthread(void* ctx){
     usbdevice* kb = ctx;
     uchar ileds = 0;

src/ckb-daemon/input_mac.c

@@ -402,10 +402,6 @@ void os_mousemove(usbdevice* kb, int x, int y){
     postevent_mm(kb->event, x, y, HAS_FEATURES(kb, FEAT_MOUSEACCEL), kb->mousestate);
 }
 
-void os_isync(usbdevice* kb){
-    // OSX doesn't have any equivalent to the SYN_ events
-}
-
 int os_setupindicators(usbdevice* kb){
     // Set NumLock on permanently
     kb->hw_ileds = kb->hw_ileds_old = kb->ileds = 1;

src/ckb-daemon/structures.h

@@ -246,6 +246,8 @@ typedef struct {
     uchar hw_ileds, hw_ileds_old, ileds;
     // Color dithering in use
     char dither;
+    // Flag to check, if large macros should be sent delayed
+    char delay;
 } usbdevice;
 
 #endif  // STRUCTURES_H

src/ckb-ripple/main.c

@@ -1,5 +1,6 @@
 #include "../ckb/ckb-anim.h"
 #include <math.h>
+#include <time.h>
 
 void ckb_info(){
     // Plugin info
@@ -14,6 +15,7 @@ void ckb_info(){
     CKB_PARAM_AGRADIENT("color", "Ripple color:", "", "ffffffff");
     CKB_PARAM_DOUBLE("length", "Ring length:", "%", 100, 1, 100);
     CKB_PARAM_BOOL("symmetric", "Symmetric", 0);
+    CKB_PARAM_BOOL("randomize", "Randomly select from gradient", 0);
 
     // Timing/input parameters
     CKB_KPMODE(CKB_KP_POSITION);
@@ -44,11 +46,12 @@ void ckb_info(){
 
 float kbsize = 0.f;
 ckb_gradient animcolor = { 0 };
-int symmetric = 0, kprelease = 0;
+int symmetric = 0, kprelease = 0, randomize = 0;
 double animlength = 0.;
 
 void ckb_init(ckb_runctx* context){
     kbsize = sqrt(context->width * context->width / 4.f + context->height * context->height / 4.f);
+    srand((unsigned)time(NULL));
 }
 
 void ckb_parameter(ckb_runctx* context, const char* name, const char* value){
@@ -61,6 +64,7 @@ void ckb_parameter(ckb_runctx* context, const char* name, const char* value){
     }
     CKB_PARSE_BOOL("symmetric", &symmetric){}
     CKB_PARSE_BOOL("kprelease", &kprelease){}
+    CKB_PARSE_BOOL("randomize", &randomize){}
 }
 
 #define ANIM_MAX (144 * 2)
@@ -69,6 +73,7 @@ struct {
     float x, y;
     float maxsize;
     float cursize;
+    float choice;
 } anim[ANIM_MAX] = { };
 
 void anim_add(float x, float y, float width, float height){
@@ -82,6 +87,7 @@ void anim_add(float x, float y, float width, float height){
         float sizey = fmax(y, height - y);
         anim[i].maxsize = sqrt(sizex * sizex + sizey * sizey) + animlength;
         anim[i].cursize = (symmetric) ? -animlength : 0;
+        anim[i].choice = (float)rand()/(float)(RAND_MAX);
         return;
     }
 }
@@ -140,10 +146,12 @@ int ckb_frame(ckb_runctx* context){
                 if(distance > 1.f && distance <= 1.005f)
                     // Round values close to 1
                     distance = 1.f;
+
                 // Blend color gradient according to position
                 if(distance >= 0. && distance <= 1.f){
                     float a, r, g, b;
-                    ckb_grad_color(&a, &r, &g, &b, &animcolor, distance * 100.);
+                    float gradChoice = randomize ? anim[i].choice : distance;
+                    ckb_grad_color(&a, &r, &g, &b, &animcolor, gradChoice * 100.);
                     ckb_alpha_blend(key, a, r, g, b);
                 }
             }

src/ckb/ckb.pro

@@ -100,7 +100,8 @@ SOURCES += main.cpp\
     layoutdialog.cpp \
     extrasettingswidget.cpp \
     kbmanager.cpp \
-    colormap.cpp
+    colormap.cpp \
+    macroreader.cpp
 
 HEADERS  += mainwindow.h \
     kbwidget.h \
@@ -157,7 +158,8 @@ HEADERS  += mainwindow.h \
     layoutdialog.h \
     extrasettingswidget.h \
     kbmanager.h \
-    colormap.h
+    colormap.h \
+    macroreader.h
 
 FORMS    += mainwindow.ui \
     kbwidget.ui \

src/ckb/extrasettingswidget.cpp

@@ -63,6 +63,11 @@ ExtraSettingsWidget::ExtraSettingsWidget(QWidget *parent) :
     // Update animation info
     ui->animPathLabel->setText(AnimScript::path());
     on_animScanButton_clicked();
+
+    /// Read Macro Delay setting, update UI and Kb-internal flag
+    bool macroDelay = settings.value("MacroDelay").toBool();
+    Kb::macroDelay(macroDelay);
+    ui->delayBox->setChecked(macroDelay);
 }
 
 ExtraSettingsWidget::~ExtraSettingsWidget(){
@@ -134,3 +139,8 @@ void ExtraSettingsWidget::on_sSpeedBox_valueChanged(int arg1){
     CkbSettings::set("Program/ScrollSpeed", arg1);
     Kb::scrollSpeed(ui->sAccelBox->isChecked() ? arg1 : 0);
 }
+
+void ExtraSettingsWidget::on_delayBox_clicked(bool checked) {
+    CkbSettings::set("Program/MacroDelay", checked);
+    Kb::macroDelay(checked);
+}

src/ckb/extrasettingswidget.h

@@ -27,6 +27,7 @@ private slots:
     void on_mAccelBox_clicked(bool checked);
     void on_sAccelBox_clicked(bool checked);
     void on_sSpeedBox_valueChanged(int arg1);
+    void on_delayBox_clicked(bool checked);
 
 private:
     Ui::ExtraSettingsWidget *ui;

src/ckb/extrasettingswidget.ui

@@ -406,6 +406,16 @@
      </property>
     </widget>
    </item>
+   <item row="14" column="1" colspan="6">
+    <widget class="QCheckBox" name="delayBox">
+     <property name="toolTip">
+      <string>When using macros with strings longer than 25 chars, some OS may lose characters (e.g. Mint 17.2). Select to prevent that bug.</string>
+     </property>
+     <property name="text">
+      <string>Use delay for very long macros</string>
+     </property>
+    </widget>
+   </item>
    <item row="15" column="0" colspan="7">
     <widget class="QLabel" name="osxLabel">
      <property name="font">