From 5c87cb14952fc92d7b274117f5cb67b9ecef66f3 Mon Sep 17 00:00:00 2001
From: Maxime Cauvin <maxime.cauvin@epitech.eu>
Date: Fri, 16 Mar 2018 16:03:15 +0100
Subject: [PATCH 01/11] TabletButtonHandling(feat): New editing button control
 window implemented

---
 TabletDriverGUI/ButtonMapping.xaml     |  40 +++++++++
 TabletDriverGUI/ButtonMapping.xaml.cs  | 119 +++++++++++++++++++++++++
 TabletDriverGUI/Configuration.cs       |   6 +-
 TabletDriverGUI/MainWindow.xaml        |  25 +-----
 TabletDriverGUI/MainWindow.xaml.cs     |  75 +++++-----------
 TabletDriverGUI/TabletDriverGUI.csproj |   7 ++
 TabletDriverGUI/WacomArea.xaml         |   2 +-
 7 files changed, 197 insertions(+), 77 deletions(-)
 create mode 100644 TabletDriverGUI/ButtonMapping.xaml
 create mode 100644 TabletDriverGUI/ButtonMapping.xaml.cs

diff --git a/TabletDriverGUI/ButtonMapping.xaml b/TabletDriverGUI/ButtonMapping.xaml
new file mode 100644
index 0000000..afac361
--- /dev/null
+++ b/TabletDriverGUI/ButtonMapping.xaml
@@ -0,0 +1,40 @@
+<Window x:Class="TabletDriverGUI.ButtonMapping"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:TabletDriverGUI"
+        mc:Ignorable="d"
+        Title="ButtonMapping" Height="380" Width="350" ResizeMode="NoResize">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="20*"/>
+            <RowDefinition Height="65*"/>
+            <RowDefinition Height="15*"/>
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0" Orientation="Vertical" Margin="12">
+            <CheckBox Name="CheckBoxDisablePenButtons" Content="Disable pen buttons"
+                      Checked="CheckBoxDisablePenButtons_Checked" Unchecked="CheckBoxDisablePenButtons_Unchecked"/>
+            <CheckBox Name="CheckBoxDisableTabletButtons" Margin="0,7,0,0" 
+                      Content="Disable tablet buttons" Checked="CheckBoxDisableTabletButtons_Checked" Unchecked="CheckBoxDisableTabletButtons_Unchecked"/>
+        </StackPanel>
+        <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <StackPanel Name="PenButtonsContainer" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <GroupBox Header="Pen tip" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90">
+                    <ComboBox Name="PenTipComboBox" />
+                </GroupBox>
+                <GroupBox Header="Pen bottom" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90">
+                    <ComboBox Name="PenBottomComboBox" />
+                </GroupBox>
+                <GroupBox Header="Pen top" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90">
+                    <ComboBox Name="PenTopComboBox" />
+                </GroupBox>
+            </StackPanel>
+            <StackPanel Name="TabletButtonsContainer" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </StackPanel>
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center">
+            <Button Name="ButtonSet" Content="Set" Width="60" Height="30" Click="ButtonSet_Click"/>
+            <Button Name="ButtonCancel" Margin="35,0,0,0" Width="60" Height="30" Content="Cancel" Click="ButtonCancel_Click" />
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/TabletDriverGUI/ButtonMapping.xaml.cs b/TabletDriverGUI/ButtonMapping.xaml.cs
new file mode 100644
index 0000000..0c898d0
--- /dev/null
+++ b/TabletDriverGUI/ButtonMapping.xaml.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace TabletDriverGUI
+{
+    /// <summary>
+    /// Logique d'interaction pour ButtonMapping.xaml
+    /// </summary>
+    public partial class ButtonMapping : Window
+    {
+        public ButtonMapping(Configuration config, uint nbTabletButtons)
+        {
+            InitializeComponent();
+
+            for (var i = 0; i < nbTabletButtons; ++i)
+            {
+                ComboBox cb = new ComboBox
+                {
+                    Name = "TabletButton" + (i + 1).ToString()
+                };
+
+                GroupBox gb = new GroupBox
+                {
+                    Header = "Tablet button " + (i + 1).ToString(),
+                    Width = 110,
+                    Margin = new Thickness(10, 0, 0, 0),
+                    Content = cb
+                };
+                TabletButtonsContainer.Children.Add(gb);
+            }
+
+            // Create button map combobox items
+            var tabletButtons = TabletButtonsContainer.Children;
+
+            PenTipComboBox.Items.Add("Disabled");
+            PenBottomComboBox.Items.Add("Disabled");
+            PenTopComboBox.Items.Add("Disabled");
+            for (var j = 0; j < tabletButtons.Count; ++j)
+            {
+                var gb = tabletButtons[j] as GroupBox;
+                var cb = gb.Content as ComboBox;
+                cb.Items.Add("Disabled");
+                cb.SelectedIndex = 0;
+            }
+            for (int i = 1; i <= 5; ++i)
+            {
+                PenTipComboBox.Items.Add("Mouse " + i);
+                PenBottomComboBox.Items.Add("Mouse " + i);
+                PenTopComboBox.Items.Add("Mouse " + i);
+                for (var j = 0; j < tabletButtons.Count; ++j)
+                {
+                    var gb = tabletButtons[j] as GroupBox;
+                    var cb = gb.Content as ComboBox;
+                    cb.Items.Add("Mouse " + i);
+                }
+            }
+            PenTipComboBox.SelectedIndex = 0;
+            PenBottomComboBox.SelectedIndex = 0;
+            PenTopComboBox.SelectedIndex = 0;
+
+
+            //
+            // Buttons
+            //
+            if (config.ButtonMap.Count() == 3)
+            {
+                PenTipComboBox.SelectedIndex = config.ButtonMap[0];
+                PenBottomComboBox.SelectedIndex = config.ButtonMap[1];
+                PenTopComboBox.SelectedIndex = config.ButtonMap[2];
+            }
+            else
+                config.ButtonMap = new int[] { 1, 2, 3 };
+
+            CheckBoxDisablePenButtons.IsChecked = config.DisablePenButtons;
+            CheckBoxDisableTabletButtons.IsChecked = config.DisableTabletButtons;
+        }
+
+        private void ButtonSet_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = true;
+        }
+
+        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+        }
+
+        private void CheckBoxDisablePenButtons_Checked(object sender, RoutedEventArgs e)
+        {
+            PenButtonsContainer.IsEnabled = false;
+        }
+
+        private void CheckBoxDisablePenButtons_Unchecked(object sender, RoutedEventArgs e)
+        {
+            PenButtonsContainer.IsEnabled = true;
+        }
+
+        private void CheckBoxDisableTabletButtons_Checked(object sender, RoutedEventArgs e)
+        {
+            TabletButtonsContainer.IsEnabled = false;
+        }
+
+        private void CheckBoxDisableTabletButtons_Unchecked(object sender, RoutedEventArgs e)
+        {
+            TabletButtonsContainer.IsEnabled = true;
+        }
+    }
+}
diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index 086d097..3767447 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -35,7 +35,8 @@ public enum OutputModes
         [XmlArray("ButtonMap")]
         [XmlArrayItem("Button")]
         public int[] ButtonMap;
-        public bool DisableButtons;
+        public bool DisablePenButtons;
+        public bool DisableTabletButtons;
 
         [XmlArray("CommandsAfter")]
         [XmlArrayItem("Command")]
@@ -73,7 +74,8 @@ public Configuration()
             AutomaticDesktopSize = true;
 
             ButtonMap = new int[] { 1, 2, 3 };
-            DisableButtons = false;
+            DisablePenButtons = false;
+            DisableTabletButtons = false;
 
             FilterEnabled = false;
             FilterValue = 0;
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 045607f..0a882b1 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -238,28 +238,9 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
 
               <!-- Button mapping -->
-              <GroupBox Header="Button mapping" VerticalAlignment="Top" HorizontalAlignment="Left" Height="73">
-                <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
-
-                  <GroupBox Header="Tip" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90">
-                    <ComboBox Name="comboBoxButton1" SelectionChanged="ItemSelectionChanged">
-                    </ComboBox>
-                  </GroupBox>
-
-                  <GroupBox Header="Bottom" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90">
-                    <ComboBox Name="comboBoxButton2" SelectionChanged="ItemSelectionChanged">
-                    </ComboBox>
-                  </GroupBox>
-
-                  <GroupBox Header="Top" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90">
-                    <ComboBox Name="comboBoxButton3" SelectionChanged="ItemSelectionChanged">
-                    </ComboBox>
-                  </GroupBox>
-
-                  <CheckBox Name="checkBoxDisableButtons"
-                            Margin="5"
-                            VerticalAlignment="Center"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">Disable buttons</CheckBox>
+              <GroupBox Header="Button mapping" Height="73">
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
+                  <Button Name="EditButtonMapping" Content="Edit" Width="70" Padding="5,5,5,5" Click="EditButtonMapping_Click" />
                 </StackPanel>
               </GroupBox>
 
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index ec377e9..e642338 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -160,24 +160,6 @@ public MainWindow()
             };
             timerConsoleUpdate.Tick += TimerConsoleUpdate_Tick;
 
-
-            // Create button map combobox items
-            comboBoxButton1.Items.Clear();
-            comboBoxButton2.Items.Clear();
-            comboBoxButton3.Items.Clear();
-            comboBoxButton1.Items.Add("Disabled");
-            comboBoxButton2.Items.Add("Disabled");
-            comboBoxButton3.Items.Add("Disabled");
-            for (int i = 1; i <= 5; i++)
-            {
-                comboBoxButton1.Items.Add("Mouse " + i);
-                comboBoxButton2.Items.Add("Mouse " + i);
-                comboBoxButton3.Items.Add("Mouse " + i);
-            }
-            comboBoxButton1.SelectedIndex = 0;
-            comboBoxButton2.SelectedIndex = 0;
-            comboBoxButton3.SelectedIndex = 0;
-
             // Events
             Closing += MainWindow_Closing;
             Loaded += MainWindow_Loaded;
@@ -405,21 +387,6 @@ private void LoadSettingsFromConfiguration()
             textTabletAreaY.Text = GetNumberString(config.TabletArea.Y);
 
 
-            //
-            // Buttons
-            //
-            if (config.ButtonMap.Count() == 3)
-            {
-                comboBoxButton1.SelectedIndex = config.ButtonMap[0];
-                comboBoxButton2.SelectedIndex = config.ButtonMap[1];
-                comboBoxButton3.SelectedIndex = config.ButtonMap[2];
-            }
-            else
-            {
-                config.ButtonMap = new int[] { 1, 2, 3 };
-            }
-            checkBoxDisableButtons.IsChecked = config.DisableButtons;
-
 
             //
             // Filter
@@ -543,10 +510,10 @@ private void UpdateSettingsToConfiguration()
 
 
             // Button map 
-            config.ButtonMap[0] = comboBoxButton1.SelectedIndex;
-            config.ButtonMap[1] = comboBoxButton2.SelectedIndex;
-            config.ButtonMap[2] = comboBoxButton3.SelectedIndex;
-            config.DisableButtons = (bool)checkBoxDisableButtons.IsChecked;
+            //config.ButtonMap[0] = comboBoxButton1.SelectedIndex;
+            //config.ButtonMap[1] = comboBoxButton2.SelectedIndex;
+            //config.ButtonMap[2] = comboBoxButton3.SelectedIndex;
+            //config.DisablePenButtons = (bool)checkBoxDisableButtons.IsChecked;
 
 
 
@@ -1092,20 +1059,6 @@ private void CheckboxChanged(object sender, RoutedEventArgs e)
 
             }
 
