View difference between Paste ID: bjmp8T56 and Rqg40ueh

 diff -Nuar g15daemon-1.9.5.3.orig/g15daemon/utility_funcs.c g15daemon-1.9.5.3/g15daemon/utility_funcs.c
 --- g15daemon-1.9.5.3.orig/g15daemon/utility_funcs.c	2008-01-26 07:02:07.000000000 +0200
 +++ g15daemon-1.9.5.3/g15daemon/utility_funcs.c	2011-11-09 09:19:43.000000000 +0200
 @@ -356,7 +356,7 @@
      config_items_t * item=NULL;
      char line[1024];
 
 -    config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC);
 +    config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC, 0644);
      if(config_fd){
      snprintf(line,1024,"# G15Daemon Configuration File\n# any items entered before a [section] header\n# will be in the Global config space\n# comments you wish to keep should start with a semicolon';'\n");
      write(config_fd,line,strlen(line));
 
 --- g15daemon-1.9.5.3.orig/libg15daemon_client/g15daemon_net.c
 +++ g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c
 @@ -217,7 +217,7 @@
      if(poll(pfd,1,100)>0){
         if(pfd[0].revents & POLLPRI && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL)) {
               memset(packet,0,sizeof(packet));
 -             msgret = recv(sock, packet, 10 , MSG_OOB);
 +             msgret = recv(sock, packet, sizeof(packet) , MSG_OOB);
               if (msgret < 1) {
                    return -1;
                }
 --- a/plugins/g15_plugin_uinput.c   2008-01-24 12:51:07.000000000 +0000
 +++ b/plugins/g15_plugin_uinput.c   2014-05-09 09:34:44.000000000 +0000
 @@ -46,6 +46,12 @@
  static int uinp_fd = -1;
  static config_section_t *uinput_cfg=NULL;
  static int map_Lkeys = 0;
 +static int vol_state = 0;
 +static int mkey_state = 0;
 +static int mr_state = 0;
 +static unsigned int mled_state = G15_LED_M1;
 +/*mkey state 0,1 and 2 = M1, M2 and M3*/
 +
 
  #define GKEY_OFFSET 167
  #define MKEY_OFFSET 185
 @@ -125,6 +129,16 @@
      event.value = G15KEY_DOWN;
 
      write (uinp_fd, &event, sizeof(event));
 +
 +    /* Need to write sync event */
 +    memset(&event, 0, sizeof(event));
 +
 +    event.type = EV_SYN;
 +    event.code = SYN_REPORT;
 +    event.value = 0;
 +
 +    write(uinp_fd, &event, sizeof(event));
 +
  }
 
  static void g15_uinput_keyup(unsigned char code)
 @@ -137,8 +151,17 @@
      event.value = G15KEY_UP;
 
      write (uinp_fd, &event, sizeof(event));
 -}
 
 +    /* Need to write sync event */
 +    memset(&event, 0, sizeof(event));
 +
 +    event.type = EV_SYN;
 +    event.code = SYN_REPORT;
 +    event.value = 0;
 +
 +    write(uinp_fd, &event, sizeof(event));
 +
 +}
      void (*keyup)(unsigned char code) = &g15_uinput_keyup;
      void (*keydown)(unsigned char code) = &g15_uinput_keydown;
  #else
 @@ -147,151 +170,406 @@
  #endif
  #endif
 
 +/*The layout of the 'G' keys is now hard-coded here below. See /usr/include/linux/input.h for details on the keys you can use*/
  static void g15_process_keys(g15daemon_t *masterlist, unsigned int currentkeys, unsigned int lastkeys)
  {
 -    /* 'G' keys */
 -    if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
 -        keydown(GKEY_OFFSET);
 -    else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
 -        keyup(GKEY_OFFSET);
 -
 -    if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
 -        keydown(GKEY_OFFSET+1);
 -    else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
 -        keyup(GKEY_OFFSET+1);
 -
 -    if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
 -        keydown(GKEY_OFFSET+2);
 -    else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
 -        keyup(GKEY_OFFSET+2);
 -
 -    if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
 -        keydown(GKEY_OFFSET+3);
 -    else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
 -        keyup(GKEY_OFFSET+3);
 -
 -    if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
 -        keydown(GKEY_OFFSET+4);
 -    else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
 -        keyup(GKEY_OFFSET+4);
 -
 -    if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
 -        keydown(GKEY_OFFSET+5);
 -    else if(!(currentkeys & G15_KEY_G6) && (lastkeys & G15_KEY_G6))
 -        keyup(GKEY_OFFSET+5);
 -
 -    if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
 -        keydown(GKEY_OFFSET+6);
 -    else if(!(currentkeys & G15_KEY_G7) && (lastkeys & G15_KEY_G7))
 -        keyup(GKEY_OFFSET+6);
 -
 -    if((currentkeys & G15_KEY_G8) && !(lastkeys & G15_KEY_G8))
 -        keydown(GKEY_OFFSET+7);
 -    else if(!(currentkeys & G15_KEY_G8) && (lastkeys & G15_KEY_G8))
 -        keyup(GKEY_OFFSET+7);
 -
 -    if((currentkeys & G15_KEY_G9) && !(lastkeys & G15_KEY_G9))
 -        keydown(GKEY_OFFSET+8);
 -    else if(!(currentkeys & G15_KEY_G9) && (lastkeys & G15_KEY_G9))
 -        keyup(GKEY_OFFSET+8);
 -
 -    if((currentkeys & G15_KEY_G10) && !(lastkeys & G15_KEY_G10))
 -        keydown(GKEY_OFFSET+9);
 -    else if(!(currentkeys & G15_KEY_G10) && (lastkeys & G15_KEY_G10))
 -        keyup(GKEY_OFFSET+9);
 -
 -    if((currentkeys & G15_KEY_G11) && !(lastkeys & G15_KEY_G11))
 -        keydown(GKEY_OFFSET+10);
 -    else if(!(currentkeys & G15_KEY_G11) && (lastkeys & G15_KEY_G11))
 -        keyup(GKEY_OFFSET+10);
 -
 -    if((currentkeys & G15_KEY_G12) && !(lastkeys & G15_KEY_G12))
 -        keydown(GKEY_OFFSET+11);
 -    else if(!(currentkeys & G15_KEY_G12) && (lastkeys & G15_KEY_G12))
 -        keyup(GKEY_OFFSET+11);
 -
 -    if((currentkeys & G15_KEY_G13) && !(lastkeys & G15_KEY_G13))
 -        keydown(GKEY_OFFSET+12);
 -    else if(!(currentkeys & G15_KEY_G13) && (lastkeys & G15_KEY_G13))
 -        keyup(GKEY_OFFSET+12);
 -
 -    if((currentkeys & G15_KEY_G14) && !(lastkeys & G15_KEY_G14))
 -        keydown(GKEY_OFFSET+13);
 -    else if(!(currentkeys & G15_KEY_G14) && (lastkeys & G15_KEY_G14))
 -        keyup(GKEY_OFFSET+13);
 -
 -    if((currentkeys & G15_KEY_G15) && !(lastkeys & G15_KEY_G15))
 -        keydown(GKEY_OFFSET+14);
 -    else if(!(currentkeys & G15_KEY_G15) && (lastkeys & G15_KEY_G15))
 -        keyup(GKEY_OFFSET+14);
 -
 -    if((currentkeys & G15_KEY_G16) && !(lastkeys & G15_KEY_G16))
 -        keydown(GKEY_OFFSET+15);
 -    else if(!(currentkeys & G15_KEY_G16) && (lastkeys & G15_KEY_G16))
 -        keyup(GKEY_OFFSET+15);
 -
 -    if((currentkeys & G15_KEY_G17) && !(lastkeys & G15_KEY_G17))
 -        keydown(GKEY_OFFSET+16);
 -    else if(!(currentkeys & G15_KEY_G17) && (lastkeys & G15_KEY_G17))
 -        keyup(GKEY_OFFSET+16);
 -
 -    if((currentkeys & G15_KEY_G18) && !(lastkeys & G15_KEY_G18))
 -        keydown(GKEY_OFFSET+17);
 -    else if(!(currentkeys & G15_KEY_G18) && (lastkeys & G15_KEY_G18))
 -        keyup(GKEY_OFFSET+17);
 -
 -    /* 'M' keys */
 -
 -    if((currentkeys & G15_KEY_M1) && !(lastkeys & G15_KEY_M1))
 -        keydown(MKEY_OFFSET);
 -    else if(!(currentkeys & G15_KEY_M1) && (lastkeys & G15_KEY_M1))
 -        keyup(MKEY_OFFSET);
 -
 -    if((currentkeys & G15_KEY_M2) && !(lastkeys & G15_KEY_M2))
 -        keydown(MKEY_OFFSET+1);
 -    else if(!(currentkeys & G15_KEY_M2) && (lastkeys & G15_KEY_M2))
 -        keyup(MKEY_OFFSET+1);
 -
 -    if((currentkeys & G15_KEY_M3) && !(lastkeys & G15_KEY_M3))
 -        keydown(MKEY_OFFSET+2);
 -    else if(!(currentkeys & G15_KEY_M3) && (lastkeys & G15_KEY_M3))
 -        keyup(MKEY_OFFSET+2);
 -
 -    if((currentkeys & G15_KEY_MR) && !(lastkeys & G15_KEY_MR))
 -        keydown(MKEY_OFFSET+3);
 -    else if(!(currentkeys & G15_KEY_MR) && (lastkeys & G15_KEY_MR))
 -        keyup(MKEY_OFFSET+3);
 -
 -    if(map_Lkeys){
 -        /* 'L' keys...  */
 -        if((currentkeys & G15_KEY_L1) && !(lastkeys & G15_KEY_L1))
 -            keydown(LKEY_OFFSET);
 -        else if(!(currentkeys & G15_KEY_L1) && (lastkeys & G15_KEY_L1))
 -            keyup(LKEY_OFFSET);
 -
 -        if((currentkeys & G15_KEY_L2) && !(lastkeys & G15_KEY_L2))
 -            keydown(LKEY_OFFSET+1);
 -        else if(!(currentkeys & G15_KEY_L2) && (lastkeys & G15_KEY_L2))
 -            keyup(LKEY_OFFSET+1);
 -
 -        if((currentkeys & G15_KEY_L3) && !(lastkeys & G15_KEY_L3))
 -            keydown(LKEY_OFFSET+2);
 -        else if(!(currentkeys & G15_KEY_L3) && (lastkeys & G15_KEY_L3))
 -            keyup(LKEY_OFFSET+2);
 -
 -        if((currentkeys & G15_KEY_L4) && !(lastkeys & G15_KEY_L4))
 -            keydown(LKEY_OFFSET+3);
 -        else if(!(currentkeys & G15_KEY_L4) && (lastkeys & G15_KEY_L4))
 -            keyup(LKEY_OFFSET+3);
 -
 -        if((currentkeys & G15_KEY_L5) && !(lastkeys & G15_KEY_L5))
 -            keydown(LKEY_OFFSET+4);
 -        else if(!(currentkeys & G15_KEY_L5) && (lastkeys & G15_KEY_L5))
 -            keyup(LKEY_OFFSET+4);
 +    if(!(currentkeys & G15_KEY_LIGHT))
 +    {
 +    /*Note: ALL system(""); commands will be run as root as g15daemon needs to be activated by root. Use "su USERNAME -c command" to avoid it.
 +    also if a command is run from terminal that would post output into the terminal the ability to run commands will hang. to avoid that add "& disown" to command*/
 +    /*Note2: There's a bug with detecting key release; this means that sometimes if you use key-release function to release the keys, the key will be "stuck" down until you press it again
 +    that's why I only use the key-release functionality for macros where I need to be able to hold down the button (like tab-switching)*/
 +    switch(mkey_state)
 +    {
 +        //M1 and the default layout (This one i use for commands while in X.
 +        case 0:
 +        {
 +/*M1*/      /*G Keys 1-6 open folders i use all the time.*/
 +/*M1*/      if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
 +/*M1*/          system("sudo -H -u '#1000' dbus-launch thunar /mnt/Storage/Anime & disown");
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
 +/*M1*/          system("sudo -H -u '#1000' dbus-launch thunar /mnt/Storage/Biomyndir & disown");
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
 +/*M1*/          system("sudo -H -u '#1000' dbus-launch thunar /mnt/Storage/Music & disown");
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
 +/*M1*/          system("sudo -H -u '#1000' dbus-launch thunar /mnt/Storage/Downloads & disown");
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
 +/*M1*/          system("sudo -H -u '#1000' dbus-launch thunar /mnt/Storage/Art & disown");
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
-+/*M1*/          system("sudo -H -u '#1000' dbus-launch thunar /mnt/Storage/Hentai & disown");
++/*M1*/          system("sudo -H -u '#1000' dbus-launch thunar $HOME/ & disown");
 +/*M1*/
 +/*M1*/
 +/*M1*/          /*G Keys 7-12* Switch workspaces 1-6 with Win(META)+F1-F6 keys.*/
 +/*M1*/      if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
 +/*M1*/          {keydown(KEY_LEFTMETA);keydown(KEY_F1);keyup(KEY_F1);keyup(KEY_LEFTMETA);}
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G8) && !(lastkeys & G15_KEY_G8))
 +/*M1*/          {keydown(KEY_LEFTMETA);keydown(KEY_F2);keyup(KEY_F2);keyup(KEY_LEFTMETA);}
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G9) && !(lastkeys & G15_KEY_G9))
 +/*M1*/          {keydown(KEY_LEFTMETA);keydown(KEY_F3);keyup(KEY_F3);keyup(KEY_LEFTMETA);}
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G10) && !(lastkeys & G15_KEY_G10))
 +/*M1*/          {keydown(KEY_LEFTMETA);keydown(KEY_F4);keyup(KEY_F4);keyup(KEY_LEFTMETA);}
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G11) && !(lastkeys & G15_KEY_G11))
 +/*M1*/          {keydown(KEY_LEFTMETA);keydown(KEY_F5);keyup(KEY_F5);keyup(KEY_LEFTMETA);}
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G12) && !(lastkeys & G15_KEY_G12))
 +/*M1*/          {keydown(KEY_LEFTMETA);keydown(KEY_F6);keyup(KEY_F6);keyup(KEY_LEFTMETA);}
 +/*M1*/
 +/*M1*/
 +/*M1*/      /*G Keys 13-18 13(Close Tab) 16(Mouseclick(via terminal)) 14(Alt+F4) 17(Open Terminal) 15 and 18 (Next/Prev tab, Ctrl+PgUp/PgDn)*/
 +/*M1*/      if((currentkeys & G15_KEY_G13) && !(lastkeys & G15_KEY_G13))
 +/*M1*/          {keydown(KEY_LEFTCTRL);keydown(KEY_W);keyup(KEY_W);keyup(KEY_LEFTCTRL);}
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G14) && !(lastkeys & G15_KEY_G14))
 +/*M1*/          {keydown(KEY_LEFTALT);keydown(KEY_F4);keyup(KEY_F4);keyup(KEY_LEFTALT);}
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G15) && !(lastkeys & G15_KEY_G15))
 +/*M1*/          {keydown(KEY_LEFTCTRL);keydown(KEY_PAGEUP);}
 +/*M1*/      else if(!(currentkeys & G15_KEY_G15) && (lastkeys & G15_KEY_G15))
 +/*M1*/          {keyup(KEY_PAGEUP);keyup(KEY_LEFTCTRL);}
 +/*M1*/
 +/*M1*/          /*Mouse Click Emulation requires xdotool installed*/
