Commit Graph

1784 Commits

Author SHA1 Message Date
Jay Sorg
e2b4f8cf7e xorg: work on Xorg driver 2013-07-12 23:26:04 -07:00
Jay Sorg
6eed5a1475 xorg: work on Xorg driver 2013-07-12 22:36:16 -07:00
Jay Sorg
7862f87410 xorg: work on Xorg driver 2013-07-12 22:30:20 -07:00
Jay Sorg
4b58f943a9 xorg driver skeleton 2013-07-12 16:56:15 -07:00
Jay Sorg
997be5d621 part of merge, no logic change, add -g to Makefile and LLOGLN to xup.c 2013-07-12 12:22:48 -07:00
Jay Sorg
f5fddc1a57 part of merge, composite, out_uint8s fixes 2013-07-12 12:21:20 -07:00
Jay Sorg
a1b4baddc6 part of merge, move all glyph calls to rdpglyph.c 2013-07-12 11:08:22 -07:00
Jay Sorg
318ed3acb1 vrplayer: got rid of some usleep compile errors 2013-07-11 23:33:38 -07:00
Jay Sorg
14a4ac5a79 libxrdp: started adding fastpath support 2013-07-09 21:34:20 -07:00
Jim Grandy
d963774fe8 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-07-08 16:22:38 -07:00
Jay Sorg
d2915f349a Merge remote-tracking branch 'xrdp-org/master' 2013-07-08 13:05:51 -07:00
Jay Sorg
110edd31c8 fix Makefile error, fix for warnings 2013-07-08 12:46:31 -07:00
Jim Grandy
1b5437923d Add xorg/X11R7.6/rdp/rdpComposite.c, missed from previous commit (a27cbdd) 2013-07-07 08:17:12 -07:00
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
Marc-André Moreau
12381b1c0d Merge pull request #86 from cocoon/master
Dynamically build initscript paths from given prefix
2013-07-05 13:15:00 -07:00
cocoon
781e992c9e xrdp initscript add BASE var, add SDAEMON var, replace fullpaths
with combined path var

-DAEMON=/usr/sbin/xrdp

+BASE=__BASE__
(PREFIX gets replaced by given prefix, or as fallback /usr/local on Ubuntu)

+DAEMON=${BASE}/sbin/xrdp
+SDAEMON=${BASE}/sbin/xrdp-sesman
2013-07-05 21:58:16 +02:00
cocoon
ec7d1b4c38 dynamically insert prefix path into init script
using sed -i when running make install
2013-07-05 21:55:14 +02: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
Jay Sorg
45492057c5 Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-07-02 00:45:54 -07:00
Jay Sorg
29420b3134 chansrv: no logic change, work on warning 2013-07-02 00:45:40 -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
jsorg71
d16e8fdafb Merge pull request #1 from speidy/master
chansrv: sound: fix for pulse simplesound
2013-06-28 22:13:55 -07:00
Jay Sorg
bddf48602d optimize libmem.c 2013-06-28 22:11:15 -07:00
Jay Sorg
a330226dd9 added libmem and a test 2013-06-28 19:37:03 -07:00
Laxmikant Rashinkar
e75767e4dd Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-06-27 17:49:10 -07:00
Laxmikant Rashinkar
6d3a2cd5fd vrplayer: pause video during window move and resize 2013-06-27 17:48:52 -07:00