-            // Disable button map selection when buttons are disabled
-            if (checkBoxDisableButtons.IsChecked == true)
-            {
-                comboBoxButton1.IsEnabled = false;
-                comboBoxButton2.IsEnabled = false;
-                comboBoxButton3.IsEnabled = false;
-            }
-            else
-            {
-                comboBoxButton1.IsEnabled = true;
-                comboBoxButton2.IsEnabled = true;
-                comboBoxButton3.IsEnabled = true;
-            }
-
             // Disable desktop size settings when automatic is checked
             if (checkBoxAutomaticDesktopSize.IsChecked == true)
             {
@@ -1445,7 +1398,7 @@ private void SendSettingsToDriver()
 
 
             // Button map
-            if (config.DisableButtons)
+            if (config.DisablePenButtons)
             {
                 driver.SendCommand("ButtonMap 0 0 0");
             }
@@ -1725,5 +1678,23 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
             return IntPtr.Zero;
         }
 
+        private void EditButtonMapping_Click(object sender, RoutedEventArgs e)
+        {
+            ButtonMapping bm = new ButtonMapping(config, 4);
+
+            bm.ShowDialog();
+
+            if (bm.DialogResult == true)
+            {
+                config.ButtonMap[0] = bm.PenTipComboBox.SelectedIndex;
+                config.ButtonMap[1] = bm.PenBottomComboBox.SelectedIndex;
+                config.ButtonMap[2] = bm.PenTopComboBox.SelectedIndex;
+
+                config.DisablePenButtons = bm.CheckBoxDisablePenButtons.IsChecked ?? false;
+                config.DisableTabletButtons = bm.CheckBoxDisableTabletButtons.IsChecked ?? false;
+            }
+
+            bm.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/TabletDriverGUI/TabletDriverGUI.csproj b/TabletDriverGUI/TabletDriverGUI.csproj
index 3bb7241..488e1d2 100644
--- a/TabletDriverGUI/TabletDriverGUI.csproj
+++ b/TabletDriverGUI/TabletDriverGUI.csproj
@@ -77,12 +77,19 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="ButtonMapping.xaml.cs">
+      <DependentUpon>ButtonMapping.xaml</DependentUpon>
+    </Compile>
     <Compile Include="TabletDriver.cs" />
     <Compile Include="NativeMethods.cs" />
     <Compile Include="VersionHelper.cs" />
     <Compile Include="WacomArea.xaml.cs">
       <DependentUpon>WacomArea.xaml</DependentUpon>
     </Compile>
+    <Page Include="ButtonMapping.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/TabletDriverGUI/WacomArea.xaml b/TabletDriverGUI/WacomArea.xaml
index 3433270..cc110d5 100644
--- a/TabletDriverGUI/WacomArea.xaml
+++ b/TabletDriverGUI/WacomArea.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:TabletDriverGUI"
         mc:Ignorable="d"
-        Title="Wacom Intuos/Bamboo area" Height="250" Width="350">
+        Title="Wacom Intuos/Bamboo area" Height="250" Width="350" ResizeMode="NoResize">
   <Grid>
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
       <StackPanel Orientation="Horizontal">

From 134582205e9d33e251b5d0778b49436d9e58d51b Mon Sep 17 00:00:00 2001
From: Maxime Cauvin <maxime.cauvin@epitech.eu>
Date: Fri, 16 Mar 2018 16:48:04 +0100
Subject: [PATCH 02/11] TabletButtonHandling(feat): Button number displayed on
 screen variable

Variable with the model tablet recognized by the driver
---
 TabletDriverGUI/ButtonMapping.xaml.cs         | 121 +++++++++++-------
 TabletDriverGUI/MainWindow.xaml.cs            |  38 +++---
 TabletDriverGUI/TabletDriverGUI.csproj        |   1 +
 .../TabletNotRecognizedException.cs           |  16 +++
 4 files changed, 112 insertions(+), 64 deletions(-)
 create mode 100644 TabletDriverGUI/TabletNotRecognizedException.cs

diff --git a/TabletDriverGUI/ButtonMapping.xaml.cs b/TabletDriverGUI/ButtonMapping.xaml.cs
index 0c898d0..ed0c8a3 100644
--- a/TabletDriverGUI/ButtonMapping.xaml.cs
+++ b/TabletDriverGUI/ButtonMapping.xaml.cs
@@ -19,71 +19,94 @@ namespace TabletDriverGUI
     /// </summary>
     public partial class ButtonMapping : Window
     {
-        public ButtonMapping(Configuration config, uint nbTabletButtons)
+        private Dictionary<string, uint> NbTabletButtonsMap;
+
+        public ButtonMapping(Configuration config, string tabletName)
         {
-            InitializeComponent();
+            NbTabletButtonsMap = new Dictionary<string, uint>()
+            {
+                { "Wacom CTL-470", 0 },
+                { "Wacom CTL-471", 0 },
+                { "Wacom CTL-472", 0 },
+                { "Wacom CTL-480", 4 },
+                { "Wacom CTH-480", 4 },
+                { "Wacom CTL-490", 4 },
+                { "XP Pen G430", 0 },
+                { "XP Pen G640", 0 },
+                { "Huion 420", 0 },
+                { "Huion H640P", 6 },
+                { "Gaomon S56K", 0 },
+            };
 
-            for (var i = 0; i < nbTabletButtons; ++i)
+            if (tabletName != null && NbTabletButtonsMap.ContainsKey(tabletName))
             {
-                ComboBox cb = new ComboBox
+                InitializeComponent();
+                for (var i = 0; i < NbTabletButtonsMap[tabletName]; ++i)
                 {
-                    Name = "TabletButton" + (i + 1).ToString()
-                };
+                    ComboBox cb = new ComboBox
+                    {
+                        Name = "TabletButton" + (i + 1).ToString()
+                    };
 
-                GroupBox gb = new GroupBox
-                {
-                    Header = "Tablet button " + (i + 1).ToString(),
-                    Width = 110,
-                    Margin = new Thickness(10, 0, 0, 0),
-                    Content = cb
-                };
-                TabletButtonsContainer.Children.Add(gb);
-            }
+                    GroupBox gb = new GroupBox
+                    {
+                        Header = "Tablet button " + (i + 1).ToString(),
+                        Width = 110,
+                        Margin = new Thickness(10, 0, 0, 0),
+                        Content = cb
+                    };
+                    TabletButtonsContainer.Children.Add(gb);
+                }
 
-            // Create button map combobox items
-            var tabletButtons = TabletButtonsContainer.Children;
+                // Create button map combobox items
+                var tabletButtons = TabletButtonsContainer.Children;
 
-            PenTipComboBox.Items.Add("Disabled");
-            PenBottomComboBox.Items.Add("Disabled");
-            PenTopComboBox.Items.Add("Disabled");
-            for (var j = 0; j < tabletButtons.Count; ++j)
-            {
-                var gb = tabletButtons[j] as GroupBox;
-                var cb = gb.Content as ComboBox;
-                cb.Items.Add("Disabled");
-                cb.SelectedIndex = 0;
-            }
-            for (int i = 1; i <= 5; ++i)
-            {
-                PenTipComboBox.Items.Add("Mouse " + i);
-                PenBottomComboBox.Items.Add("Mouse " + i);
-                PenTopComboBox.Items.Add("Mouse " + i);
+                PenTipComboBox.Items.Add("Disabled");
+                PenBottomComboBox.Items.Add("Disabled");
+                PenTopComboBox.Items.Add("Disabled");
                 for (var j = 0; j < tabletButtons.Count; ++j)
                 {
                     var gb = tabletButtons[j] as GroupBox;
                     var cb = gb.Content as ComboBox;
-                    cb.Items.Add("Mouse " + i);
+                    cb.Items.Add("Disabled");
+                    cb.SelectedIndex = 0;
                 }
-            }
-            PenTipComboBox.SelectedIndex = 0;
-            PenBottomComboBox.SelectedIndex = 0;
-            PenTopComboBox.SelectedIndex = 0;
+                for (int i = 1; i <= 5; ++i)
+                {
+                    PenTipComboBox.Items.Add("Mouse " + i);
+                    PenBottomComboBox.Items.Add("Mouse " + i);
+                    PenTopComboBox.Items.Add("Mouse " + i);
+                    for (var j = 0; j < tabletButtons.Count; ++j)
+                    {
+                        var gb = tabletButtons[j] as GroupBox;
+                        var cb = gb.Content as ComboBox;
+                        cb.Items.Add("Mouse " + i);
+                    }
+                }
+                PenTipComboBox.SelectedIndex = 0;
+                PenBottomComboBox.SelectedIndex = 0;
+                PenTopComboBox.SelectedIndex = 0;
 
 
-            //
-            // Buttons
-            //
-            if (config.ButtonMap.Count() == 3)
-            {
-                PenTipComboBox.SelectedIndex = config.ButtonMap[0];
-                PenBottomComboBox.SelectedIndex = config.ButtonMap[1];
-                PenTopComboBox.SelectedIndex = config.ButtonMap[2];
+                //
+                // Buttons
+                //
+                if (config.ButtonMap.Count() == 3)
+                {
+                    PenTipComboBox.SelectedIndex = config.ButtonMap[0];
+                    PenBottomComboBox.SelectedIndex = config.ButtonMap[1];
+                    PenTopComboBox.SelectedIndex = config.ButtonMap[2];
+                }
+                else
+                    config.ButtonMap = new int[] { 1, 2, 3 };
+
+                CheckBoxDisablePenButtons.IsChecked = config.DisablePenButtons;
+                CheckBoxDisableTabletButtons.IsChecked = config.DisableTabletButtons;
             }
             else
-                config.ButtonMap = new int[] { 1, 2, 3 };
-
-            CheckBoxDisablePenButtons.IsChecked = config.DisablePenButtons;
-            CheckBoxDisableTabletButtons.IsChecked = config.DisableTabletButtons;
+            {
+                throw new TabletNotRecognizedException("Tablet not recognized");
+            }
         }
 
         private void ButtonSet_Click(object sender, RoutedEventArgs e)
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index e642338..4310505 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -46,6 +46,7 @@ public partial class MainWindow : Window
         private Configuration config;
         private bool isFirstStart = false;
         private bool isLoadingSettings;
+        private string TabletName;
 
         // Screen map canvas elements
         private Rectangle[] rectangleMonitors;
@@ -1294,10 +1295,10 @@ private void ParseDriverMessage(string line)
             match = Regex.Match(line, "^.*?\\[INFO\\] Tablet: (.*?)$");
             if (match.Success)
             {
-                string tabletName = match.Groups[1].ToString();
-                Title = "TabletDriverGUI - " + tabletName;
-                notifyIcon.Text = tabletName;
-                SetStatus("Connected to " + tabletName);
+                TabletName = match.Groups[1].ToString();
+                Title = "TabletDriverGUI - " + TabletName;
+                notifyIcon.Text = TabletName;
+                SetStatus("Connected to " + TabletName);
             }
             double value;
 
@@ -1680,21 +1681,28 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
 
         private void EditButtonMapping_Click(object sender, RoutedEventArgs e)
         {
-            ButtonMapping bm = new ButtonMapping(config, 4);
+            try
+            {
+                ButtonMapping bm = new ButtonMapping(config, TabletName);
 
-            bm.ShowDialog();
+                bm.ShowDialog();
 
-            if (bm.DialogResult == true)
-            {
-                config.ButtonMap[0] = bm.PenTipComboBox.SelectedIndex;
-                config.ButtonMap[1] = bm.PenBottomComboBox.SelectedIndex;
-                config.ButtonMap[2] = bm.PenTopComboBox.SelectedIndex;
+                if (bm.DialogResult == true)
+                {
+                    config.ButtonMap[0] = bm.PenTipComboBox.SelectedIndex;
+                    config.ButtonMap[1] = bm.PenBottomComboBox.SelectedIndex;
+                    config.ButtonMap[2] = bm.PenTopComboBox.SelectedIndex;
 
-                config.DisablePenButtons = bm.CheckBoxDisablePenButtons.IsChecked ?? false;
-                config.DisableTabletButtons = bm.CheckBoxDisableTabletButtons.IsChecked ?? false;
-            }
+                    config.DisablePenButtons = bm.CheckBoxDisablePenButtons.IsChecked ?? false;
+                    config.DisableTabletButtons = bm.CheckBoxDisableTabletButtons.IsChecked ?? false;
+                }
 
-            bm.Close();
+                bm.Close();
+            }
+            catch (TabletNotRecognizedException)
+            {
+                MessageBox.Show("Your tablet needs to be recognized before changing its control mapping.", "Tablet not recognized", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/TabletDriverGUI/TabletDriverGUI.csproj b/TabletDriverGUI/TabletDriverGUI.csproj
index 488e1d2..22d58c6 100644
--- a/TabletDriverGUI/TabletDriverGUI.csproj
+++ b/TabletDriverGUI/TabletDriverGUI.csproj
@@ -82,6 +82,7 @@
     </Compile>
     <Compile Include="TabletDriver.cs" />
     <Compile Include="NativeMethods.cs" />
+    <Compile Include="TabletNotRecognizedException.cs" />
     <Compile Include="VersionHelper.cs" />
     <Compile Include="WacomArea.xaml.cs">
       <DependentUpon>WacomArea.xaml</DependentUpon>
diff --git a/TabletDriverGUI/TabletNotRecognizedException.cs b/TabletDriverGUI/TabletNotRecognizedException.cs
new file mode 100644
index 0000000..23a815c
--- /dev/null
+++ b/TabletDriverGUI/TabletNotRecognizedException.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TabletDriverGUI
+{
+    class TabletNotRecognizedException : Exception
+    {
+        public TabletNotRecognizedException(string message) : base(message)
+        {
+
+        }
+    }
+}

From b3dbf7eac6ba8581374bbb999803c250ab02f9c5 Mon Sep 17 00:00:00 2001
From: Maxime Cauvin <maxime.cauvin@epitech.eu>
Date: Fri, 16 Mar 2018 18:05:08 +0100
Subject: [PATCH 03/11] TabletButtonHandling(feat): Started button mapping with
 shortcuts

---
 TabletDriverGUI/ButtonActionEnum.cs   | 19 +++++++++++++++++++
 TabletDriverGUI/ButtonConfBox.cs      | 14 ++++++++++++++
 TabletDriverGUI/ButtonMapping.xaml.cs | 10 ++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 TabletDriverGUI/ButtonActionEnum.cs
 create mode 100644 TabletDriverGUI/ButtonConfBox.cs

diff --git a/TabletDriverGUI/ButtonActionEnum.cs b/TabletDriverGUI/ButtonActionEnum.cs
new file mode 100644
index 0000000..ac2bfb1
--- /dev/null
+++ b/TabletDriverGUI/ButtonActionEnum.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TabletDriverGUI
+{
+    public enum ButtonActionEnum : int
+    {
+        DISABLED = 0,
+        MOUSE1 = 1,
+        MOUSE2 = 2,
+        MOUSE3 = 3,
+        MOUSE4 = 4,
+        MOUSE5 = 5,
+        SHORTCUT = 6
+    };
+}
diff --git a/TabletDriverGUI/ButtonConfBox.cs b/TabletDriverGUI/ButtonConfBox.cs
new file mode 100644
index 0000000..b51f824
--- /dev/null
+++ b/TabletDriverGUI/ButtonConfBox.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace TabletDriverGUI
+{
+    class ButtonConfBox : ComboBox
+    {
+
+    }
+}
diff --git a/TabletDriverGUI/ButtonMapping.xaml.cs b/TabletDriverGUI/ButtonMapping.xaml.cs
index ed0c8a3..04116c5 100644
--- a/TabletDriverGUI/ButtonMapping.xaml.cs
+++ b/TabletDriverGUI/ButtonMapping.xaml.cs
@@ -83,6 +83,16 @@ public ButtonMapping(Configuration config, string tabletName)
                         cb.Items.Add("Mouse " + i);
                     }
                 }
+                PenTipComboBox.Items.Add("Shortcut");
+                PenBottomComboBox.Items.Add("Shortcut");
+                PenTopComboBox.Items.Add("Shortcut");
+                for (var i = 0; i < tabletButtons.Count; ++i)
+                {
+                    var gb = tabletButtons[i] as GroupBox;
+                    var cb = gb.Content as ComboBox;
+                    cb.Items.Add("Shortcut");
+                }
+
                 PenTipComboBox.SelectedIndex = 0;
                 PenBottomComboBox.SelectedIndex = 0;
                 PenTopComboBox.SelectedIndex = 0;

From 4bcc71df4431f6b37e606996aa952fc9f968927f Mon Sep 17 00:00:00 2001
From: Maxime Cauvin <maxime.cauvin@epitech.eu>
Date: Fri, 16 Mar 2018 19:39:52 +0100
Subject: [PATCH 04/11] TabletButtonHandling(fix); Files not being added into
 the project

---
 TabletDriverGUI/TabletDriverGUI.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/TabletDriverGUI/TabletDriverGUI.csproj b/TabletDriverGUI/TabletDriverGUI.csproj
index 22d58c6..05ff649 100644
--- a/TabletDriverGUI/TabletDriverGUI.csproj
+++ b/TabletDriverGUI/TabletDriverGUI.csproj
@@ -77,6 +77,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="ButtonActionEnum.cs" />
+    <Compile Include="ButtonConfBox.cs" />
     <Compile Include="ButtonMapping.xaml.cs">
       <DependentUpon>ButtonMapping.xaml</DependentUpon>
     </Compile>

From c3945b9a273d031c3b22df7c8506cc712664b081 Mon Sep 17 00:00:00 2001
From: Maxime Cauvin <maxime.cauvin@epitech.eu>
Date: Mon, 19 Mar 2018 09:43:22 +0100
Subject: [PATCH 05/11] TabletButtonHandling(feat): Shortcut window modal done

---
 TabletDriverGUI/ButtonActionEnum.cs       | 19 -----
 TabletDriverGUI/ButtonConfBox.cs          | 14 ----
 TabletDriverGUI/ButtonMapping.xaml.cs     | 53 +++++++++++--
 TabletDriverGUI/ShortcutMapWindow.xaml    | 29 +++++++
 TabletDriverGUI/ShortcutMapWindow.xaml.cs | 96 +++++++++++++++++++++++
 TabletDriverGUI/TabletDriverGUI.csproj    |  9 ++-
 6 files changed, 177 insertions(+), 43 deletions(-)
 delete mode 100644 TabletDriverGUI/ButtonActionEnum.cs
 delete mode 100644 TabletDriverGUI/ButtonConfBox.cs
 create mode 100644 TabletDriverGUI/ShortcutMapWindow.xaml
 create mode 100644 TabletDriverGUI/ShortcutMapWindow.xaml.cs

diff --git a/TabletDriverGUI/ButtonActionEnum.cs b/TabletDriverGUI/ButtonActionEnum.cs
deleted file mode 100644
index ac2bfb1..0000000
--- a/TabletDriverGUI/ButtonActionEnum.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TabletDriverGUI
-{
-    public enum ButtonActionEnum : int
-    {
-        DISABLED = 0,
-        MOUSE1 = 1,
-        MOUSE2 = 2,
-        MOUSE3 = 3,
-        MOUSE4 = 4,
-        MOUSE5 = 5,
-        SHORTCUT = 6
-    };
-}
diff --git a/TabletDriverGUI/ButtonConfBox.cs b/TabletDriverGUI/ButtonConfBox.cs
deleted file mode 100644
index b51f824..0000000
--- a/TabletDriverGUI/ButtonConfBox.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls;
-
-namespace TabletDriverGUI
-{
-    class ButtonConfBox : ComboBox
-    {
-
-    }
-}
diff --git a/TabletDriverGUI/ButtonMapping.xaml.cs b/TabletDriverGUI/ButtonMapping.xaml.cs
index 04116c5..b96d36c 100644
--- a/TabletDriverGUI/ButtonMapping.xaml.cs
+++ b/TabletDriverGUI/ButtonMapping.xaml.cs
@@ -14,6 +14,17 @@
 
 namespace TabletDriverGUI
 {
+    public enum ButtonActionEnum : uint
+    {
+        DISABLED = 0,
+        MOUSE1 = 1,
+        MOUSE2 = 2,
+        MOUSE3 = 3,
+        MOUSE4 = 4,
+        MOUSE5 = 5,
+        SHORTCUT = 6
+    };
+
     /// <summary>
     /// Logique d'interaction pour ButtonMapping.xaml
     /// </summary>
@@ -38,15 +49,17 @@ public ButtonMapping(Configuration config, string tabletName)
                 { "Gaomon S56K", 0 },
             };
 
-            if (tabletName != null && NbTabletButtonsMap.ContainsKey(tabletName))
-            {
+            //if (tabletName != null && NbTabletButtonsMap.ContainsKey(tabletName))
+            //{
                 InitializeComponent();
-                for (var i = 0; i < NbTabletButtonsMap[tabletName]; ++i)
+                //for (var i = 0; i < NbTabletButtonsMap[tabletName]; ++i)
+                for (var i = 0; i < 4; ++i)
                 {
                     ComboBox cb = new ComboBox
                     {
                         Name = "TabletButton" + (i + 1).ToString()
                     };
+                    cb.DropDownClosed += new EventHandler(PromptShortcutWindowEvent);
 
                     GroupBox gb = new GroupBox
                     {
@@ -112,11 +125,11 @@ public ButtonMapping(Configuration config, string tabletName)
 
                 CheckBoxDisablePenButtons.IsChecked = config.DisablePenButtons;
                 CheckBoxDisableTabletButtons.IsChecked = config.DisableTabletButtons;
-            }
-            else
-            {
-                throw new TabletNotRecognizedException("Tablet not recognized");
-            }
+            //}
+            //else
+            //{
+            //    throw new TabletNotRecognizedException("Tablet not recognized");
+            //}
         }
 
         private void ButtonSet_Click(object sender, RoutedEventArgs e)
@@ -148,5 +161,29 @@ private void CheckBoxDisableTabletButtons_Unchecked(object sender, RoutedEventAr
         {
             TabletButtonsContainer.IsEnabled = true;
         }
+
+        private void PromptShortcutWindowEvent(object sender, EventArgs e)
+        {
+            PromptShortcutWindow(sender);
+        }
+
+        private void PromptShortcutWindow(object sender)
+        {
+            ComboBox cb = sender as ComboBox;
+
+            if (cb.SelectedIndex == (uint)ButtonActionEnum.SHORTCUT)
+            {
+                ShortcutMapWindow shortcutMapWindow = new ShortcutMapWindow();
+
+                shortcutMapWindow.ShowDialog();
+
+                if (shortcutMapWindow.DialogResult == true)
+                {
+
+                }
+
+                shortcutMapWindow.Close();
+            }
+        }
     }
 }
diff --git a/TabletDriverGUI/ShortcutMapWindow.xaml b/TabletDriverGUI/ShortcutMapWindow.xaml
new file mode 100644
index 0000000..583a6f1
--- /dev/null
+++ b/TabletDriverGUI/ShortcutMapWindow.xaml
@@ -0,0 +1,29 @@
+<Window x:Class="TabletDriverGUI.ShortcutMapWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:TabletDriverGUI"
+        mc:Ignorable="d"
+        Title="ShortcutMapWindow" Height="200" Width="300" ResizeMode="NoResize"
+        KeyDown="Window_KeyDown">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="75*"/>
+            <RowDefinition Height="25*"/>
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <Label HorizontalContentAlignment="Center">
+                <TextBlock Margin="0,0,0,5" TextAlignment="Center">
+                    Make your own shortcut by pressing<LineBreak/>on the keyboard
+                </TextBlock>
+            </Label>
+            <Label Name="ShortcutResult" HorizontalAlignment="Center" FontSize="18" Content="-"/>
+        </StackPanel>
+
+        <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
+            <Button Name="ButtonSet" Content="Set" Width="60" Height="25" Click="ButtonSet_Click"/>
+            <Button Name="ButtonCancel" Margin="35,0,0,0" Width="60" Height="25" Content="Cancel" Click="ButtonCancel_Click" />
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/TabletDriverGUI/ShortcutMapWindow.xaml.cs b/TabletDriverGUI/ShortcutMapWindow.xaml.cs
new file mode 100644
index 0000000..1840d9d
--- /dev/null
+++ b/TabletDriverGUI/ShortcutMapWindow.xaml.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using WindowsInput.Native;
+using WindowsInput;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace TabletDriverGUI
+{
+    /// <summary>
+    /// Interaction logic for ShortcutMapWindow.xaml
+    /// </summary>
+    public partial class ShortcutMapWindow : Window
+    {
+        [DllImport("User32.Dll", EntryPoint = "PostMessageA")]
+        private static extern bool PostMessage(IntPtr hWnd, uint msg, int wParam, int lParam);
+
+        public Key PressedKey;
+
+        public ShortcutMapWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void Window_KeyDown(object sender, KeyEventArgs e)
+        {
+            PressedKey = e.Key;
+
+            e.Handled = true;
+
+            // Fetch the actual shortcut key.
+            Key key = (e.Key == Key.System ? e.SystemKey : e.Key);
+
+            // Ignore modifier keys.
+            if (key == Key.LeftShift || key == Key.RightShift
+                || key == Key.LeftCtrl || key == Key.RightCtrl
+                || key == Key.LeftAlt || key == Key.RightAlt
+                || key == Key.LWin || key == Key.RWin)
+            {
+                return;
+            }
+
+            // Build the shortcut key name.
+            StringBuilder shortcutText = new StringBuilder();
+            if ((Keyboard.Modifiers & ModifierKeys.Control) != 0)
+            {
+                shortcutText.Append("Ctrl+");
+            }
+            if ((Keyboard.Modifiers & ModifierKeys.Shift) != 0)
+            {
+                shortcutText.Append("Shift+");
+            }
+            if ((Keyboard.Modifiers & ModifierKeys.Alt) != 0)
+            {
+                shortcutText.Append("Alt+");
+            }
+            shortcutText.Append(key.ToString());
+
+            ShortcutResult.Content = shortcutText.ToString();
+        }
+
+        private void ButtonSet_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = true;
+        }
+
+        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            //Process[] processes = Process.GetProcesses();
+            //foreach (Process proc in processes)
+            //{
+            //    const uint WM_KEYDOWN = 0x0100;
+            //    PostMessage(proc.MainWindowHandle, WM_KEYDOWN, 0xBE, 0);
+            //    PostMessage(proc.MainWindowHandle, WM_KEYDOWN, 0x63, 0);
+                //SetForegroundWindow(proc.MainWindowHandle);
+                //System.Windows.Forms.SendKeys.SendWait("(.3)");
+            //}
+
+            //InputSimulator inputSimulator = new InputSimulator();
+            //inputSimulator.Keyboard.ModifiedKeyStroke(VirtualKeyCode.MENU, VirtualKeyCode.F4);
+            //System.Windows.Forms.SendKeys.SendWait("(%{F4})");
+        }
+    }
+}
diff --git a/TabletDriverGUI/TabletDriverGUI.csproj b/TabletDriverGUI/TabletDriverGUI.csproj
index 05ff649..89f8583 100644
--- a/TabletDriverGUI/TabletDriverGUI.csproj
+++ b/TabletDriverGUI/TabletDriverGUI.csproj
@@ -77,11 +77,12 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="ButtonActionEnum.cs" />
-    <Compile Include="ButtonConfBox.cs" />
     <Compile Include="ButtonMapping.xaml.cs">
       <DependentUpon>ButtonMapping.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ShortcutMapWindow.xaml.cs">
