Merge lp:~mlankhorst/mir/setsid into lp:~mir-team/mir/trunk
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt on 2013-08-08 |
Approved revision: | 900 |
Merged at revision: | 942 |
Proposed branch: | lp:~mlankhorst/mir/setsid |
Merge into: | lp:~mir-team/mir/trunk |
Diff against target: |
217 lines (+97/-4) 4 files modified
src/server/graphics/gbm/gbm_platform.cpp (+10/-0) src/server/graphics/gbm/linux_virtual_terminal.cpp (+55/-2) src/server/graphics/gbm/linux_virtual_terminal.h (+5/-0) tests/unit-tests/graphics/gbm/test_linux_virtual_terminal.cpp (+27/-2) |
To merge this branch: | bzr merge lp:~mlankhorst/mir/setsid |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Approve on 2013-08-08 | ||
Chris Halse Rogers | Approve on 2013-08-08 | ||
Robert Ancell | 2013-07-31 | Approve on 2013-08-08 | |
Alexandros Frantzis (community) | Needs Information on 2013-07-31 | ||
Alan Griffiths | Abstain on 2013-07-31 | ||
PS Jenkins bot (community) | continuous-integration | Approve on 2013-07-31 | |
Review via email:
|
Commit message
Re-introduce console support, and ignore control characters
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:900
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
Robert Ancell (robert-ancell) wrote : | # |
Code looks good, haven't tested it for behaviour.
Alan Griffiths (alan-griffiths) wrote : | # |
No style issues with the code, but I'm unfamiliar with the APIs and the issue being addressed
Alexandros Frantzis (afrantzis) wrote : | # |
54 + if (fops->
Doesn't this turn off input completely? If so, we need to be able to handle VT switching through another mechanism before this lands (handling the keypresses ourselves and changing VT).
Daniel van Vugt (vanvugt) wrote : | # |
Tested it myself. This does indeed break VT switching, though clients get input as they should.
Once you start the server you can't switch away from it, or kill it (without an ssh login).
So needs fixing:
1. Add support for VT switching out of Mir (maybe Ctrl+Alt+Fn).
2. Add support for killing the server, since Ctrl+C doesn't any more (maybe use Ctrl+Alt+Backspace)
Daniel van Vugt (vanvugt) wrote : | # |
Though it's possible that XMir requires neither of those new key combos. So maybe they need to be implemented in examples/
I'm not sure. Do we want VT switching and emergency exit to be a generic thing implemented in libmirserver? If not then it would go in the examples/ servers.
Chris Halse Rogers (raof) wrote : | # |
I don't believe that we want VT switching to be a core thing at all; don't we plan to remove VT switching entirely at some point?
Daniel van Vugt (vanvugt) wrote : | # |
Fair point. But to avoid blocking other developers from doing their thing, VT switching should be reimplemented in demo_server_shell at least. And maybe demo_server.
Similarly, being able to kill the demo server is critical for us. I suggest Ctrl+Alt+Backspace.
Daniel van Vugt (vanvugt) wrote : | # |
Put it this way... We need to be capable of running a demo server and client(s) on a single machine. Otherwise development is extremely difficult.
This means (1) VT switching support; and (2) the ability to kill the server. Though if (1) is working well enough then you can use that in place of (2).
Robert Ancell (robert-ancell) wrote : | # |
> Fair point. But to avoid blocking other developers from doing their thing, VT
> switching should be reimplemented in demo_server_shell at least. And maybe
> demo_server.
>
> Similarly, being able to kill the demo server is critical for us. I suggest
> Ctrl+Alt+Backspace.
https:/
Robert Ancell (robert-ancell) wrote : | # |
> I don't believe that we want VT switching to be a core thing at all; don't we
> plan to remove VT switching entirely at some point?
Certainly not in the 13.10 timeframe.
Robert Ancell (robert-ancell) wrote : | # |
I tried to make the demo server do VT switching itself, but it locks up in the same way that the current trunk does (i.e. video stops updating showing last frame - can't switch back).
Code is lp:~robert-ancell/mir/setsid-alt-ctrl-Fn
Given we can't VT switch on trunk I don't think this blocks this MP.
Robert Ancell (robert-ancell) wrote : | # |
Actually, with further testing I can VT switch from trunk, and not from this branch (even once merged with trunk). So there is an issue in it that stops VT switching.
Robert Ancell (robert-ancell) wrote : | # |
With some more work in lp:~robert-ancell/mir/setsid-alt-ctrl-Fn I can now VT switch with this patch. So now we just need:
- This branch to support quitting and/or VT switching in the example servers
- Unity System Compositor to support VT switching
Robert Ancell (robert-ancell) wrote : | # |
This MP enables VT switching in Unity System Compositor:
https:/
Daniel van Vugt (vanvugt) wrote : | # |
Robert,
Can you propose lp:~robert-ancell/mir/setsid-alt-ctrl-Fn for merging into this one, when ready?
Robert Ancell (robert-ancell) wrote : | # |
I've got alt+ctrl+Fn keys working in https:/
Daniel van Vugt (vanvugt) wrote : | # |
This looks a bit old school... 9600 bps?
65 + cfsetispeed(
66 + tcattr.c_oflag = 0;
67 + cfsetospeed(
But anyway, it works and my previous concerns are resolved by the sister branch: lp:~robert-ancell/mir/vt-switch-keys
FAILED: Continuous integration, rev:900 /code.launchpad .net/~mlankhors t/mir/setsid/ +merge/ 177800/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// jenkins. qa.ubuntu. com/job/ mir-ci/ 1140/ jenkins. qa.ubuntu. com/job/ mir-android- saucy-i386- build/1498 jenkins. qa.ubuntu. com/job/ mir-clang- saucy-amd64- build/1383 jenkins. qa.ubuntu. com/job/ mir-saucy- amd64-ci/ 378 jenkins. qa.ubuntu. com/job/ mir-saucy- amd64-ci/ 378/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-vm- ci-build/ ./distribution= quantal, flavor= amd64/741
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ mir-ci/ 1140/rebuild
http://