Jim Grandy
90446203d3
Merge branch 'merge-a8' of a8git:xrdp into merge-a8
2013-07-06 21:05:39 -07:00
Jim Grandy
a27cbddaa5
Hand-apply patch (compositing) from Authentic8: 5d5e470 81c9c29 b0c2c10 27d8a01 a96a217 e512090 a9a6762 9c02bfa bd26fcc c0d29d9 676dd35 3b26737
2013-07-06 21:03:58 -07:00
Jim Grandy
0054b70446
fix typo introduced in cb1efca6
2013-07-06 13:42:55 -07:00
Jim Grandy
363d35fa21
Fix typo introduced in cb1efca6
2013-07-06 12:53:54 -07:00
Jim Grandy
4b2ce53518
Hand-apply patch (rail: send ShowState when window order changes) from Authentic8: c36a2d7
2013-07-06 08:52:25 -07:00
Jim Grandy
a5348298fd
Hand-apply patches (X11rdp text) from Authentic8: d25c23d f977cd9
2013-07-06 08:50:12 -07:00
Jim Grandy
2f395bdfa0
Hand-apply patches (chansrv/rail) from Authentic8: 516fd1d 6a4fb28 c038a99
2013-07-06 08:42:05 -07:00
Jim Grandy
adb8a359f3
Hand-apply patch (Update cursor location whenever receiving mouse down events) from Authentic8: 19f1718
2013-07-06 08:19:39 -07:00
Jim Grandy
30f10284d7
Hand-apply patch (chansrv: handle ReparentNotify) from Authentic8: 68cdc07
2013-07-06 08:17:20 -07:00
Jim Grandy
d510a126b0
Hand-apply patch (reduce logging in xorg/X11R7.6/rdp/rdpdraw.c) from Authentic8: 44a1390
2013-07-06 08:16:37 -07:00
Jim Grandy
20f740bd68
Hand-apply patches (glyph cache) from Authentic8: d9641da
2013-07-06 08:10:33 -07:00
Jim Grandy
9162ffeaee
Hand-apply patch (added special meta keys) from Authentic8: c22b7d7
2013-07-06 07:57:21 -07:00
Jim Grandy
689b178050
Hand-apply patches (glphy cache) from Authetnic8 branch: 1048147 3fc5974 0552905 00b08a0
2013-07-05 14:55:31 -07:00
Jim Grandy
4bfe0c167a
Fix merge errors introduced in 3ae1b415
and 20ec9ee3
2013-07-05 14:27:40 -07:00
Jim Grandy
cb1efca637
Hand-apply patches (glyph cache) from Authentic8 branch: 653869c 30f23d4 74b015d 4e51e6d 2829087
2013-07-03 15:57:00 -07:00
Jim Grandy
c64586c25c
Hand-apply patches (drawing configuration) from Authentic8 branch: 34b92df f994298 38e2def
2013-07-03 10:45:46 -07:00
Jim Grandy
117e514cb4
Hand-apply patches (rail) from Authentic8 branch: e94d059 c36dc61
2013-07-03 10:27:07 -07:00
Jim Grandy
5cbe629b37
Hand-apply patches (rail) from Authentic8: b01207f b9807e9 42f0128 0f0750c aef2dce
2013-07-03 10:01:18 -07:00
Jim Grandy
ab21292133
Hand-apply patches (rail) from Authentic8: bc68076
2013-07-03 09:32:18 -07:00
Jim Grandy
16954355f5
Hand-apply patches (X11rdp: add cleanx.sh script) from Authentic8 branch: 88d3aa1 28044b3
2013-07-03 09:09:14 -07:00
Jim Grandy
d805992b62
Hand-apply patches (X11rdp: fix for frame buffer getting smaller in randr) from Authentic8 branch: 1e92a08
2013-07-03 09:08:14 -07:00
Jay Sorg
27b7a8c537
Hand-apply patches (framebuffer alloc) from Authentic8 branch: 15ba9cc409e8f57e1800abcd52e77ed409b6cc17
2013-07-02 17:34:04 -07:00
Jay Sorg
587231445c
Hand-apply patches (keyboard autorepeat) from Authentic8 branch: b5b58fcbbd9eb57ff1ff4b8df8f4426c1c2881fb
2013-07-02 17:16:39 -07:00
Jim Grandy
bec583624c
Hand-apply patches (rail improvements) from Authentic8 branch: 6d97878
2013-06-30 16:12:09 -07:00
Jim Grandy
3ae1b415a1
Hand-apply patches (rail improvements) from Authentic8 branch: 6e15b4a 2c99e69 3f30429 aad2aaa 4f8481e 5117ac2 f3dcf1a
2013-06-30 16:05:23 -07:00
Jim Grandy
3221caff62
Hand-apply patches (keyboard fix for alt,shift on focus in) from Authentic8 branch: 108e625 29947e5
2013-06-30 12:40:39 -07:00
Jim Grandy
20ec9ee34e
Hand-apply patches (rail improvements) from Authentic8 branch: 507694d, 0e21d45, 44447d5, e452e4f, 3d05576, dd69d8f
2013-06-30 12:36:32 -07:00
Jay Sorg
0713295921
X11rdp: Makefile seperator fix
2013-06-23 17:43:45 -07:00
Jay Sorg
0aa3dbe738
chansrv: no logic change, EOL and coding style cleanup
2013-06-23 14:17:59 -07:00
jsorg71
d90431aeb5
Merge pull request #81 from luv/master
...
Small fixes in sound and clipboard
2013-06-23 14:04:44 -07:00
Lukas Vacek
1341e64062
Revert "Fix path to config.c in sesman/tools/Makefile.am"
...
This reverts commit a0f8afca50
.
2013-06-22 22:22:13 +01:00
Lukas Vacek
e7fe39a65b
Fix sound and clipboard crashes
...
- In case clipboard is not initialized, clipboard_data_in returns
(fixes a segfault)
- If less than 4 bytes are sent to sound_send_wave_data_chunk, it
returns
(fixes a segfault)
- When sending sound initiliazation messages set g_chan in chansrv to 0,
so the server waits for client to reply (this makes sound work afte
reconnecting)
- In process_message_channel_setup, clear any leftover data in
chan_items
2013-06-22 21:57:16 +01:00
Lukas Vacek
a0f8afca50
Fix path to config.c in sesman/tools/Makefile.am
2013-06-22 21:26:29 +01:00
jsorg71
9695e245ef
Merge pull request #80 from neutrinolabs/master
...
Xv, vrplayer, sesman fixes
2013-06-21 19:39:20 -07:00
Jay Sorg
c20b447f21
sesman: pid string match xrdp length
2013-06-19 11:43:24 -07:00
Jay Sorg
a6592ed690
sesman: fix for reading pid file
2013-06-19 11:37:26 -07:00
Jay Sorg
d33bb5eb4e
X11rdp: added install to makefile
2013-06-18 17:41:30 -07:00
Laxmikant Rashinkar
74f3388a61
Merge branch 'master' of github.com:neutrinolabs/xrdp
2013-06-15 13:37:01 -07:00
Laxmikant Rashinkar
374cb93ded
vrplayer: added feature to automatically restart media on end of stream
2013-06-15 13:36:40 -07:00
Jay Sorg
62c16bad5a
X11rdp: work on xv, still off by default
2013-06-15 11:04:42 -07:00
Jay Sorg
d22778ca69
X11rdp: work on xv
2013-06-14 10:35:31 -07:00
Jay Sorg
85d3fd6aaa
X11rdp: added rdpxv.c
2013-06-13 18:18:49 -07:00
jsorg71
2eb6fc45c9
Merge pull request #79 from neutrinolabs/master
...
neutrinordp
2013-06-12 01:13:02 -07:00
Jay Sorg
d1638006f1
replace macro AM_CONFIG_HEADER with AC_CONFIG_HEADERS
2013-06-12 01:08:42 -07:00
Jay Sorg
4b82a3ea34
X11rdp: update to pixman 0.30
2013-06-11 13:39:16 -07:00
Laxmikant Rashinkar
78498f6682
Merge branch 'master' of github.com:neutrinolabs/xrdp
2013-06-08 18:44:34 -07:00
Laxmikant Rashinkar
6ad1d7f78d
folder redirection: fixed language issues
2013-06-08 18:44:21 -07:00
Jay Sorg
c6fa03102f
copyright year update
2013-06-08 10:51:53 -07:00
jsorg71
d3fb328d0f
Merge pull request #74 from neutrinolabs/master
...
neutrinordp
2013-06-08 01:09:57 -07:00
Jay Sorg
9ceb533a45
X11rdp: log client cursor caps
2013-06-08 01:04:52 -07:00