+      <DependentUpon>ShortcutMapWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="TabletDriver.cs" />
     <Compile Include="NativeMethods.cs" />
     <Compile Include="TabletNotRecognizedException.cs" />
@@ -107,6 +108,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="ShortcutMapWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="WacomArea.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

From 50d6405f23a72bc0a289dbe7ad3202465f1f580e Mon Sep 17 00:00:00 2001
From: Maxime Cauvin <maxime.cauvin@epitech.eu>
Date: Tue, 20 Mar 2018 17:44:45 +0100
Subject: [PATCH 06/11] TabletButtonHandling(feat): First approach sending
 shortcut macro

---
 TabletDriverGUI/ButtonMapping.xaml.cs     |  8 +++++--
 TabletDriverGUI/ShortcutMapWindow.xaml.cs | 26 ++++++++---------------
 TabletDriverService/Main.cpp              | 10 +++++++++
 TabletDriverService/ProcessCommand.cpp    | 21 ++++++++++++++++++
 TabletDriverService/Tablet.cpp            | 15 +++++++++++--
 TabletDriverService/Tablet.h              |  1 +
 6 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/TabletDriverGUI/ButtonMapping.xaml.cs b/TabletDriverGUI/ButtonMapping.xaml.cs
index b96d36c..f733fd2 100644
--- a/TabletDriverGUI/ButtonMapping.xaml.cs
+++ b/TabletDriverGUI/ButtonMapping.xaml.cs
@@ -26,7 +26,7 @@ public enum ButtonActionEnum : uint
     };
 
     /// <summary>
