freerdp: merge with master

diff --cc client/X11/xf_interface.c
Simple merge

diff --cc libfreerdp/core/activation.c
Simple merge

diff --cc libfreerdp/core/capabilities.c
Simple merge

diff --cc libfreerdp/core/fastpath.c
index f8f92cd,50e1ab0..a02e8d9
--- 1/libfreerdp/core/fastpath.c
--- 2/libfreerdp/core/fastpath.c
+++ b/libfreerdp/core/fastpath.c
@@@ -684,10 -595,20 +685,22 @@@ wStream* fastpath_input_pdu_init_header
                if (rdp->do_secure_checksum)
                        rdp->sec_flags |= SEC_SECURE_CHECKSUM;
        }
 -      stream_seek(s, fastpath_get_sec_bytes(rdp));
 +
 +      Stream_Seek(s, fastpath_get_sec_bytes(rdp));
+ 
+       return s;
+ }
+ 
+ wStream* fastpath_input_pdu_init(rdpFastPath* fastpath, BYTE eventFlags, BYTE eventCode)
+ {
+       rdpRdp *rdp;
+       wStream* s;
+ 
+       rdp = fastpath->rdp;
+ 
+       s = fastpath_input_pdu_init_header(fastpath);
        stream_write_BYTE(s, eventFlags | (eventCode << 5)); /* eventHeader (1 byte) */
 +
        return s;
  }
  
@@@ -709,8 -629,7 +722,12 @@@ BOOL fastpath_send_multiple_input_pdu(r
        }
  
        eventHeader = FASTPATH_INPUT_ACTION_FASTPATH;
++<<<<<<< HEAD
 +      eventHeader |= (1 << 2); /* numberEvents */
 +
++=======
+       eventHeader |= (iNumEvents << 2); /* numberEvents */
++>>>>>>> f1672948ff0b5f6a9d3cda658a18104df3c3d1e4
        if (rdp->sec_flags & SEC_ENCRYPT)
                eventHeader |= (FASTPATH_INPUT_ENCRYPTED << 6);
        if (rdp->sec_flags & SEC_SECURE_CHECKSUM)

diff --cc libfreerdp/core/fastpath.h
Simple merge

diff --cc libfreerdp/core/freerdp.c
Simple merge

diff --cc libfreerdp/core/input.c
Simple merge

diff --cc libfreerdp/core/rdp.h
Simple merge

diff --cc libfreerdp/core/settings.c
Simple merge