-+/*M1*/      if(currentkeys & G15_KEY_G16) && !(lastkeys & G15_KEY_G16))
++/*M1*/      if((currentkeys & G15_KEY_G16) && !(lastkeys & G15_KEY_G16))
 +/*M1*/          system("sudo -H -u '#1000' xdotool mousedown 1");
 +/*M1*/      else if(!(currentkeys & G15_KEY_G16) && (lastkeys & G15_KEY_G16))
 +/*M1*/          system("sudo -H -u '#1000' xdotool mouseup 1");
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G17) && !(lastkeys & G15_KEY_G17))
-+/*M1*/          system("sudo -H -u '#1000' terminator --working-directory=$HOME & disown");
++/*M1*/          system("sudo -H -u '#1000' terminator --working-directory=~$HOME & disown");
 +/*M1*/
 +/*M1*/      if((currentkeys & G15_KEY_G18) && !(lastkeys & G15_KEY_G18))
 +/*M1*/          {keydown(KEY_LEFTCTRL);keydown(KEY_PAGEDOWN);}
 +/*M1*/      else if(!(currentkeys & G15_KEY_G18) && (lastkeys & G15_KEY_G18))
 +/*M1*/          {keyup(KEY_PAGEDOWN);keyup(KEY_LEFTCTRL);}
 +        /*M1 END*/
 +
 +        break;
 +        }
 +
 +        //M2 layout, This one i use for terminal shortcuts
 +        case 1:
 +        {
 +        /*G Keys 1-6
 +        G1((?)) G2(Levels(CTRL+L)) G3(Color Selector(Shift+I))
 +        G4(?) G5(HSL/HSV(CTRL+U)) G6(Shade Selector (Shift+M))
 +        */
 +/*M2*/      if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
 +/*M2*/          {keydown(KEY_LEFTCTRL); keydown(KEY_LEFTSHIFT); keydown(KEY_F);keyup(KEY_LEFTCTRL); keyup(KEY_LEFTSHIFT); keyup(KEY_F);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
 +/*M2*/          {keydown(KEY_LEFTCTRL); keydown(KEY_L); keyup(KEY_LEFTCTRL); keyup(KEY_L);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
 +/*M2*/          {keydown(KEY_LEFTSHIFT); keydown(KEY_I); keyup(KEY_LEFTSHIFT); keyup(KEY_I);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
 +/*M2*/          {keydown(KEY_LEFTCTRL);keydown(KEY_K);}
 +/*M2*/      else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
 +/*M2*/          {keyup(KEY_K);keyup(KEY_LEFTCTRL);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
 +/*M2*/          {keydown(KEY_LEFTCTRL); keydown(KEY_U); keyup(KEY_LEFTCTRL); keyup(KEY_U);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
 +/*M2*/          {keydown(KEY_LEFTSHIFT);keydown(KEY_M);keyup(KEY_M);keyup(KEY_LEFTSHIFT);}
 +/*M2*/
 +/*M2*/
 +/*M2*/          /*G Keys 7-12,
 +        G7 (Reset Rotation/Canvas View(CTRL+')) G8 (Flip Canvas Vert(Ctrl+M)) G9(Move Layer(T))
 +        G10 (Merge Down (Ctrl+E)) G11 (Flip Canvas Horizontally(M)) G12 (Transform Layer (CTRL+T))
 +        */
 +/*M2*/      if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
 +/*M2*/          {keydown(KEY_LEFTCTRL);keydown(KEY_APOSTROPHE);keyup(KEY_LEFTCTRL);keyup(KEY_APOSTROPHE);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G8) && !(lastkeys & G15_KEY_G8))
 +/*M2*/          {keydown(KEY_LEFTCTRL);keydown(KEY_M);keyup(KEY_M);keyup(KEY_LEFTCTRL);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G9) && !(lastkeys & G15_KEY_G9))
 +/*M2*/          {keydown(KEY_T);keyup(KEY_T);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G10) && !(lastkeys & G15_KEY_G10))
 +/*M2*/          {keydown(KEY_LEFTCTRL);keydown(KEY_E);keyup(KEY_E);keyup(KEY_LEFTCTRL);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G11) && !(lastkeys & G15_KEY_G11))
 +/*M2*/          {keydown(KEY_M);keyup(KEY_M);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G12) && !(lastkeys & G15_KEY_G12))
 +/*M2*/          {keydown(KEY_LEFTCTRL);keydown(KEY_T);keyup(KEY_T);keyup(KEY_LEFTCTRL);}
 +/*M2*/
 +/*M2*/
 +/*M2*/      /*G Keys 13-18,
 +        G13(Freehand Select (?)) G14(Increase Opacity of Brush(I)) G15(Darker Color(K))
 +        G16(Deselect (CTRL+D) G17(Decrease Opacity of Brush(O)) G18(Lighter color (L))
 +        */
 +/*M2*/      if((currentkeys & G15_KEY_G13) && !(lastkeys & G15_KEY_G13))
 +/*M2*/          {keydown(KEY_LEFTCTRL);keydown(KEY_LEFTSHIFT);keydown(KEY_F);keyup(KEY_F);keyup(KEY_LEFTSHIFT);keyup(KEY_LEFTCTRL);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G14) && !(lastkeys & G15_KEY_G14))
 +/*M2*/          {keydown(KEY_I);}
 +/*M2*/      else if(!(currentkeys & G15_KEY_G14) && (lastkeys & G15_KEY_G14))
 +/*M2*/          {keyup(KEY_I);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G15) && !(lastkeys & G15_KEY_G15))
 +/*M2*/          {keydown(KEY_K);}
 +/*M2*/      else if(!(currentkeys & G15_KEY_G15) && (lastkeys & G15_KEY_G15))
 +/*M2*/          {keyup(KEY_K);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G16) && !(lastkeys & G15_KEY_G16))
 +/*M2*/          {keydown(KEY_LEFTCTRL);keydown(KEY_D); keyup(KEY_LEFTCTRL); keyup(KEY_D);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G17) && !(lastkeys & G15_KEY_G17))
 +/*M2*/          {keydown(KEY_O);}
 +/*M2*/      else if(!(currentkeys & G15_KEY_G17) && (lastkeys & G15_KEY_G17))
 +/*M2*/          {keyup(KEY_O);}
 +/*M2*/
 +/*M2*/      if((currentkeys & G15_KEY_G18) && !(lastkeys & G15_KEY_G18))
 +/*M2*/          {keydown(KEY_L);}
 +/*M2*/      else if(!(currentkeys & G15_KEY_G18) && (lastkeys & G15_KEY_G18))
 +/*M2*/          {keyup(KEY_L);}
 +        /*M2 END*/
 +        break;
 +        }
 +        //M3 layout for terminal commands (Placeholder)
 +        case 2:
 +        {
 +        /*G Keys 1-6*/
 +        /*G keys 1-6 G1(EraseLineLeft) G2(EraseWordLeft) G3(WordLeft) G4(EraseLineRight) G5(EraseWordRight) G6(WordRight)*/
 +/*M3*/      if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
 +/*M3*/          {keydown(KEY_LEFTCTRL); keydown(KEY_U);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
 +/*M3*/          {keyup(KEY_U);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
 +/*M3*/          {keydown(KEY_LEFTCTRL);keydown(KEY_W);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
 +/*M3*/          {keyup(KEY_W);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
 +/*M3*/          {keydown(KEY_LEFTALT);keydown(KEY_B);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
 +/*M3*/          {keyup(KEY_B);keyup(KEY_LEFTALT);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
 +/*M3*/          {keydown(KEY_LEFTCTRL);keydown(KEY_K);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
 +/*M3*/          {keyup(KEY_K);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
 +/*M3*/          {keydown(KEY_LEFTALT);keydown(KEY_D);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
 +/*M3*/          {keyup(KEY_D);keyup(KEY_LEFTALT);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
 +/*M3*/          {keydown(KEY_LEFTALT);keydown(KEY_F);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G6) && (lastkeys & G15_KEY_G6))
 +/*M3*/          {keyup(KEY_F);keyup(KEY_LEFTALT);}
 +/*M3*/
 +/*M3*/
 +/*M3*/          /*G Keys 7-12, Switch between terms 1-6 with Ctrl+Alt+F1-F6*/
 +/*M3*/      if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
 +/*M3*/          {keydown(KEY_LEFTCTRL);keydown(KEY_LEFTALT);keydown(KEY_F1);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G7) && (lastkeys & G15_KEY_G7))
 +/*M3*/          {keyup(KEY_F1);keyup(KEY_LEFTALT);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G8) && !(lastkeys & G15_KEY_G8))
 +/*M3*/          {keydown(KEY_LEFTCTRL);keydown(KEY_LEFTALT);keydown(KEY_F2);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G8) && (lastkeys & G15_KEY_G8))
 +/*M3*/          {keyup(KEY_F2);keyup(KEY_LEFTALT);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G9) && !(lastkeys & G15_KEY_G9))
 +/*M3*/          {keydown(KEY_LEFTCTRL);keydown(KEY_LEFTALT);keydown(KEY_F3);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G9) && (lastkeys & G15_KEY_G9))
 +/*M3*/          {keyup(KEY_F3);keyup(KEY_LEFTALT);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G10) && !(lastkeys & G15_KEY_G10))
 +/*M3*/          {keydown(KEY_LEFTCTRL);keydown(KEY_LEFTALT);keydown(KEY_F4);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G10) && (lastkeys & G15_KEY_G10))
 +/*M3*/          {keyup(KEY_F4);keyup(KEY_LEFTALT);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G11) && !(lastkeys & G15_KEY_G11))
 +/*M3*/          {keydown(KEY_LEFTCTRL);keydown(KEY_LEFTALT);keydown(KEY_F5);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G11) && (lastkeys & G15_KEY_G11))
 +/*M3*/          {keyup(KEY_F5);keyup(KEY_LEFTALT);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G12) && !(lastkeys & G15_KEY_G12))
 +/*M3*/          {keydown(KEY_LEFTCTRL);keydown(KEY_LEFTALT);keydown(KEY_F6);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G12) && (lastkeys & G15_KEY_G12))
 +/*M3*/          {keyup(KEY_F6);keyup(KEY_LEFTALT);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/
 +/*M3*/      /*G Keys 13-18 13(Switch to GUI) 16(Kill X11) 14(Ctrl+C) 17(Q+Enter) 15/18(Shift+PgUp/PgDn for Scroll Up/Dn)*/
 +/*M3*/      if((currentkeys & G15_KEY_G13) && !(lastkeys & G15_KEY_G13))
 +/*M3*/          {keydown(KEY_LEFTCTRL);keydown(KEY_LEFTALT);keydown(KEY_F7);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G13) && (lastkeys & G15_KEY_G13))
 +/*M3*/          {keyup(KEY_F7);keyup(KEY_LEFTALT);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G14) && !(lastkeys & G15_KEY_G14))
 +/*M3*/          {keydown(KEY_LEFTCTRL);keydown(KEY_C);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G14) && (lastkeys & G15_KEY_G14))
 +/*M3*/          {keyup(KEY_C);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G15) && !(lastkeys & G15_KEY_G15))
 +/*M3*/          {keydown(KEY_LEFTSHIFT);keydown(KEY_PAGEUP);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G15) && (lastkeys & G15_KEY_G15))
 +/*M3*/          {keyup(KEY_PAGEUP);keyup(KEY_LEFTSHIFT);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G16) && !(lastkeys & G15_KEY_G16))
 +/*M3*/          {keydown(KEY_LEFTCTRL);keydown(KEY_LEFTALT);keydown(KEY_BACKSPACE);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G16) && (lastkeys & G15_KEY_G16))
 +/*M3*/          {keyup(KEY_BACKSPACE);keyup(KEY_LEFTALT);keyup(KEY_LEFTCTRL);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G17) && !(lastkeys & G15_KEY_G17))
 +/*M3*/          {keydown(KEY_Q);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G17) && (lastkeys & G15_KEY_G17))
 +/*M3*/          {keyup(KEY_Q);keydown(KEY_ENTER);keyup(KEY_ENTER);}
 +/*M3*/
 +/*M3*/      if((currentkeys & G15_KEY_G18) && !(lastkeys & G15_KEY_G18))
 +/*M3*/          {keydown(KEY_LEFTSHIFT);keydown(KEY_PAGEDOWN);}
 +/*M3*/      else if(!(currentkeys & G15_KEY_G18) && (lastkeys & G15_KEY_G18))
 +/*M3*/          {keyup(KEY_PAGEDOWN);keyup(KEY_LEFTSHIFT);}
 +        /*M3 END*/
 +        break;
 +        }
      }
 +
 +        /* 'M' keys... */
 +
 +        if((currentkeys & G15_KEY_M1) && !(lastkeys & G15_KEY_M1))
 +            //keydown(MKEY_OFFSET);
 +        mkey_state = 0;
 +        /*else if(!(currentkeys & G15_KEY_M1) && (lastkeys & G15_KEY_M1))
 +            keyup(MKEY_OFFSET);*/
 +
 +        if((currentkeys & G15_KEY_M2) && !(lastkeys & G15_KEY_M2))
 +            //keydown(MKEY_OFFSET+1);
 +        mkey_state = 1;
 +        /*else if(!(currentkeys & G15_KEY_M2) && (lastkeys & G15_KEY_M2))
 +            keyup(MKEY_OFFSET+1);*/
 +
 +        if((currentkeys & G15_KEY_M3) && !(lastkeys & G15_KEY_M3))
 +            //keydown(MKEY_OFFSET+2);
 +        mkey_state = 2;
 +        /*else if(!(currentkeys & G15_KEY_M3) && (lastkeys & G15_KEY_M3))
 +            keyup(MKEY_OFFSET+2);*/
 +
 +    if((currentkeys & G15_KEY_MR) && !(lastkeys & G15_KEY_MR) && mr_state == 0){
 +        mr_state = 1;
 +    }
 +    else if(!(currentkeys & G15_KEY_MR) && (lastkeys & G15_KEY_MR) && mr_state == 1){
 +    /*Toggle function on first key release*/
 +    }
 +    else if((currentkeys & G15_KEY_MR) && !(lastkeys & G15_KEY_MR) && mr_state == 1){
 +        mr_state = 0;
 +    }
 +    else if(!(currentkeys & G15_KEY_MR) && (lastkeys & G15_KEY_MR) && mr_state == 0){
 +    /*Úntoggle function on second key release*/
 +    }
 +
 +        if(map_Lkeys){
 +            /* 'L' keys...  */
 +            if((currentkeys & G15_KEY_L1) && !(lastkeys & G15_KEY_L1))
 +                keydown(LKEY_OFFSET);
 +            else if(!(currentkeys & G15_KEY_L1) && (lastkeys & G15_KEY_L1))
 +                keyup(LKEY_OFFSET);
 +
 +            if((currentkeys & G15_KEY_L2) && !(lastkeys & G15_KEY_L2))
 +                keydown(LKEY_OFFSET+1);
 +            else if(!(currentkeys & G15_KEY_L2) && (lastkeys & G15_KEY_L2))
 +                keyup(LKEY_OFFSET+1);
 +
 +            if((currentkeys & G15_KEY_L3) && !(lastkeys & G15_KEY_L3))
 +                keydown(LKEY_OFFSET+2);
 +            else if(!(currentkeys & G15_KEY_L3) && (lastkeys & G15_KEY_L3))
 +                keyup(LKEY_OFFSET+2);
 +
 +            if((currentkeys & G15_KEY_L4) && !(lastkeys & G15_KEY_L4))
 +                keydown(LKEY_OFFSET+3);
 +            else if(!(currentkeys & G15_KEY_L4) && (lastkeys & G15_KEY_L4))
 +                keyup(LKEY_OFFSET+3);
 +
 +            if((currentkeys & G15_KEY_L5) && !(lastkeys & G15_KEY_L5))
 +                keydown(LKEY_OFFSET+4);
 +            else if(!(currentkeys & G15_KEY_L5) && (lastkeys & G15_KEY_L5))
 +                keyup(LKEY_OFFSET+4);
 +        }
 +
 +    }
 +
 +
 +     else
 +     {
 +        // G15_KEY_LIGHT - Key modifier for Logitech G510 Media Keys implementation
 +
 +        // XF86AudioPlay
 +        if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
 +            keydown(KEY_PLAYPAUSE);
 +        else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
 +            keyup(KEY_PLAYPAUSE);
 +
 +        // XF86AudioStop
 +        if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
 +            keydown(KEY_STOPCD);
 +        else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
 +            keyup(KEY_STOPCD);
 +
 +        // XF86AudioPrev
 +        if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
 +            keydown(KEY_PREVIOUSSONG);
 +        else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
 +            keyup(KEY_PREVIOUSSONG);
 +
 +        // XF86AudioNext
 +        if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
 +            keydown(KEY_NEXTSONG);
 +        else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
 +            keyup(KEY_NEXTSONG);
 +
 +        // XF86AudioMute
 +        if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
 +            keydown(KEY_MUTE);
 +        else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
 +            keyup(KEY_MUTE);
 +
 +        // XF86AudioRaise/LowerVolume (this was a pain to figure out, i dropped it at one point while it was semi-functioning and fixed it later)
 +        if(((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6)) && (vol_state == 0 || vol_state == 1)){
 +        keydown(KEY_VOLUMEUP);
 +        vol_state = 1;
 +    }
 +        else if(((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7)) && (vol_state == 0 || vol_state == 2)){
 +        keydown(KEY_VOLUMEDOWN);
 +        vol_state = 2;
 +    }
 +    else if((!(currentkeys & G15_KEY_G6) || !(currentkeys & G15_KEY_G7)) && ((lastkeys & G15_KEY_G7) || (lastkeys & G15_KEY_G6))){
 +        keyup(KEY_VOLUMEUP);
 +            keyup(KEY_VOLUMEDOWN);
 +        vol_state = 0;
 +        }
 +    }
 +/*Set led states per M key (Doing this in the switch was slow and didn't activate till after button release)*/
 +    if(mkey_state == 0)
 +    mled_state = G15_LED_M1;
 +    else if(mkey_state == 1)
 +    mled_state = G15_LED_M2;
 +    else if(mkey_state == 2)
 +    mled_state = G15_LED_M3;
 +
 +/*Set leds and toggle MR led depending on mr_state*/
 +    if(mr_state == 0)
 +    setLEDs(mled_state -0x20);
 +    else if(mr_state == 1)
 +    setLEDs(mled_state -0x20 | G15_LED_MR -0x20);
 +
  }
 
 
  static int keyevents(plugin_event_t *myevent) {
      lcd_t *lcd = (lcd_t*) myevent->lcd;
      static int lastkeys;
 
 --- a/contrib/xmodmaprc 2008-01-24 12:51:08.000000000 +0000
 +++ b/contrib/xmodmaprc 2013-04-11 15:25:26.000000000 +0000
 @@ -3,7 +3,7 @@
  keycode 130 = XF86Launch9
  keycode 131 = XF86Launch2
  keycode 132 = XF86Phone
 -keycode 133 = XF86Messenger
 +keycode 133 = Super_L
  keycode 136 = XF86LaunchD
  keycode 137 = XF86Support
  keycode 138 = XF86Word