clang-format project

Destroying the git history in favour of humouring my OCD? Yes please.

Author: slotThe

Diff for: .clang-format

@@ -0,0 +1,30 @@
+---
+BasedOnStyle: Google
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: 'true'
+AlignConsecutiveDeclarations: 'true'
+AlignOperands: 'true'
+AllowAllParametersOfDeclarationOnNextLine: 'false'
+AllowShortCaseLabelsOnASingleLine: 'false'
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: 'false'
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: 'false'
+BinPackArguments: 'true'
+BinPackParameters: 'true'
+ColumnLimit: '90'
+IndentCaseLabels: 'true'
+IndentPPDirectives: AfterHash
+IndentWidth: '2'
+MaxEmptyLinesToKeep: '1'
+PointerAlignment: Right
+SortIncludes: 'false'
+SpaceBeforeAssignmentOperators: 'true'
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: 'false'
+SpacesBeforeTrailingComments: 1
+TabWidth: '2'
+UseTab: Never
+
+...

Diff for: headers/configuration.h

@@ -1,7 +1,6 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
-
 struct configuration {
   int click1Effect;
   int click2Effect;
@@ -15,8 +14,6 @@ struct configuration {
   int hold5Effect;
 } configuration;
 
-
-
 #define NUM_TRIGGERS  11
 //triggers:
 #define TRIGGER_CLICK_1   1
@@ -30,23 +27,23 @@ struct configuration {
 #define TRIGGER_HOLD_4    9
 #define TRIGGER_HOLD_5    10
 
-//recognized words in configuration file.
-static const char* triggers[NUM_TRIGGERS] = {
-  "",                      //for alignment    0
-  "click",                 //TRIGGER_CLICK_1  1
-  "double-click",          //TRIGGER_CLICK_2  2
-  "triple-click",          //TRIGGER_CLICK_3  3
-  "quadruple-click",       //TRIGGER_CLICK_4  4
-  "quintuple-click",       //TRIGGER_CLICK_5  5
-  "press&hold",            //TRIGGER_PRESS_1  6
-  "double-press&hold",     //TRIGGER_PRESS_2  7
-  "triple-press&hold",     //TRIGGER_PRESS_3  8
-  "quadruple-press&hold",  //TRIGGER_PRESS_4  9
-  "quintuple-press&hold",  //TRIGGER_PRESS_5  10
+// Recognized words in configuration file.
+static const char *triggers[NUM_TRIGGERS] = {
+    "",                     // for alignment    0
+    "click",                // TRIGGER_CLICK_1  1
+    "double-click",         // TRIGGER_CLICK_2  2
+    "triple-click",         // TRIGGER_CLICK_3  3
+    "quadruple-click",      // TRIGGER_CLICK_4  4
+    "quintuple-click",      // TRIGGER_CLICK_5  5
+    "press&hold",           // TRIGGER_PRESS_1  6
+    "double-press&hold",    // TRIGGER_PRESS_2  7
+    "triple-press&hold",    // TRIGGER_PRESS_3  8
+    "quadruple-press&hold", // TRIGGER_PRESS_4  9
+    "quintuple-press&hold", // TRIGGER_PRESS_5  10
 };
 
+int getTriggerConfig(const char *path, struct configuration *config);
 
-int getTriggerConfig(const char *path, struct configuration* config);
-void printConfig(struct configuration* config);
+void printConfig(struct configuration *config);
 
 #endif

Diff for: headers/effects.h

@@ -7,27 +7,25 @@
 #include "effects_data.h"
 #include "orientation.h"
 
-
 //static const struct input_event tool_touch_off = {.type = EV_KEY, .code = BTN_TOUCH,       .value = 0}; //these might be used in the future to improve press and hold mode
 static const struct input_event tool_pen_on =      {.type = EV_KEY, .code = BTN_TOOL_PEN,    .value = 1}; //used when pen approaches the screen
 static const struct input_event tool_pen_off =     {.type = EV_KEY, .code = BTN_TOOL_PEN,    .value = 0};
 static const struct input_event tool_rubber_on =   {.type = EV_KEY, .code = BTN_TOOL_RUBBER, .value = 1}; // used when rubber approaches the screen
 static const struct input_event tool_rubber_off =  {.type = EV_KEY, .code = BTN_TOOL_RUBBER, .value = 0};
 
-const char* effectStringFromInt(int effect);
+const char *effectStringFromInt(int effect);
 
 void writeEvent(int fd_touch, struct input_event event);
-void handleCurrentTrackingID(struct input_event* event);
+void handleCurrentTrackingID(struct input_event *event);
 void writeTapWithTouch(int fd_touch, const int location[2]);
 void writeTapWithPen(int fd_touch, const int location[2]);
-int  writeOrientedTapSequence(int device, int fd_touch, toolbarOrientation* orientation, int RMversion, int numLocations, ...);
-
-
+int  writeOrientedTapSequence(int device, int fd_touch, toolbarOrientation *orientation,
+                              int RMversion, int numLocations, ...);
 
 void activateToolEraserRM2(int fd_pen);
 void deactivateToolEraserRM2(int fd_pen);
 void toggleToolEraserRM2(int fd_pen);
-void actionToolEraserRM2(struct input_event* ev_pen, int fd_pen);
+void actionToolEraserRM2(struct input_event *ev_pen, int fd_pen);
 
 void activateToolEraserSelect(int fd_touch);
 void deactivateToolEraserSelect(int fd_touch);

Diff for: headers/effects_data.h

@@ -8,7 +8,6 @@
 #define NOTEBOOK        0
 #define PDF             1
 
-
 #define NUM_EFFECTS     11
 //[EFFECT]:
 #define NULL_EFFECT       0 //null effect
@@ -37,7 +36,7 @@
 #define SELECT_TOGGLE        (SELECT           + TOGGLE_OFFSET)
 
 //recognized words in config file
-static const char* effects[NUM_EFFECTS] = {
+static const char* effects[NUM()_EFFECTS] = {
   "null-effect",        //null effect        0
   "toolbar",            //TOOLBAR            1
   "writing",            //WRITING            2
@@ -104,5 +103,4 @@ static const int locationLookupWacom[NUM_EFFECTS][4][2] = {
     { { 12220,  W_RM2_RHY}, { W_RM2_RHX,  8880}, { 12300,  W_RM2_LHY}, { W_RM2_LHX,  8780} }, //REDO           7
 };
 
-
 #endif //EFFECTS_DATA_H

Diff for: headers/orientation.h

@@ -2,24 +2,27 @@
 #define ORIENTATION_H
 
 #define BUFSIZE 48
-#define RHP     0 // Right Hand, Portrait
-#define RHL     1 // Right Hand, Landscape
-#define LHP     2 // Left Hand,  Portrait
-#define LHL     3 // Left Hand,  Landscape
-
+#define RHP 0 // Right Hand, Portrait
+#define RHL 1 // Right Hand, Landscape
+#define LHP 2 // Left Hand,  Portrait
+#define LHL 3 // Left Hand,  Landscape
 
 typedef struct {
   int openNotebook;
   int orientation;
   int docType;
 } toolbarOrientation;
 
-int getOpenFileUUID(char* UUID);
+int getOpenFileUUID(char *UUID);
+
 int checkConf(const char *path, const char *param, const char *paramTrue);
-int getConf(const char *path, const char *param, char* returnString, int bufferSize);
+
+int getConf(const char *path, const char *param, char *returnString, int bufferSize);
+
 toolbarOrientation getToolbarOrientation();
+
 int getRmVersion();
-int getSoftwareVersion();
 
+int getSoftwareVersion();
 
-#endif //ORIENTATION_H
+#endif // ORIENTATION_H

Diff for: headers/triggers.h

@@ -1,44 +1,46 @@
 #ifndef TRIGGERS_H
 #define TRIGGERS_H
 
-#include <stdbool.h>
 #include <linux/input.h>
+#include <stdbool.h>
 
-
-//triggers:
-//Click        || Press&Hold
-//Double Click || DoublePress&Hold
-//Triple Click || TripleClick&Hold
-//Bit 7 encodes trigger on or off
-//Bit 6 encodes Click or Press and hold
-//Bits 4-5 unused
-//Bits 0-3 encodes the number as an int ie. (click=1, double click=2, press and hold=1, double press and hold=2)
-#define NULL_TRIGGER              0x00
-
-#define CLICK_1                   0x81
-#define CLICK_2                   0x82
-#define CLICK_3                   0x83
-#define CLICK_4                   0x84
-#define CLICK_5                   0x85
-
-#define HOLD_1_ON                 0xc1
-#define HOLD_2_ON                 0xc2
-#define HOLD_3_ON                 0xc3
-#define HOLD_4_ON                 0xc4
-#define HOLD_5_ON                 0xc5
-
-#define HOLD_1_OFF                0x41
-#define HOLD_2_OFF                0x42
-#define HOLD_3_OFF                0x43
-#define HOLD_4_OFF                0x44
-#define HOLD_5_OFF                0x45
+// Triggers:
+//
+//   Click        || Press&Hold
+//   Double Click || DoublePress&Hold
+//   Triple Click || TripleClick&Hold
+//   Bit 7 encodes trigger on or off
+//   Bit 6 encodes Click or Press and hold
+//   Bits 4-5 unused
+//   Bits 0-3 encodes the number as an int; i.e.,
+//     (click=1, double click=2, press and hold=1, double press and hold=2)
+
+#define NULL_TRIGGER 0x00
+
+#define CLICK_1      0x81
+#define CLICK_2      0x82
+#define CLICK_3      0x83
+#define CLICK_4      0x84
+#define CLICK_5      0x85
+
+#define HOLD_1_ON    0xc1
+#define HOLD_2_ON    0xc2
+#define HOLD_3_ON    0xc3
+#define HOLD_4_ON    0xc4
+#define HOLD_5_ON    0xc5
+
+#define HOLD_1_OFF   0x41
+#define HOLD_2_OFF   0x42
+#define HOLD_3_OFF   0x43
+#define HOLD_4_OFF   0x44
+#define HOLD_5_OFF   0x45
 
 
 #define MAX_CLICK_TIME         0.2  //seconds
 #define MAX_DOUBLE_CLICK_TIME  0.4  //seconds
 
+int getTrigger(struct input_event *ev_pen);
 
-int getTrigger(struct input_event* ev_pen);
 void printTriggers(int trigger, bool includeNull);
 
 #endif // TRIGGERS_H