Jim Grandy
|
b857a69332
|
fix merge error in xorg/X11R7.6/rdp/rdp.h
|
2013-08-22 14:56:24 -07:00 |
|
Jim Grandy
|
b3ee3cbd4b
|
Another merge error in sesman/chansrv/clipboar.c
|
2013-08-22 13:58:43 -07:00 |
|
Jim Grandy
|
72ec05d37e
|
fix merge error in sesman/chansrv/clipboard.c
|
2013-08-22 13:50:04 -07:00 |
|
Jim Grandy
|
7566fbfeff
|
Merge branch 'merge-a8' of a8git:xrdp into merge-a8
Conflicts:
xorg/X11R7.6/rdp/rdp.h
xorg/X11R7.6/rdp/rdpdraw.c
|
2013-08-22 12:59:51 -07:00 |
|
Jay Sorg
|
ac8d4bfb41
|
X11rdp: fixes for the merge, offscreen fix
|
2013-08-22 12:58:07 -07:00 |
|
Jay Sorg
|
02d550e11b
|
X11rdp: valgrind font fix
|
2013-08-22 12:57:00 -07:00 |
|
Jim Grandy
|
a308d2e25c
|
Fix errors cause by previous merge (2361914)
|
2013-08-22 12:57:00 -07:00 |
|
Jim Grandy
|
b7b3d9ef28
|
Hand-apply patches (misc) from Authentic8: b18667d 6d22ada 95d93a3 433b49c b96f85f 8c32c46 f87f6b3 c93cce0 26ce9ce
|
2013-08-22 12:56:51 -07:00 |
|
Jay Sorg
|
aa5b9e56b2
|
xrdp: disable freerdp proxy build
|
2013-08-22 12:55:31 -07:00 |
|
jgrandy
|
26ae5a60a8
|
Merge: add /opt/xrdp/lib to rpath in xrdp, for libfreerdp
|
2013-08-22 12:55:31 -07:00 |
|
Jay Sorg
|
2c70a0e1f8
|
part of merge, no logic change, add -g to Makefile and LLOGLN to xup.c
|
2013-08-22 12:55:31 -07:00 |
|
Jay Sorg
|
8055745ceb
|
part of merge, composite, out_uint8s fixes
|
2013-08-22 12:55:31 -07:00 |
|
Jay Sorg
|
cbb661d6fd
|
part of merge, move all glyph calls to rdpglyph.c
|
2013-08-22 12:55:31 -07:00 |
|
Jim Grandy
|
d2d22043aa
|
rdpup: use out_uint8s instead of out_uint8; rdpdraw.c: resolve bad merge with rdp_is_os, and use a temporary value as final parameter to draw_item_add_img_region
|
2013-08-22 12:55:29 -07:00 |
|
Jim Grandy
|
648470afa1
|
Add xorg/X11R7.6/rdp/rdpComposite.c, missed from previous commit (a27cbdd)
|
2013-08-22 12:54:14 -07:00 |
|
Jim Grandy
|
981741f55c
|
Hand-apply patch (compositing) from Authentic8: 5d5e470 81c9c29 b0c2c10 27d8a01 a96a217 e512090 a9a6762 9c02bfa bd26fcc c0d29d9 676dd35 3b26737
|
2013-08-22 12:54:10 -07:00 |
|
Jim Grandy
|
71e8136e41
|
fix typo introduced in cb1efca6
|
2013-08-22 12:52:32 -07:00 |
|
Jim Grandy
|
4733c43145
|
Fix typo introduced in cb1efca6
|
2013-08-22 12:52:32 -07:00 |
|
Jim Grandy
|
81d206ba68
|
Hand-apply patch (rail: send ShowState when window order changes) from Authentic8: c36a2d7
|
2013-08-22 12:52:32 -07:00 |
|
Jim Grandy
|
3cb0bc7ae8
|
Hand-apply patches (X11rdp text) from Authentic8: d25c23d f977cd9
|
2013-08-22 12:52:32 -07:00 |
|
Jim Grandy
|
142a93829b
|
Hand-apply patches (chansrv/rail) from Authentic8: 516fd1d 6a4fb28 c038a99
|
2013-08-22 12:52:32 -07:00 |
|
Jim Grandy
|
2291519714
|
Hand-apply patch (Update cursor location whenever receiving mouse down events) from Authentic8: 19f1718
|
2013-08-22 12:52:32 -07:00 |
|
Jim Grandy
|
9d4205ba7a
|
Hand-apply patch (chansrv: handle ReparentNotify) from Authentic8: 68cdc07
|
2013-08-22 12:52:31 -07:00 |
|
Jim Grandy
|
92a781e1e6
|
Hand-apply patch (reduce logging in xorg/X11R7.6/rdp/rdpdraw.c) from Authentic8: 44a1390
|
2013-08-22 12:52:31 -07:00 |
|
Jim Grandy
|
d0338287f6
|
Hand-apply patches (glyph cache) from Authentic8: d9641da
|
2013-08-22 12:52:31 -07:00 |
|
Jim Grandy
|
1f708cf99a
|
Hand-apply patch (added special meta keys) from Authentic8: c22b7d7
|
2013-08-22 12:52:31 -07:00 |
|
Jim Grandy
|
4e9516e00c
|
Hand-apply patches (glphy cache) from Authetnic8 branch: 1048147 3fc5974 0552905 00b08a0
|
2013-08-22 12:52:31 -07:00 |
|
Jim Grandy
|
bd8083d7e2
|
Fix merge errors introduced in 3ae1b415 and 20ec9ee3
|
2013-08-22 12:52:31 -07:00 |
|
Jim Grandy
|
45b0bc9f17
|
Hand-apply patches (glyph cache) from Authentic8 branch: 653869c 30f23d4 74b015d 4e51e6d 2829087
|
2013-08-22 12:52:24 -07:00 |
|
Jim Grandy
|
1ae9a7f2b6
|
Hand-apply patches (drawing configuration) from Authentic8 branch: 34b92df f994298 38e2def
|
2013-08-22 12:49:41 -07:00 |
|
Jim Grandy
|
a32669f3ef
|
Hand-apply patches (rail) from Authentic8 branch: e94d059 c36dc61
|
2013-08-22 12:49:41 -07:00 |
|
Jim Grandy
|
173ed7056f
|
Hand-apply patches (rail) from Authentic8: b01207f b9807e9 42f0128 0f0750c aef2dce
|
2013-08-22 12:49:41 -07:00 |
|
Jim Grandy
|
af4e42a08d
|
Hand-apply patches (rail) from Authentic8: bc68076
|
2013-08-22 12:49:40 -07:00 |
|
Jim Grandy
|
7817b716f3
|
Hand-apply patches (X11rdp: add cleanx.sh script) from Authentic8 branch: 88d3aa1 28044b3
|
2013-08-22 12:49:40 -07:00 |
|
Jim Grandy
|
984e12a54e
|
Hand-apply patches (X11rdp: fix for frame buffer getting smaller in randr) from Authentic8 branch: 1e92a08
|
2013-08-22 12:49:40 -07:00 |
|
Jay Sorg
|
81488cd615
|
Hand-apply patches (framebuffer alloc) from Authentic8 branch: 15ba9cc409e8f57e1800abcd52e77ed409b6cc17
|
2013-08-22 12:49:40 -07:00 |
|
Jay Sorg
|
112f680318
|
Hand-apply patches (keyboard autorepeat) from Authentic8 branch: b5b58fcbbd9eb57ff1ff4b8df8f4426c1c2881fb
|
2013-08-22 12:49:40 -07:00 |
|
Jim Grandy
|
2036010e0c
|
Hand-apply patches (rail improvements) from Authentic8 branch: 6d97878
|
2013-08-22 12:49:40 -07:00 |
|
Jim Grandy
|
53311f2b25
|
Hand-apply patches (rail improvements) from Authentic8 branch: 6e15b4a 2c99e69 3f30429 aad2aaa 4f8481e 5117ac2 f3dcf1a
|
2013-08-22 12:49:40 -07:00 |
|
Jim Grandy
|
3fdd9bc378
|
Hand-apply patches (keyboard fix for alt,shift on focus in) from Authentic8 branch: 108e625 29947e5
|
2013-08-22 12:49:40 -07:00 |
|
Jim Grandy
|
dfe5911b55
|
Hand-apply patches (rail improvements) from Authentic8 branch: 507694d, 0e21d45, 44447d5, e452e4f, 3d05576, dd69d8f
|
2013-08-22 12:49:40 -07:00 |
|
jsorg71
|
b8388a65a2
|
Merge pull request #90 from neutrinolabs/master
xorg driver, smart card, etc
|
2013-08-16 12:13:52 -07:00 |
|
Jay Sorg
|
fa40106a69
|
Merge branch 'master' of github.com:neutrinolabs/xrdp
|
2013-08-16 10:54:06 -07:00 |
|
Jay Sorg
|
9357addde5
|
X11rdp: fix drawing issues, turn on screen delay remoting
|
2013-08-16 10:53:55 -07:00 |
|
Laxmikant Rashinkar
|
9ee39bf8f3
|
Merge branch 'master' of github.com:neutrinolabs/xrdp
|
2013-08-14 20:01:03 -07:00 |
|
Laxmikant Rashinkar
|
09dd58c5e1
|
clipboard: enabled module logging
|
2013-08-14 20:00:52 -07:00 |
|
Jay Sorg
|
25ee064340
|
X11rdp: download from xrdp.org
|
2013-08-13 11:06:25 -07:00 |
|
Laxmikant Rashinkar
|
6381941c78
|
FUSE: changed architecture to use opendir/readdir instead of just readdir
|
2013-08-11 18:06:39 -07:00 |
|
Jay Sorg
|
f4b8798a1d
|
X11rdp: fixes for the merge, offscreen fix
|
2013-08-09 20:07:24 -07:00 |
|
Laxmikant Rashinkar
|
d2de1b703b
|
Merge branch 'master' of github.com:neutrinolabs/xrdp
|
2013-08-09 19:44:05 -07:00 |
|