Merge pull request #4322 from akallabeth/rail_fixes

Rail fixes for GFX mode

diff --cc channels/rail/client/rail_main.c
Simple merge

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

diff --cc client/X11/xf_gfx.c
index 909fa7d,6278efa..b68a297
--- 1/client/X11/xf_gfx.c
--- 2/client/X11/xf_gfx.c
+++ b/client/X11/xf_gfx.c
@@@ -25,9 -25,8 +25,10 @@@
  
  #include <freerdp/log.h>
  #include "xf_gfx.h"
+ #include "xf_rail.h"
  
 +#include <X11/Xutil.h>
 +
  #define TAG CLIENT_TAG("x11")
  
  static UINT xf_OutputUpdate(xfContext* xfc, xfGfxSurface* surface)