-    /// Logique d'interaction pour ButtonMapping.xaml
+    /// Interaction logic for ButtonMapping.xaml
     /// </summary>
     public partial class ButtonMapping : Window
     {
@@ -179,7 +179,11 @@ private void PromptShortcutWindow(object sender)
 
                 if (shortcutMapWindow.DialogResult == true)
                 {
-
+                    Console.WriteLine(shortcutMapWindow.PressedKey.ToString());
+                    for (var i = 0; i < shortcutMapWindow.ModifierKey.Count; ++i)
+                    {
+                        Console.WriteLine(shortcutMapWindow.ModifierKey[i].ToString());
+                    }
                 }
 
                 shortcutMapWindow.Close();
diff --git a/TabletDriverGUI/ShortcutMapWindow.xaml.cs b/TabletDriverGUI/ShortcutMapWindow.xaml.cs
index 1840d9d..392f2e8 100644
--- a/TabletDriverGUI/ShortcutMapWindow.xaml.cs
+++ b/TabletDriverGUI/ShortcutMapWindow.xaml.cs
@@ -8,8 +8,6 @@
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
-using WindowsInput.Native;
-using WindowsInput;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
@@ -26,22 +24,26 @@ public partial class ShortcutMapWindow : Window
         [DllImport("User32.Dll", EntryPoint = "PostMessageA")]
         private static extern bool PostMessage(IntPtr hWnd, uint msg, int wParam, int lParam);
 
-        public Key PressedKey;
+        public List<ModifierKeys>   ModifierKey;
+        public Key                  PressedKey;
 
         public ShortcutMapWindow()
         {
+            ModifierKey = new List<ModifierKeys>();
             InitializeComponent();
         }
 
         private void Window_KeyDown(object sender, KeyEventArgs e)
         {
-            PressedKey = e.Key;
+            ModifierKey.Clear();
 
             e.Handled = true;
 
             // Fetch the actual shortcut key.
             Key key = (e.Key == Key.System ? e.SystemKey : e.Key);
 
+            PressedKey = key;
+
             // Ignore modifier keys.
             if (key == Key.LeftShift || key == Key.RightShift
                 || key == Key.LeftCtrl || key == Key.RightCtrl
@@ -55,14 +57,17 @@ private void Window_KeyDown(object sender, KeyEventArgs e)
             StringBuilder shortcutText = new StringBuilder();
             if ((Keyboard.Modifiers & ModifierKeys.Control) != 0)
             {
+                ModifierKey.Add(ModifierKeys.Control);
                 shortcutText.Append("Ctrl+");
             }
             if ((Keyboard.Modifiers & ModifierKeys.Shift) != 0)
             {
+                ModifierKey.Add(ModifierKeys.Shift);
                 shortcutText.Append("Shift+");
             }
             if ((Keyboard.Modifiers & ModifierKeys.Alt) != 0)
             {
+                ModifierKey.Add(ModifierKeys.Alt);
                 shortcutText.Append("Alt+");
             }
             shortcutText.Append(key.ToString());
@@ -78,19 +83,6 @@ private void ButtonSet_Click(object sender, RoutedEventArgs e)
         private void ButtonCancel_Click(object sender, RoutedEventArgs e)
         {
             DialogResult = false;
-            //Process[] processes = Process.GetProcesses();
-            //foreach (Process proc in processes)
-            //{
-            //    const uint WM_KEYDOWN = 0x0100;
-            //    PostMessage(proc.MainWindowHandle, WM_KEYDOWN, 0xBE, 0);
-            //    PostMessage(proc.MainWindowHandle, WM_KEYDOWN, 0x63, 0);
-                //SetForegroundWindow(proc.MainWindowHandle);
-                //System.Windows.Forms.SendKeys.SendWait("(.3)");
-            //}
-
-            //InputSimulator inputSimulator = new InputSimulator();
-            //inputSimulator.Keyboard.ModifiedKeyStroke(VirtualKeyCode.MENU, VirtualKeyCode.F4);
-            //System.Windows.Forms.SendKeys.SendWait("(%{F4})");
         }
     }
 }
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index 2de742b..c47a613 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -23,6 +23,7 @@ Tablet *tablet;
 VMulti *vmulti;
 ScreenMapper *mapper;
 thread *tabletThread;
+thread *tabletButtonThread;
 
 //
 // Init console parameters
@@ -161,6 +162,13 @@ void RunTabletThread() {
 
 }
 
+void RunTabletButtonThread() {
+	while (true)
+	{
+
+	}
+}
+
 //
 // Tablet filter timer callback
 //
@@ -249,6 +257,7 @@ int main(int argc, char**argv) {
 	vmulti = NULL;
 	tablet = NULL;
 	tabletThread = NULL;
+	tabletButtonThread = NULL;
 
 	// Init console
 	InitConsole();
@@ -352,6 +361,7 @@ int main(int argc, char**argv) {
 
 				// Start the tablet thread
 				tabletThread = new thread(RunTabletThread);
+				tabletButtonThread = new thread(RunTabletButtonThread);
 
 				LOG_INFO("TabletDriver started!\n");
 				LOG_INFO("Tablet: %s\n", tablet->name.c_str());
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 8631a6f..530e578 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -276,6 +276,27 @@ bool ProcessCommand(CommandLine *cmd) {
 	}
 
 
+
+	//
+	// Tablet buttons macro
+	//
+	else if (cmd->is("TabletMacro") && cmd->valueCount == 2) {
+		if (!CheckTablet()) return true;
+		int indexToBeAssigned = cmd->GetInt(0, -1);
+		string macroToBeAssigned = cmd->GetString(1, "undefined");
+
+		if (indexToBeAssigned != -1 && macroToBeAssigned != "undefined")
+		{
+			tablet->buttonTabletMap[indexToBeAssigned] = macroToBeAssigned;
+			LOG_INFO("Set the macro '%s' to the tablet button [%d]", macroToBeAssigned, indexToBeAssigned);
+		}
+		else
+		{
+			LOG_INFO("Invalid command for TabletMacro, try this instead: TabletMacro index_to_modify macro_to_assign");
+		}
+	}
+
+
 	// Screen Map Area
 	else if(cmd->is("ScreenArea") || cmd->is("Screen")) {
 		if(!CheckTablet()) return true;
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 8c8b365..8186696 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -26,12 +26,21 @@ Tablet::Tablet(string usbGUID, int stringId, string stringMatch) : Tablet() {
 Tablet::Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage) : Tablet() {
 	//_construct();
 	hidDevice = new HIDDevice(vendorId, productId, usagePage, usage);
-	if(hidDevice->isOpen) {
+	if (hidDevice->isOpen) {
 		this->isOpen = true;
-	} else {
+	}
+	else {
 		delete hidDevice;
 		hidDevice = NULL;
 	}
+	hidDevice2 = new HIDDevice(vendorId, productId, usagePage, usage);
+	if (hidDevice2->isOpen) {
+		this->isOpen = true;
+	}
+	else {
+		delete hidDevice2;
+		hidDevice2 = NULL;
+	}
 }
 
 //
@@ -83,6 +92,7 @@ Tablet::Tablet() {
 
 	// Button map
 	memset(&buttonMap, 0, sizeof(buttonMap));
+	memset(&buttonTabletMap, 0, sizeof(buttonTabletMap));
 	buttonMap[0] = 1;
 	buttonMap[1] = 2;
 	buttonMap[2] = 3;
@@ -345,6 +355,7 @@ void Tablet::CloseDevice() {
 			usbDevice->CloseDevice();
 		} else if(hidDevice != NULL) {
 			hidDevice->CloseDevice();
+			hidDevice2->CloseDevice();
 		}
 	}
 	isOpen = false;
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 71082b8..9fcd05b 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -90,6 +90,7 @@ class Tablet {
 
 	// Button map
 	BYTE buttonMap[16];
+	string buttonTabletMap[16];
 
 	//
 	string name = "Unknown";

From 1c6ca87656d5854925e1ee6926f41dff31bf8602 Mon Sep 17 00:00:00 2001
From: Maxime Cauvin <maxime.cauvin@epitech.eu>
Date: Wed, 21 Mar 2018 22:42:54 +0100
Subject: [PATCH 07/11] TabletButtonHandling(feat): GUI part done + sending
 correct informations to the driver

---
 TabletDriverGUI/ButtonMapping.xaml.cs         |  64 +++++++---
 TabletDriverGUI/Configuration.cs              |   5 +-
 TabletDriverGUI/MacroButton.cs                |  26 ++++
 TabletDriverGUI/MainWindow.xaml.cs            | 115 +++++++++++++++++-
 TabletDriverGUI/ShortcutMapWindow.xaml.cs     |   3 -
 TabletDriverGUI/TabletDriverGUI.csproj        |   1 +
 TabletDriverService/ProcessCommand.cpp        |  34 ++++--
 TabletDriverService/ProcessCommand.h          |   1 +
 TabletDriverService/Tablet.cpp                |   1 -
 TabletDriverService/Tablet.h                  |   3 +-
 .../TabletDriverService.vcxproj               |   2 +
 .../TabletDriverService.vcxproj.filters       |   6 +
 TabletDriverService/Utils.cpp                 |  44 +++++++
 TabletDriverService/Utils.h                   |  19 +++
 14 files changed, 283 insertions(+), 41 deletions(-)
 create mode 100644 TabletDriverGUI/MacroButton.cs
 create mode 100644 TabletDriverService/Utils.cpp
 create mode 100644 TabletDriverService/Utils.h

diff --git a/TabletDriverGUI/ButtonMapping.xaml.cs b/TabletDriverGUI/ButtonMapping.xaml.cs
index f733fd2..2bf1fd9 100644
--- a/TabletDriverGUI/ButtonMapping.xaml.cs
+++ b/TabletDriverGUI/ButtonMapping.xaml.cs
@@ -31,6 +31,7 @@ public enum ButtonActionEnum : uint
     public partial class ButtonMapping : Window
     {
         private Dictionary<string, uint> NbTabletButtonsMap;
+        public Dictionary<int, int[]> MacroButtonMap;
 
         public ButtonMapping(Configuration config, string tabletName)
         {
@@ -48,12 +49,17 @@ public ButtonMapping(Configuration config, string tabletName)
                 { "Huion H640P", 6 },
                 { "Gaomon S56K", 0 },
             };
+            MacroButtonMap = new Dictionary<int, int[]>();
 
-            //if (tabletName != null && NbTabletButtonsMap.ContainsKey(tabletName))
-            //{
+            if (tabletName != null && NbTabletButtonsMap.ContainsKey(tabletName))
+            {
                 InitializeComponent();
-                //for (var i = 0; i < NbTabletButtonsMap[tabletName]; ++i)
-                for (var i = 0; i < 4; ++i)
+
+                PenTipComboBox.DropDownClosed += new EventHandler(PromptShortcutWindowEvent);
+                PenBottomComboBox.DropDownClosed += new EventHandler(PromptShortcutWindowEvent);
+                PenTopComboBox.DropDownClosed += new EventHandler(PromptShortcutWindowEvent);
+
+                for (var i = 0; i < NbTabletButtonsMap[tabletName]; ++i)
                 {
                     ComboBox cb = new ComboBox
                     {
@@ -114,22 +120,28 @@ public ButtonMapping(Configuration config, string tabletName)
                 //
                 // Buttons
                 //
-                if (config.ButtonMap.Count() == 3)
+                PenTipComboBox.SelectedIndex = config.ButtonMap[0];
+                PenBottomComboBox.SelectedIndex = config.ButtonMap[1];
+                PenTopComboBox.SelectedIndex = config.ButtonMap[2];
+
+                for (var i = 0; i < NbTabletButtonsMap[tabletName]; ++i)
                 {
-                    PenTipComboBox.SelectedIndex = config.ButtonMap[0];
-                    PenBottomComboBox.SelectedIndex = config.ButtonMap[1];
-                    PenTopComboBox.SelectedIndex = config.ButtonMap[2];
+                    for (var j = 0; j < TabletButtonsContainer.Children.Count && j + 3 < config.ButtonMap.Length; ++j)
+                    {
+                        var gb = TabletButtonsContainer.Children[j] as GroupBox;
+                        var cb = gb.Content as ComboBox;
+
+                        cb.SelectedIndex = config.ButtonMap[3 + j];
+                    }
                 }
-                else
-                    config.ButtonMap = new int[] { 1, 2, 3 };
 
                 CheckBoxDisablePenButtons.IsChecked = config.DisablePenButtons;
                 CheckBoxDisableTabletButtons.IsChecked = config.DisableTabletButtons;
-            //}
-            //else
-            //{
-            //    throw new TabletNotRecognizedException("Tablet not recognized");
-            //}
+            }
+            else
+            {
+                throw new TabletNotRecognizedException("Tablet not recognized");
+            }
         }
 
         private void ButtonSet_Click(object sender, RoutedEventArgs e)
@@ -179,12 +191,26 @@ private void PromptShortcutWindow(object sender)
 
                 if (shortcutMapWindow.DialogResult == true)
                 {
-                    Console.WriteLine(shortcutMapWindow.PressedKey.ToString());
+                    int idx = -1;
+                    if (cb.Name == "PenTipComboBox")
+                        idx = 0;
+                    else if (cb.Name == "PenBottomComboBox")
+                        idx = 1;
+                    else if (cb.Name == "PenTopComboBox")
+                        idx = 2;
+                    else
+                        idx = Int32.Parse(cb.Name.Remove(0, 12)) + 2;
+                    List<int> l = new List<int>();
+
                     for (var i = 0; i < shortcutMapWindow.ModifierKey.Count; ++i)
-                    {
-                        Console.WriteLine(shortcutMapWindow.ModifierKey[i].ToString());
-                    }
+                        l.Add((int)shortcutMapWindow.ModifierKey[i]);
+                    l.Add((int)shortcutMapWindow.PressedKey);
+                    if (shortcutMapWindow.PressedKey == Key.None)
+                        cb.SelectedIndex = (int)ButtonActionEnum.DISABLED;
+                    MacroButtonMap[idx] = l.ToArray();
                 }
+                else
+                    cb.SelectedIndex = (int)ButtonActionEnum.DISABLED;
 
                 shortcutMapWindow.Close();
             }
diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index 3767447..e278377 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Xml;
 using System.Xml.Serialization;
+using System.Collections.Generic;
 
 namespace TabletDriverGUI
 {
@@ -35,6 +36,7 @@ public enum OutputModes
         [XmlArray("ButtonMap")]
         [XmlArrayItem("Button")]
         public int[] ButtonMap;
+        public MacroButton[] MacroButtonMap;
         public bool DisablePenButtons;
         public bool DisableTabletButtons;
 
@@ -73,7 +75,8 @@ public Configuration()
             DesktopSize = new Area(0, 0, 0, 0);
             AutomaticDesktopSize = true;
 
-            ButtonMap = new int[] { 1, 2, 3 };
+            ButtonMap = new int[] { 1, 2, 3, 0, 0, 0, 0, 0, 0 };
+            MacroButtonMap = new MacroButton[] { };
             DisablePenButtons = false;
             DisableTabletButtons = false;
 
diff --git a/TabletDriverGUI/MacroButton.cs b/TabletDriverGUI/MacroButton.cs
new file mode 100644
index 0000000..cc410a5
--- /dev/null
+++ b/TabletDriverGUI/MacroButton.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+
+namespace TabletDriverGUI
+{
+    //[XmlType("MacroButton")]
+    public class MacroButton
+    {
+        public int Index;
+        [XmlArray("MacroKeys")]
+        [XmlArrayItem("Key")]
+        public int[] MacroKeys;
+
+        public MacroButton() { }
+
+        public MacroButton(int index, int[] macroKeys)
+        {
+            Index = index;
+            MacroKeys = macroKeys;
+        }
+    }
+}
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 4310505..41d2467 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -1168,13 +1168,14 @@ private void SaveSettings(object sender, RoutedEventArgs e)
                 SendSettingsToDriver();
                 SetStatus("Settings saved!");
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 string dir = Directory.GetCurrentDirectory();
                 MessageBox.Show("Error occured while saving the configuration.\n" +
                     "Make sure that it is possible to create and edit files in the '" + dir + "' directory.\n",
                     "ERROR!", MessageBoxButton.OK, MessageBoxImage.Error
                 );
+                Console.WriteLine(ex.Message);
             }
         }
 
@@ -1285,6 +1286,20 @@ private void TimerRestart_Tick(object sender, EventArgs e)
         //
         private void ParseDriverMessage(string line)
         {
+            Dictionary<string, uint> NbTabletButtonsMap = new Dictionary<string, uint>()
+            {
+                { "Wacom CTL-470", 0 },
+                { "Wacom CTL-471", 0 },
+                { "Wacom CTL-472", 0 },
+                { "Wacom CTL-480", 4 },
+                { "Wacom CTH-480", 4 },
+                { "Wacom CTL-490", 4 },
+                { "XP Pen G430", 0 },
+                { "XP Pen G640", 0 },
+                { "Huion 420", 0 },
+                { "Huion H640P", 6 },
+                { "Gaomon S56K", 0 },
+            };
 
             //
             // Tablet Name
@@ -1401,11 +1416,28 @@ private void SendSettingsToDriver()
             // Button map
             if (config.DisablePenButtons)
             {
-                driver.SendCommand("ButtonMap 0 0 0");
+                string cmd = "ButtonMap 0 0 0 " + String.Join(" ", config.ButtonMap, 3, 6);
+                driver.SendCommand(cmd);
+                if (config.MacroButtonMap.Length != 0)
+                {
+                    cmd = "TabletMacro " + string.Join(";", config.MacroButtonMap.Select(t => string.Format("{0},{1}", t.Index, string.Join(",", t.MacroKeys))));
+                    driver.SendCommand(cmd);
+                }
+            }
+            else if (config.DisableTabletButtons)
+            {
+                string cmd = String.Join(" ", config.ButtonMap, 0, 3) + " 0 0 0 0 0 0";
+                driver.SendCommand(cmd);
             }
             else
             {
-                driver.SendCommand("ButtonMap " + String.Join(" ", config.ButtonMap));
+                string cmd = "ButtonMap " + String.Join(" ", config.ButtonMap);
+                driver.SendCommand(cmd);
+                if (config.MacroButtonMap.Length != 0)
+                {
+                    cmd = "TabletMacro " + string.Join(";", config.MacroButtonMap.Select(t => string.Format("{0},{1}", t.Index, string.Join(",", t.MacroKeys))));
+                    driver.SendCommand(cmd);
+                }
             }
 
             // Filter
@@ -1689,9 +1721,80 @@ private void EditButtonMapping_Click(object sender, RoutedEventArgs e)
 
                 if (bm.DialogResult == true)
                 {
-                    config.ButtonMap[0] = bm.PenTipComboBox.SelectedIndex;
-                    config.ButtonMap[1] = bm.PenBottomComboBox.SelectedIndex;
-                    config.ButtonMap[2] = bm.PenTopComboBox.SelectedIndex;
+                    List<int> macroButtonsToRemove = new List<int>();
+                    for (var i = 0; i < 3; ++i)
+                    {
+                        if (config.ButtonMap[i] != 6)
+                            macroButtonsToRemove.Add(i);
+
+                        if (bm.MacroButtonMap.ContainsKey(i) && bm.MacroButtonMap[i].Length == 1 && bm.MacroButtonMap[i][0] == 0)
+                            bm.MacroButtonMap.Remove(i);
+                        else
+                        {
+                            switch (i)
+                            {
+                                case 0:
+                                    config.ButtonMap[i] = bm.PenTipComboBox.SelectedIndex;
+                                    break;
+                                case 1:
+                                    config.ButtonMap[i] = bm.PenBottomComboBox.SelectedIndex;
+                                    break;
+                                case 2:
+                                    config.ButtonMap[i] = bm.PenTopComboBox.SelectedIndex;
+                                    break;
+                            }
+                        }
+                    }
+
+                    for (var i = 0; i < bm.TabletButtonsContainer.Children.Count; ++i)
+                    {
+                        var gb = bm.TabletButtonsContainer.Children[i] as GroupBox;
+                        var cb = gb.Content as ComboBox;
+
+
+                        if (cb.SelectedIndex != 6)
+                            macroButtonsToRemove.Add(i + 3);
+
+                        if (bm.MacroButtonMap.ContainsKey(i + 3) && bm.MacroButtonMap[i + 3].Length == 1 && bm.MacroButtonMap[i + 3][0] == 0)
+                            bm.MacroButtonMap.Remove(i + 3);
+                        else
+                            config.ButtonMap[i + 3] = cb.SelectedIndex;
+                    }
+
+                    //Delete removed or empty MacroButtons
+                    var macroButtonList = config.MacroButtonMap.ToList();
+                    for (var i = 0; i < macroButtonsToRemove.Count; ++i)
+                    {
+                        for (var j = 0; j < macroButtonList.Count; ++j)
+                        {
+                            if (macroButtonsToRemove[i] == macroButtonList[j].Index)
+                            {
+                                macroButtonList.RemoveAt(j);
+                                break;
+                            }
+                        }
+                    }
+                    config.MacroButtonMap = macroButtonList.ToArray();
+
+                    //Concat new results into the local configuration
+                    foreach (var item in bm.MacroButtonMap)
+                    {
+                        bool added = false;
+                        for (var i = 0; i < config.MacroButtonMap.Length && !added; ++i)
+                        {
+                            if (config.MacroButtonMap[i].Index == item.Key)
+                            {
+                                config.MacroButtonMap[i].MacroKeys = item.Value;
+                                added = true;
+                            }
+                        }
+                        if (!added)
+                        {
+                            var list = config.MacroButtonMap.ToList();
+                            list.Add(new MacroButton(item.Key, item.Value));
+                            config.MacroButtonMap = list.ToArray();
+                        }
+                    }
 
                     config.DisablePenButtons = bm.CheckBoxDisablePenButtons.IsChecked ?? false;
                     config.DisableTabletButtons = bm.CheckBoxDisableTabletButtons.IsChecked ?? false;
diff --git a/TabletDriverGUI/ShortcutMapWindow.xaml.cs b/TabletDriverGUI/ShortcutMapWindow.xaml.cs
index 392f2e8..4c9411c 100644
--- a/TabletDriverGUI/ShortcutMapWindow.xaml.cs
+++ b/TabletDriverGUI/ShortcutMapWindow.xaml.cs
@@ -21,9 +21,6 @@ namespace TabletDriverGUI
     /// </summary>
     public partial class ShortcutMapWindow : Window
     {
-        [DllImport("User32.Dll", EntryPoint = "PostMessageA")]
-        private static extern bool PostMessage(IntPtr hWnd, uint msg, int wParam, int lParam);
-
         public List<ModifierKeys>   ModifierKey;
         public Key                  PressedKey;
 
diff --git a/TabletDriverGUI/TabletDriverGUI.csproj b/TabletDriverGUI/TabletDriverGUI.csproj
index 89f8583..523c13e 100644
--- a/TabletDriverGUI/TabletDriverGUI.csproj
+++ b/TabletDriverGUI/TabletDriverGUI.csproj
@@ -80,6 +80,7 @@
     <Compile Include="ButtonMapping.xaml.cs">
       <DependentUpon>ButtonMapping.xaml</DependentUpon>
     </Compile>
+    <Compile Include="MacroButton.cs" />
     <Compile Include="ShortcutMapWindow.xaml.cs">
       <DependentUpon>ShortcutMapWindow.xaml</DependentUpon>
     </Compile>
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 530e578..52e3a2e 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -280,20 +280,34 @@ bool ProcessCommand(CommandLine *cmd) {
 	//
 	// Tablet buttons macro
 	//
-	else if (cmd->is("TabletMacro") && cmd->valueCount == 2) {
+	else if (cmd->is("TabletMacro")) {
+		//LOG_INFO("is equal before check: %d\n", cmd->is("TabletMacro"));
+		//LOG_INFO("cmd->command is: %s\n", cmd->command);
 		if (!CheckTablet()) return true;
-		int indexToBeAssigned = cmd->GetInt(0, -1);
-		string macroToBeAssigned = cmd->GetString(1, "undefined");
-
-		if (indexToBeAssigned != -1 && macroToBeAssigned != "undefined")
+		if (true)
 		{
-			tablet->buttonTabletMap[indexToBeAssigned] = macroToBeAssigned;
-			LOG_INFO("Set the macro '%s' to the tablet button [%d]", macroToBeAssigned, indexToBeAssigned);
+			std::vector<std::string> tempSplit = Utils::split(cmd->line.substr(12).c_str(), ';');
+			std::vector<std::vector<std::string>> tabletMacros;
+
+			for (auto &it : tempSplit)
+				tabletMacros.push_back(Utils::split(it, ','));
+
+			for (auto &it : tabletMacros)
+			{
+				std::vector<int> keysMacro;
+
+				for (int i = 0; i < it.size(); ++i)
+				{
+					if (i != 0)
+						keysMacro.push_back(std::stoi(it[i]));
+				}
+
+				tablet->buttonTabletMap[std::stoi(it[0])] = keysMacro;
+				LOG_INFO("Set the macro to the button [%d]\n", std::stoi(it[0]));
+			}
 		}
 		else
-		{
-			LOG_INFO("Invalid command for TabletMacro, try this instead: TabletMacro index_to_modify macro_to_assign");
-		}
+			LOG_INFO("Invalid command for TabletMacro, try this instead: TabletMacro macro_string\n");
 	}
 
 
diff --git a/TabletDriverService/ProcessCommand.h b/TabletDriverService/ProcessCommand.h
index d08308c..493d173 100644
--- a/TabletDriverService/ProcessCommand.h
+++ b/TabletDriverService/ProcessCommand.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "CommandLine.h"
+#include "Utils.h"
 
 bool ProcessCommand(CommandLine *cmd);
 bool ReadCommandFile(string filename);
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 8186696..97c5fc0 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -92,7 +92,6 @@ Tablet::Tablet() {
 
 	// Button map
 	memset(&buttonMap, 0, sizeof(buttonMap));
-	memset(&buttonTabletMap, 0, sizeof(buttonTabletMap));
 	buttonMap[0] = 1;
 	buttonMap[1] = 2;
 	buttonMap[2] = 3;
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 9fcd05b..6ac81eb 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <unordered_map>
 
 #include "USBDevice.h"
 #include "HIDDevice.h"
@@ -90,7 +91,7 @@ class Tablet {
 
 	// Button map
 	BYTE buttonMap[16];
-	string buttonTabletMap[16];
+	std::unordered_map<int, std::vector<int>> buttonTabletMap;
 
 	//
 	string name = "Unknown";
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index b176edc..ce153ec 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -177,6 +177,7 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="Tablet.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="USBDevice.h" />
+    <ClInclude Include="Utils.h" />
     <ClInclude Include="VMulti.h" />
   </ItemGroup>
   <ItemGroup>
@@ -194,6 +195,7 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="Main.cpp" />
+    <ClCompile Include="Utils.cpp" />
     <ClCompile Include="VMulti.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index 5f7116d..0d69b36 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -45,6 +45,9 @@
     <ClInclude Include="ProcessCommand.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -77,6 +80,9 @@
     <ClCompile Include="ProcessCommand.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Utils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
diff --git a/TabletDriverService/Utils.cpp b/TabletDriverService/Utils.cpp
new file mode 100644
index 0000000..9de7090
--- /dev/null
+++ b/TabletDriverService/Utils.cpp
@@ -0,0 +1,44 @@
+#include "stdafx.h"
+#include "Utils.h"
+
+
+Utils::Utils()
+{
+
+}
+
+
+Utils::~Utils()
+{
+
+}
+
+template<typename Out>
+void Utils::split(const std::string &s, char delim, Out result, bool addEmpty) {
+	std::stringstream ss;
+	ss.str(s);
+	std::string item;
+	while (std::getline(ss, item, delim)) {
+		if (item != "" || addEmpty)
+			*(result++) = item;
+	}
+}
+
+std::vector<std::string> Utils::split(const std::string &s, char delim, bool addEmpty) {
+	std::vector<std::string> elems;
+	split(s, delim, std::back_inserter(elems), addEmpty);
+	return elems;
+}
+
+std::string   Utils::join(std::vector<std::string> v, std::string j) {
+	std::string result = "";
+	int count = 0;
+	int size = v.size();
+	for (auto it = v.begin(); it != v.end(); it++) {
+		result += *it;
+		if (count < size - 1)
+			result += j;
+		count++;
+	}
+	return result;
+}
\ No newline at end of file
diff --git a/TabletDriverService/Utils.h b/TabletDriverService/Utils.h
new file mode 100644
index 0000000..d637b3d
--- /dev/null
+++ b/TabletDriverService/Utils.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <vector>
+#include <string>
+#include <sstream>
+
+class Utils
+{
+public:
+	Utils();
+	~Utils();
+
+	template<typename Out>
+	static void							split(const std::string &s, char delim, Out result, bool addEmpty = false);
+	static std::vector<std::string>		split(const std::string &s, char delim, bool addEmpty = false);
+
+	static std::string					join(std::vector<std::string>, std::string);
+};
+

From 6ffefd05e9acf8de639d09cf6b5ef6de6ba538ed Mon Sep 17 00:00:00 2001
From: Maxime Cauvin <maxime.cauvin@epitech.eu>
Date: Thu, 22 Mar 2018 17:20:03 +0100
Subject: [PATCH 08/11] TabletButtonHandling(feat/fix): Added shortcut
 functionnality and fixed buttonMap driver-side

---
 TabletDriverGUI/ButtonMapping.xaml.cs  | 83 +++++++++++++++++++++++++-
 TabletDriverService/ProcessCommand.cpp |  2 +-
 TabletDriverService/Tablet.cpp         |  6 +-
 TabletDriverService/Tablet.h           |  1 +
 TabletDriverService/Utils.cpp          | 32 ++++++++++
 TabletDriverService/Utils.h            |  2 +
 6 files changed, 121 insertions(+), 5 deletions(-)

diff --git a/TabletDriverGUI/ButtonMapping.xaml.cs b/TabletDriverGUI/ButtonMapping.xaml.cs
index 2bf1fd9..8446858 100644
--- a/TabletDriverGUI/ButtonMapping.xaml.cs
+++ b/TabletDriverGUI/ButtonMapping.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -174,6 +175,84 @@ private void CheckBoxDisableTabletButtons_Unchecked(object sender, RoutedEventAr
             TabletButtonsContainer.IsEnabled = true;
         }
 
+        private enum MapType : uint
+        {
+            MAPVK_VK_TO_VSC = 0x0,
+            MAPVK_VSC_TO_VK = 0x1,
+            MAPVK_VK_TO_CHAR = 0x2,
+            MAPVK_VSC_TO_VK_EX = 0x3,
+        }
+
+        [DllImport("user32.dll")]
+        private static extern int ToUnicode(
+            uint wVirtKey,
+            uint wScanCode,
+            byte[] lpKeyState,
+            [Out, MarshalAs(UnmanagedType.LPWStr, SizeParamIndex = 4)]
+            StringBuilder pwszBuff,
+            int cchBuff,
+            uint wFlags);
+
+        [DllImport("user32.dll")]
+        private static extern bool GetKeyboardState(byte[] lpKeyState);
+
+        [DllImport("user32.dll")]
+        private static extern uint MapVirtualKey(uint uCode, MapType uMapType);
+
+        private char GetVKFromModifierKey(ModifierKeys modifierKey)
+        {
+            char ch = '\0';
+
+            switch (modifierKey)
+            {
+                case ModifierKeys.Control:
+                    ch = (char)0x11;
+                    break;
+                case ModifierKeys.Shift:
+                    ch = (char)0x10;
+                    break;
+                case ModifierKeys.Alt:
+                    ch = (char)0x12;
+                    break;
+                case ModifierKeys.Windows:
+                    ch = (char)0x5B;
+                    break;
+            }
+            return ch;
+        }
+
+        private char GetCharFromKey(Key key)
+        {
+            char ch = '\0';
+
+            int virtualKey = KeyInterop.VirtualKeyFromKey(key);
+            byte[] keyboardState = new byte[256];
+            GetKeyboardState(keyboardState);
+
+            uint scanCode = MapVirtualKey((uint)virtualKey, MapType.MAPVK_VK_TO_VSC);
+            StringBuilder stringBuilder = new StringBuilder(2);
+
+            int result = ToUnicode((uint)virtualKey, scanCode, keyboardState, stringBuilder, stringBuilder.Capacity, 0);
+            switch (result)
+            {
+                case -1:
+                    break;
+                case 0:
+                    break;
+                case 1:
+                    {
+                        ch = stringBuilder[0];
+                        break;
+                    }
+                default:
+                    {
+                        ch = stringBuilder[0];
+                        break;
+                    }
+            }
+            return ch;
+        }
+
         private void PromptShortcutWindowEvent(object sender, EventArgs e)
         {
             PromptShortcutWindow(sender);
@@ -203,8 +282,8 @@ private void PromptShortcutWindow(object sender)
                     List<int> l = new List<int>();
 
                     for (var i = 0; i < shortcutMapWindow.ModifierKey.Count; ++i)
-                        l.Add((int)shortcutMapWindow.ModifierKey[i]);
-                    l.Add((int)shortcutMapWindow.PressedKey);
+                        l.Add(GetVKFromModifierKey(shortcutMapWindow.ModifierKey[i]));
+                    l.Add(GetCharFromKey(shortcutMapWindow.PressedKey));
                     if (shortcutMapWindow.PressedKey == Key.None)
                         cb.SelectedIndex = (int)ButtonActionEnum.DISABLED;
                     MacroButtonMap[idx] = l.ToArray();
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 2d054ec..469be2b 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -288,7 +288,7 @@ bool ProcessCommand(CommandLine *cmd) {
 		if(!CheckTablet()) return true;
 		char buttonMapBuffer[32];
 		int index = 0;
-		for(int i = 0; i < 8; i++) {
+		for(int i = 0; i < 9; i++) {
 			tablet->buttonMap[i] = cmd->GetInt(i, tablet->buttonMap[i]);
 			index += sprintf_s(buttonMapBuffer + index, 32 - index, "%d ", tablet->buttonMap[i]);
 		}
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 2ae562e..65ae16e 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -364,14 +364,16 @@ int Tablet::ReadPosition() {
 	state.buttons = 0;
 	for(buttonIndex = 0; buttonIndex < sizeof(buttonMap); buttonIndex++) {
 
-		// Button is set
-		if(buttonMap[buttonIndex] > 0) {
+		// Button is set (not a macro)
+		if(buttonMap[buttonIndex] > 0 && buttonMap[buttonIndex] < 6) {
 
 			// Button is pressed
 			if((reportData.buttons & (1 << buttonIndex)) > 0) {
 				state.buttons |= (1 << (buttonMap[buttonIndex] - 1));
 			}
 		}
+		else if (buttonMap[buttonIndex] == 6)
+			Utils::keyboardShortcutPress(buttonTabletMap[buttonIndex]);
 	}
 
 	// Convert report data to state
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 36ada3b..909ba13 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -5,6 +5,7 @@
 
 #include "USBDevice.h"
 #include "HIDDevice.h"
+#include "Utils.h"
 
 using namespace std;
 
diff --git a/TabletDriverService/Utils.cpp b/TabletDriverService/Utils.cpp
index 9de7090..c86d537 100644
--- a/TabletDriverService/Utils.cpp
+++ b/TabletDriverService/Utils.cpp
@@ -41,4 +41,36 @@ std::string   Utils::join(std::vector<std::string> v, std::string j) {
 		count++;
 	}
 	return result;
+}
+
+void		Utils::keyboardShortcutPress(std::vector<int> const& keys)
+{
+	std::vector<INPUT> keyPress;
+
+	for (auto it : keys)
+	{
+		INPUT ip;
+
+		ip.type = INPUT_KEYBOARD;
+		ip.ki.wScan = 0;
+		ip.ki.time = 0;
+		ip.ki.dwExtraInfo = 0;
+
+		if (it == VK_CONTROL || it == VK_SHIFT || it == VK_MENU || it == VK_LWIN || it == VK_RWIN)
+			ip.ki.wVk = it;
+		else
+			ip.ki.wVk = VkKeyScan(it);
+		ip.ki.dwFlags = 0;
+
+		keyPress.push_back(ip);
+	}
+	for (auto it : keyPress)
+	{
+		SendInput(1, &it, sizeof(INPUT));
+	}
+	for (int i = 0; i < keyPress.size(); ++i)
+	{
+		keyPress[i].ki.dwFlags = KEYEVENTF_KEYUP;
+		SendInput(1, &keyPress[i], sizeof(INPUT));
+	}
 }
\ No newline at end of file
diff --git a/TabletDriverService/Utils.h b/TabletDriverService/Utils.h
index d637b3d..e35311c 100644
--- a/TabletDriverService/Utils.h
+++ b/TabletDriverService/Utils.h
@@ -15,5 +15,7 @@ class Utils
 	static std::vector<std::string>		split(const std::string &s, char delim, bool addEmpty = false);
 
 	static std::string					join(std::vector<std::string>, std::string);
+
+	static void							keyboardShortcutPress(std::vector<int> const& keys);
 };
 

From bfae0c2956ca9b9dbdadb2301a56b33829deb943 Mon Sep 17 00:00:00 2001
From: Maxime Cauvin <maxime.cauvin@epitech.eu>
Date: Thu, 22 Mar 2018 17:28:15 +0100
Subject: [PATCH 09/11] TabletButtonHandling(refactor): Simplifying code when
 converting into VirtualKey value

---
 TabletDriverGUI/ButtonMapping.xaml.cs | 48 ++++++---------------------
 TabletDriverService/Utils.cpp         |  5 +--
 2 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/TabletDriverGUI/ButtonMapping.xaml.cs b/TabletDriverGUI/ButtonMapping.xaml.cs
index 8446858..e2c061c 100644
--- a/TabletDriverGUI/ButtonMapping.xaml.cs
+++ b/TabletDriverGUI/ButtonMapping.xaml.cs
@@ -199,58 +199,32 @@ private static extern int ToUnicode(
         [DllImport("user32.dll")]
         private static extern uint MapVirtualKey(uint uCode, MapType uMapType);
 
-        private char GetVKFromModifierKey(ModifierKeys modifierKey)
+        private int GetVKFromModifierKey(ModifierKeys modifierKey)
         {
-            char ch = '\0';
+            int ch = 0;
 
             switch (modifierKey)
             {
                 case ModifierKeys.Control:
-                    ch = (char)0x11;
+                    ch = 0x11;
                     break;
                 case ModifierKeys.Shift:
-                    ch = (char)0x10;
+                    ch = 0x10;
                     break;
                 case ModifierKeys.Alt:
-                    ch = (char)0x12;
+                    ch = 0x12;
                     break;
                 case ModifierKeys.Windows:
-                    ch = (char)0x5B;
+                    ch = 0x5B;
                     break;
             }
-            return ch;
+            
+            return (ch);
         }
 
-        private char GetCharFromKey(Key key)
+        private int GetVKFromKey(Key key)
         {
-            char ch = '\0';
-
-            int virtualKey = KeyInterop.VirtualKeyFromKey(key);
-            byte[] keyboardState = new byte[256];
-            GetKeyboardState(keyboardState);
-
-            uint scanCode = MapVirtualKey((uint)virtualKey, MapType.MAPVK_VK_TO_VSC);
-            StringBuilder stringBuilder = new StringBuilder(2);
-
-            int result = ToUnicode((uint)virtualKey, scanCode, keyboardState, stringBuilder, stringBuilder.Capacity, 0);
-            switch (result)
-            {
-                case -1:
-                    break;
-                case 0:
-                    break;
-                case 1:
-                    {
-                        ch = stringBuilder[0];
-                        break;
-                    }
-                default:
-                    {
-                        ch = stringBuilder[0];
-                        break;
-                    }
-            }
-            return ch;
+            return (KeyInterop.VirtualKeyFromKey(key));
         }
 
         private void PromptShortcutWindowEvent(object sender, EventArgs e)
@@ -283,7 +257,7 @@ private void PromptShortcutWindow(object sender)
 
                     for (var i = 0; i < shortcutMapWindow.ModifierKey.Count; ++i)
                         l.Add(GetVKFromModifierKey(shortcutMapWindow.ModifierKey[i]));
-                    l.Add(GetCharFromKey(shortcutMapWindow.PressedKey));
+                    l.Add(GetVKFromKey(shortcutMapWindow.PressedKey));
                     if (shortcutMapWindow.PressedKey == Key.None)
                         cb.SelectedIndex = (int)ButtonActionEnum.DISABLED;
                     MacroButtonMap[idx] = l.ToArray();
diff --git a/TabletDriverService/Utils.cpp b/TabletDriverService/Utils.cpp
index c86d537..4f13aec 100644
--- a/TabletDriverService/Utils.cpp
+++ b/TabletDriverService/Utils.cpp
@@ -56,10 +56,7 @@ void		Utils::keyboardShortcutPress(std::vector<int> const& keys)
 		ip.ki.time = 0;
 		ip.ki.dwExtraInfo = 0;
 
-		if (it == VK_CONTROL || it == VK_SHIFT || it == VK_MENU || it == VK_LWIN || it == VK_RWIN)
-			ip.ki.wVk = it;
-		else
-			ip.ki.wVk = VkKeyScan(it);
+		ip.ki.wVk = it;
 		ip.ki.dwFlags = 0;
 
 		keyPress.push_back(ip);

From 85175158c5c9f664f3c43dec415807a40aaf7f41 Mon Sep 17 00:00:00 2001
From: Maxime Cauvin <maxime.cauvin@epitech.eu>
Date: Fri, 23 Mar 2018 19:53:00 +0100
Subject: [PATCH 10/11] MacroShortcutFix(fix): Macro shortcut fixed

---
 TabletDriverService/ProcessCommand.cpp |  2 +-
 TabletDriverService/Tablet.cpp         | 11 ++++++++++-
 TabletDriverService/Tablet.h           |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 469be2b..6640812 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -322,7 +322,7 @@ bool ProcessCommand(CommandLine *cmd) {
 						keysMacro.push_back(std::stoi(it[i]));
 				}
 
-				tablet->buttonTabletMap[std::stoi(it[0])] = keysMacro;
+				tablet->buttonMacroMap[std::stoi(it[0])] = std::make_pair(keysMacro, false);
 				LOG_INFO("Set the macro to the button [%d]\n", std::stoi(it[0]));
 			}
 		}
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 65ae16e..a3ca3bc 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -373,7 +373,16 @@ int Tablet::ReadPosition() {
 			}
 		}
 		else if (buttonMap[buttonIndex] == 6)
-			Utils::keyboardShortcutPress(buttonTabletMap[buttonIndex]);
+		{
+			if ((reportData.buttons & (1 << buttonIndex)) > 0)
+			{
+				if (!buttonMacroMap[buttonIndex].second)
+					Utils::keyboardShortcutPress(buttonMacroMap[buttonIndex].first);
+				buttonMacroMap[buttonIndex].second = true;
+			}
+			else
+				buttonMacroMap[buttonIndex].second = false;
+		}
 	}
 
 	// Convert report data to state
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 909ba13..16e3221 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -107,7 +107,7 @@ class Tablet {
 
 	// Button map
 	BYTE buttonMap[16];
-	std::unordered_map<int, std::vector<int>> buttonTabletMap;
+	std::unordered_map<int, std::pair<std::vector<int>, bool>> buttonMacroMap;
 
 	//
 	string name = "Unknown";

From 15f26962406b7dc92bd79744cce24a4231565b59 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 24 Mar 2018 01:54:54 +0200
Subject: [PATCH 11/11] Wacom 480 auxiliary example

---
 TabletDriverService/Main.cpp           | 61 +++++++++++++++++++++++---
 TabletDriverService/ProcessCommand.cpp | 26 +++++++----
 TabletDriverService/Tablet.cpp         | 18 +++-----
 TabletDriverService/Tablet.h           |  2 +-
 TabletDriverService/TabletSettings.cpp |  1 +
 TabletDriverService/TabletSettings.h   |  7 +++
 TabletDriverService/Utils.cpp          |  2 +-
 TabletDriverService/config/tablet.cfg  |  2 +
 8 files changed, 89 insertions(+), 30 deletions(-)

diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index cf266f1..861cd00 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -23,7 +23,7 @@ Tablet *tablet;
 VMulti *vmulti;
 ScreenMapper *mapper;
 thread *tabletThread;
-thread *tabletButtonThread;
+thread *tabletAuxThread;
 
 //
 // Init console parameters
@@ -40,7 +40,7 @@ void InitConsole() {
 }
 
 //
-// Tablet process
+// Tablet thread
 //
 void RunTabletThread() {
 	int status;
@@ -161,10 +161,53 @@ void RunTabletThread() {
 
 }
 
-void RunTabletButtonThread() {
-	while (true)
-	{
+//
+// Tablet auxiliary thread
+//
+void RunTabletAuxThread() {
+
+	BYTE buffer[256];
+	int status;
+
+	while(true) {
+
+		//
+		// Wacom 480 aux
+		//
+		if(tablet->settings.auxType == TabletSettings::AuxWacom480) {
+
+			// Read 64 bytes from the HID device
+			status = tablet->hidDeviceAux->Read(buffer, 64);
+			if(status < 0) {
+				LOG_ERROR("HID auxiliary device error!\n");
+				break;
+			}
 
+			//LOG_DEBUGBUFFER(buffer, 16, "AUX: ");
+
+			// Report Id == 2?
+			if(buffer[0] == 0x02) {
+
+				// Loop through packet items
+				for(int offset = 2; offset < 64; offset += 8) {
+
+					// Buttons
+					if(buffer[offset] == 0x80) {
+						BYTE buttons = buffer[3];
+						LOG_DEBUG("Aux buttons: %02X\n", buttons);
+					}
+
+					// Touch (max 16 points)
+					if(buffer[offset] >= 2 && buffer[offset] <= 17) {
+						BYTE touchIndex = buffer[offset] - 1;
+
+						int touchX = (buffer[offset + 2] << 4) | (buffer[offset + 4] >> 4);
+						int touchY = (buffer[offset + 3] << 4) | (buffer[offset + 4] & 0x0f);
+						LOG_DEBUG("Aux Touch(%02X): % 5d, % 5d\n", touchIndex, touchX, touchY);
+					}
+				}
+			}
+		}
 	}
 }
 
@@ -259,7 +302,7 @@ int main(int argc, char**argv) {
 	vmulti = NULL;
 	tablet = NULL;
 	tabletThread = NULL;
-	tabletButtonThread = NULL;
+	tabletAuxThread = NULL;
 
 	// Init console
 	InitConsole();
@@ -352,7 +395,11 @@ int main(int argc, char**argv) {
 
 				// Start the tablet thread
 				tabletThread = new thread(RunTabletThread);
-				tabletButtonThread = new thread(RunTabletButtonThread);
+
+				// Start the tablet auxiliary thread
+				if(tablet->hidDeviceAux != NULL) {
+					tabletAuxThread = new thread(RunTabletAuxThread);
+				}
 
 				LOG_INFO("TabletDriver started!\n");
 				LogStatus();
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 612dd64..8e5506b 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -97,22 +97,30 @@ bool ProcessCommand(CommandLine *cmd) {
 	}
 
 
-	// HID Device 2
-	else if(cmd->is("HID2")) {
+	// HID Auxiliary Device
+	else if(cmd->is("HIDAux")) {
+		if(tablet == NULL) return false;
 
-		if(cmd->valueCount == 4) {
+		if(cmd->valueCount == 5) {
 			USHORT vendorID = cmd->GetInt(0, 0);
 			USHORT productID = cmd->GetInt(1, 0);
 			USHORT usagePage = cmd->GetInt(2, 0);
 			USHORT usage = cmd->GetInt(3, 0);
-			if(tablet->hidDevice2 == NULL) {
-				tablet->hidDevice2 = new HIDDevice(vendorID, productID, usagePage, usage);
-				if(tablet->hidDevice2->isOpen) {
+			string auxTypeString = cmd->GetStringLower(4, "");
+			if(tablet->hidDeviceAux == NULL) {
+				tablet->hidDeviceAux = new HIDDevice(vendorID, productID, usagePage, usage);
+				if(tablet->hidDeviceAux->isOpen) {
 					LOG_INFO("HID Device found!\n");
+
+					// Aux Wacom 480
+					if(auxTypeString == "wacom480") {
+						tablet->settings.auxType = TabletSettings::AuxWacom480;
+					}
+
 				} else {
 					LOG_ERROR("Can't open HID device 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
-					delete tablet->hidDevice2;
-					tablet->hidDevice2 = NULL;
+					delete tablet->hidDeviceAux;
+					tablet->hidDeviceAux = NULL;
 				}
 			}
 		}
@@ -322,7 +330,7 @@ bool ProcessCommand(CommandLine *cmd) {
 			{
 				std::vector<int> keysMacro;
 
-				for (int i = 0; i < it.size(); ++i)
+				for (int i = 0; i < (int)it.size(); ++i)
 				{
 					if (i != 0)
 						keysMacro.push_back(std::stoi(it[i]));
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 3d7cae2..7d8006d 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -31,14 +31,6 @@ Tablet::Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage
 		delete hidDevice;
 		hidDevice = NULL;
 	}
-	hidDevice2 = new HIDDevice(vendorId, productId, usagePage, usage);
-	if (hidDevice2->isOpen) {
-		this->isOpen = true;
-	}
-	else {
-		delete hidDevice2;
-		hidDevice2 = NULL;
-	}
 }
 
 //
@@ -49,7 +41,7 @@ Tablet::Tablet() {
 	name = "Unknown";
 	usbDevice = NULL;
 	hidDevice = NULL;
-	hidDevice2 = NULL;
+	hidDeviceAux = NULL;
 
 	usbPipeId = 0;
 
@@ -95,8 +87,8 @@ Tablet::~Tablet() {
 		delete usbDevice;
 	if(hidDevice != NULL)
 		delete hidDevice;
-	if(hidDevice2 != NULL)
-		delete hidDevice2;
+	if(hidDeviceAux != NULL)
+		delete hidDeviceAux;
 	if(initReport != NULL)
 		delete initReport;
 	if(initFeature != NULL)
@@ -323,7 +315,9 @@ void Tablet::CloseDevice() {
 			usbDevice->CloseDevice();
 		} else if(hidDevice != NULL) {
 			hidDevice->CloseDevice();
-			hidDevice2->CloseDevice();
+			if(hidDeviceAux != NULL) {
+				hidDeviceAux->CloseDevice();
+			}
 		}
 	}
 	isOpen = false;
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 1c1de4d..6d50e04 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -19,7 +19,7 @@ class Tablet {
 
 	USBDevice * usbDevice;
 	HIDDevice * hidDevice;
-	HIDDevice * hidDevice2;
+	HIDDevice * hidDeviceAux;
 	int usbPipeId;
 
 	//
diff --git a/TabletDriverService/TabletSettings.cpp b/TabletDriverService/TabletSettings.cpp
index 228cc6c..96539c2 100644
--- a/TabletDriverService/TabletSettings.cpp
+++ b/TabletDriverService/TabletSettings.cpp
@@ -18,6 +18,7 @@ TabletSettings::TabletSettings() {
 	height = 1;
 	skew = 0;
 	type = TabletNormal;
+	auxType = AuxUnknown;
 }
 
 //
diff --git a/TabletDriverService/TabletSettings.h b/TabletDriverService/TabletSettings.h
index f667af7..57b0133 100644
--- a/TabletDriverService/TabletSettings.h
+++ b/TabletDriverService/TabletSettings.h
@@ -8,6 +8,12 @@ class TabletSettings {
 		TypeWacom4100
 	};
 
+
+	enum TabletAuxType {
+		AuxUnknown,
+		AuxWacom480
+	};
+
 	BYTE buttonMask;
 	int maxX;
 	int maxY;
@@ -20,6 +26,7 @@ class TabletSettings {
 	int reportLength;
 	double skew;
 	TabletType type;
+	TabletAuxType auxType;
 
 	TabletSettings();
 	~TabletSettings();
diff --git a/TabletDriverService/Utils.cpp b/TabletDriverService/Utils.cpp
index 4f13aec..b8b1496 100644
--- a/TabletDriverService/Utils.cpp
+++ b/TabletDriverService/Utils.cpp
@@ -65,7 +65,7 @@ void		Utils::keyboardShortcutPress(std::vector<int> const& keys)
 	{
 		SendInput(1, &it, sizeof(INPUT));
 	}
-	for (int i = 0; i < keyPress.size(); ++i)
+	for (int i = 0; i < (int)keyPress.size(); ++i)
 	{
 		keyPress[i].ki.dwFlags = KEYEVENTF_KEYUP;
 		SendInput(1, &keyPress[i], sizeof(INPUT));
diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index b0646f3..6107cdb 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -117,6 +117,7 @@ InitFeature 0x02 0x02
 # Wacom CTL-480
 #
 Tablet 0x056a 0x030e 0xFF0D 0x0001
+HIDAux 0x056a 0x030e 0xFF00 0x0080 Wacom480
 Name "Wacom CTL-480"
 ReportId 0x02
 ReportLength 10
@@ -133,6 +134,7 @@ InitFeature 0x02 0x02
 # Wacom CTH-480
 #
 Tablet 0x056a 0x0302 0xFF0D 0x0001
+HIDAux 0x056a 0x0302 0xFF00 0x0080 Wacom480
 Name "Wacom CTH-480"
 ReportId 0x02
 ReportLength 10