client: merging Mac OS X and Windows client improvements from Jay Sorg

diff --cc CMakeLists.txt
Simple merge

diff --cc channels/CMakeLists.txt
index 2cbc568,9345ff5..1951fd8
--- 1/channels/CMakeLists.txt
--- 2/channels/CMakeLists.txt
+++ b/channels/CMakeLists.txt
@@@ -17,13 -17,12 +17,13 @@@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
+ add_subdirectory(cliprdr)
 +add_subdirectory(drdynvc)
+ add_subdirectory(rail)
 +add_subdirectory(rdpdbg)
 +add_subdirectory(skel)
 +
  if(NOT WIN32)
 -    add_subdirectory(drdynvc)
 -    add_subdirectory(rdpdbg)
 -    add_subdirectory(rdpdr)
 -    add_subdirectory(rdpsnd)
 +      add_subdirectory(rdpdr)
-       add_subdirectory(cliprdr)
-       add_subdirectory(rail)
 +      add_subdirectory(rdpsnd)
  endif()
 -

diff --cc channels/rdpsnd/rdpsnd_main.c
Simple merge

diff --cc client/Windows/wfreerdp.c
Simple merge

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

diff --cc cmake/ConfigOptions.cmake
Simple merge

diff --cc config.h.in
index 1dced6c,836554d..2f19ea9
--- 1/config.h.in
--- 2/config.h.in
+++ b/config.h.in
@@@ -25,7 -25,7 +25,8 @@@
  #cmakedefine WITH_PROFILER
  #cmakedefine WITH_SSE2
  #cmakedefine WITH_NEON
 +#cmakedefine WITH_NATIVE_SSPI
+ #cmakedefine WITH_JPEG
  
  /* Debug */
  #cmakedefine WITH_DEBUG_CERTIFICATE

diff --cc freerdp.spec
Simple merge

diff --cc include/freerdp/settings.h
Simple merge

diff --cc libfreerdp-cache/offscreen.c
Simple merge

diff --cc libfreerdp-codec/CMakeLists.txt
index 4408ac2,c06afc3..69194da
--- 1/libfreerdp-codec/CMakeLists.txt
--- 2/libfreerdp-codec/CMakeLists.txt
+++ b/libfreerdp-codec/CMakeLists.txt
@@@ -43,9 -43,12 +43,10 @@@ set(FREERDP_CODEC_SRC
        nsc_encode.h
        nsc_types.h
        mppc_dec.c
-       mppc_enc.c)
+       mppc_enc.c
 -      jpeg.c
 -)
++      jpeg.c)
  
 -if(WITH_SSE2)
 -      set(FREERDP_CODEC_SRCS ${FREERDP_CODEC_SRCS}
 +set(FREERDP_CODEC_SSE2_SRCS
        rfx_sse2.c
        rfx_sse2.h
        nsc_sse2.c

diff --cc libfreerdp-core/capabilities.c
index 0a1811f,98324ed..85480f0
--- 1/libfreerdp-core/capabilities.c
--- 2/libfreerdp-core/capabilities.c
+++ b/libfreerdp-core/capabilities.c
@@@ -1606,16 -1644,24 +1637,31 @@@ void rdp_write_bitmap_codecs_capability
  
  void rdp_read_frame_acknowledge_capability_set(STREAM* s, uint16 length, rdpSettings* settings)
  {
 -      stream_seek_uint32(s); /* (4 bytes) */
 +      if (settings->server_mode)
 +      {
 +              stream_read_uint32(s, settings->frame_acknowledge); /* (4 bytes) */
 +      }
 +      else
 +      {
 +              stream_seek_uint32(s); /* (4 bytes) */
 +      }
  }
  
+ void rdp_read_bitmap_cache_v3_codec_id_capability_set(STREAM* s, uint16 length, rdpSettings* settings)
+ {
+       stream_seek_uint8(s); /* (1 byte) */
+ }
+ 
+ void rdp_write_bitmap_cache_v3_codec_id_capability_set(STREAM* s, rdpSettings* settings)
+ {
+       uint8* header;
+ 
+       header = rdp_capability_set_start(s);
+       stream_write_uint8(s, settings->v3_codec_id);
+       rdp_capability_set_finish(s, header, 6);
+ }
+ 
+ 
  /**
   * Write frame acknowledge capability set.\n
   * @param s stream

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

diff --cc libfreerdp-utils/args.c
index 89a1aa1,1871c23..87df89f
--- 1/libfreerdp-utils/args.c
--- 2/libfreerdp-utils/args.c
+++ b/libfreerdp-utils/args.c
@@@ -115,8 -91,11 +117,12 @@@ int freerdp_parse_args(rdpSettings* set
                                "  --plugin: load a virtual channel plugin\n"
                                "  --rfx: enable RemoteFX\n"
                                "  --rfx-mode: RemoteFX operational flags (v[ideo], i[mage]), default is video\n"
 +                              "  --frame-ack: number of frames pending to be acknowledged, default is 2 (disable with 0)\n"
                                "  --nsc: enable NSCodec (experimental)\n"
+ #ifdef WITH_JPEG
+                               "  --jpeg: enable jpeg codec, uses 75 quality\n"
+                               "  --jpegex: enable jpeg and set quality(1..99)\n"
+ #endif
                                "  --disable-wallpaper: disables wallpaper\n"
                                "  --composition: enable desktop composition\n"
                                "  --disable-full-window-drag: disables full window drag\n"