1200 Commits

Author SHA1 Message Date
David Herrmann
9ddbe5405a tsm: vte: ignore DEC SET/RESET 12 mode
This mode is used to start/stop blinking cursors. As vim uses this
heavily, we should simply ignore it to avoid printing useless debug
messages.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-02 10:15:40 +01:00
David Herrmann
d22e59f2b0 seat: ignore keyboard shortcuts in single-session mode
Instead of not handling the keyboard shortcuts we should ignore them but
mark them as handled. Otherwise, we might get them from the parent session
and they will end up cluttering the terminal log.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 23:45:55 +01:00
David Herrmann
294312185f cdev: implement VT_WAITACTIVE
The VT API provides a VT_WAITACTIVE ioctl which waits until the VT got
activated. We use the same technique as with blocking reads() to implement
this without threads.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 19:06:38 +01:00
David Herrmann
00297c43cc terminal: fix unregistering display callbacks when removing screens
We must unregister the display callback when removing a screen. Otherwise,
we keep writing to the screen memory which becomes invalid then.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 18:22:38 +01:00
David Herrmann
4cd7b696d3 seat: change default keyboard shortcuts to ctrl+logo
ctrl+alt is already used by many other applications so lets use some other
unused shortcut modifiers.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 17:39:38 +01:00
David Herrmann
529ad081ab conf: introduce --configdir parameter
The --configdir parameter allows specifying another configuration
directory than the default /etc/kmscon.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 17:27:45 +01:00
David Herrmann
22a1e1b91b seat: limit multi-session mode to --multi-session
If kmscon is started without the --multi-session option, we no longer
provide multi-session support (now the default). This is for better
backwards compatibility to agetty and friends.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 16:09:14 +01:00
David Herrmann
79312a60ae conf: print warning if --vt is used wrong
--vt should only be used when kmscon runs on a single seat. Otherwise,
this VT will be forced on all seats and each kmscon instance _might_
collide.
If this is done with care, the --vt/--seats combination can work. However,
the use-cases are negligible and we should rather warn the ordinary user
not to do it.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 15:46:42 +01:00
David Herrmann
53ad90da0f uterm: vt: use real VTs on all seats if available
If there is already a kmscon instance running that provides fake-VTs, then
lets use it. This allows stacking kmscon processes and is very useful for
debugging.

Also other applications that use uterm can now run inside of kmscon
without any other special configuration.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 15:25:37 +01:00
David Herrmann
1796e33441 seat: register cdev session only when --cdev is given
We cannot have multiple instances of kmscon running with cdev emulation,
so disable it by default. A kmscon-system-daemon now needs --cdev if you
want fake VTs to work.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 15:05:07 +01:00
David Herrmann
0da912fbbd conf: fix whitespace offset for -s
Align everything to the same offset.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 14:50:53 +01:00
David Herrmann
0d8102a286 pty: downgrade error to debug message on I/O errors
I/O errors aren't fatal or important on PTYs so ignore them and mark it as
debug message.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 13:15:01 +01:00
David Herrmann
2f546b7f19 cdev: fix typo in warning
Obvious typo. Got those words swapped...

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-12-01 13:11:39 +01:00
David Herrmann
5442e5f903 uterm: clear displays during sleep and wakeup
We shouldn't leave the content on the framebuffers when leaving kmscon.
This might confuse the user. Furthermore, we shouldn't reload the old
framebuffer during wakeup as this frame can be quite old and we see a
short flickering during wakeup which isn't wanted, either.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-28 22:58:39 +01:00
David Herrmann
9a70af0ecc seat: set DPMS to ON before broadcasting the device
We cannot modeset a device while DPMS is set to OFF so we should do this
before broadcasting the device. Otherwise, the callback might not be able
to use the display.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-28 22:21:33 +01:00
David Herrmann
145e6fc402 main: correctly remove all displays on uterm-video shutdown
If we close an uterm-video object, we must correctly remove all displays
first.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-28 22:16:07 +01:00
David Herrmann
9f63ed94d4 terminal: check swapping state during activation
If a terminal gets activated while a swap-buffer operation is still in
progress from the previous session, we must not directly reschedule it.
Instead, we wait for the page-flip event and continue then.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-28 22:14:05 +01:00
David Herrmann
df98046189 seat: activate displays only when being in foreground
We shouldn't activate displays when we are active but in background. In
these moments, the uterm-video device might not be initialized, yet.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-28 21:55:50 +01:00
David Herrmann
f24ab890ad terminal: remove now unused --fps option
We no longer have a framerate-control option so remove it.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-28 20:57:36 +01:00
David Herrmann
19c2991fbb terminal: sync redraw events with vertical blanks
We used an FPS timer to control redraw events but this caused some
unwanted artifacts. Instead, we should always wait for the page-flip event
before redrawing the screen.

This can still be optimized (for instance via triple-buffering) but it
works very nice now.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-28 20:51:30 +01:00
David Herrmann
5c527e7fec terminal: keep terminal reference in each screen
We need to have a terminal reference in future screen callbacks so keep
one from the beginning.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-28 19:31:09 +01:00
David Herrmann
0b9fa6aa29 pty: fix ignoring HUP on pty-master files
A HUP is reported whenever there is no client listening on the other side
of the PTY. As /bin/login and friends call vhangup() during setup, there
is a short time-span when we might get a HUP.
Hence, we need to ignore HUPs and solely track clients by PID. To avoid
hogging the CPU while the TTY is hungup, we change the event-mode to
edge-triggered.

This fixes a bug where we tried starting /bin/login several times because
we always ran into this race-condition and directly closed the TTY again.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-28 17:47:31 +01:00
David Herrmann
ae97bbf7e3 eloop: allow edge-triggered operation
A new EV_ET flag allows ev_fd sources to operate in edge-triggered instead
of level-triggered mode. See epoll(7) for more information.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-28 17:46:18 +01:00
David Herrmann
e8c439c805 pty: remove unused "master" argument
We do not use the master pty fd when spawning the child so skip it.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-27 19:02:48 +01:00
David Herrmann
f25c41f8f9 eloop: fix not disabling sources on EV_HUP
We used to disable event sources on EV_HUP to avoid draining the
event-queue for non-edge-triggered sources. However, this turns out to be
not working with special files so we disable it again.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-27 19:00:57 +01:00
David Herrmann
48ab1317ad uterm: video: add uterm_display_is_swapping() helper
This new helper can be used to check whether a display has a pending
vsync'ed buffer-flip scheduled.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-26 17:19:45 +01:00
David Herrmann
d0991ec639 uterm: video: remove uterm_screen API
The uterm_screen API is no longer used internally and we do not plan to
extend it. So we can use uterm_display as a replacement to make the API
thinner and easier to use.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-26 17:11:07 +01:00
David Herrmann
da7219e6de test_output: use uterm_display directly
uterm_screen is scheduled for removal so use the display API directly.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-26 17:10:44 +01:00
David Herrmann
5f234e6592 text: use uterm_display directly
Instead of using the uterm-screen indirection, we now directly access
uterm-display objects. We do not really intend to use virtual screens with
kmscon so there is no need to make this more complex.

I don't think consoles should every provide this feature. Instead, you
should use real compositors for such tasks like Wayland+wlterm. kmscon,
however, is rather an emergency tool or a safe backup than a fancy
daily-use-console.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-26 16:50:39 +01:00
David Herrmann
2cac43f64e ui: remove old unused UI subsystem
The UI subsystem was replaced by the seat subsystem and is no longer used.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-20 14:30:54 +01:00
David Herrmann
9fe0e9119f tsm: handle ISO_Left_Tab
If Shift+Tab is pressed, most keyboard layouts map this to ISO_Left_Tab
which itself should be converted to \e[Z.

Reported-by: Vladimir Kravets
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 16:26:38 +01:00
David Herrmann
054955c530 cdev: implement fake-VT-switching
This implements VT switching for cdev sessions. This allows to run
external applications as sessions inside of kmscon.

This should only be used for backwards compatibility. There is really no
reason to develop new applications to do this. Instead, use
system-compositors which make all the work for you!

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 16:14:38 +01:00
David Herrmann
65f97ef564 seat: add --grab-session-dummy option
This option specifies a shortcut that can be used to schedule the dummy
session on the given seat.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 16:11:34 +01:00
David Herrmann
3c223d9bec seat: add helpers to schedule sessions from the outside
Two new helpers to schedule a specific session or a session given by a
hint-number. These can be used by other subsystems to schedule
their/others sessions.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 16:10:01 +01:00
David Herrmann
7b83d77463 seat: remove "manual input" logic
This really doesn't make sense. We no longer want the applications to be
in charge of VT switches so always force the VT-master to be in control of
the VT-switching logic.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 16:07:34 +01:00
David Herrmann
890e34556b seat: allow scheduling dummy session
We always considered the dummy session to be no real session. However,
under special circumstances it might be desirable to schedule the dummy
session (very important for debugging). Therefore, change the logic to
allow scheduling the dummy session.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 16:03:57 +01:00
David Herrmann
71e497277d uterm: vt: fix input-device sleep-control
We need to correctly put input devices asleep only if we really disable
the VT. If our callbacks fail and prevent the VT-switch, we must keep the
input devices awake. Otherwise, we will lose control over the
sleep-states.

Also correctly put the device asleep during shutdown.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 15:57:35 +01:00
David Herrmann
f460764f9e shl: array: use "const" for source arguments
Use "const" even for void pointers as gcc will complain otherwise. Source
arguments are read-only, anyway, so this doesn't break anything.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 13:54:17 +01:00
David Herrmann
ffd431babe seat: be more verbose on asynchronous session switching
Print debug messages when doing asynchronous session switches and handle
EINPROGRESS as special error code.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 13:18:53 +01:00
David Herrmann
d7660329e9 seat: fix delayed VT switches
If we switch VT and the current session cannot be put asleep, and later it
notifies us that it went asleep, we should then switch VT and not
reschedule the sessions.

We do this by remembering whether a VT switch is pending. The new
uterm-retry infrastructure allows us to easily repeat VT switches then.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 13:13:01 +01:00
David Herrmann
caf4178803 seat: fix calling parent-callbacks on forced sleeping
If we force a seat to go asleep, we should _always_ notify the parent
about this. Otherwise, we might get unexpected results.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 13:12:10 +01:00
David Herrmann
080ecfd637 seat: allow sessions to switch between background/foreground
Two new helpers allow sessions to mark them as background and foreground
sessions. This will immediately switch them into the new state.

The internal infrastructure was already available, but we currently always
used foreground sessions.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 13:10:51 +01:00
David Herrmann
275692ee70 seat: allow sessions to control VT-switches
A new helper allows sessions to manually handly input events so the core
does no longer perform session/VT switches on their behalf.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 13:07:36 +01:00
David Herrmann
6da6e2319a uterm: vt: implement delayed VT-switches
If we cannot immediately perform a VT switch away from our application, we
might want to retry this shortly after. Therefore, we can now call
uterm_vt_retry() which then performs any outstanding VT-switches.

To avoid unexpected behavior, we limit this to a 2-3 second delay.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 13:04:15 +01:00
David Herrmann
06eb8d71a7 uterm: vt: do nothing if VT-switch targets our VT
If the user presses some keys to switch VTs and the target VT is our VT
(which is already active in this case), we shouldn't do anything. Calling
VT_ACTIVATE doesn't particularly hurt, but it doesn't get us anything
here so skip it.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 13:01:57 +01:00
David Herrmann
e1687d5931 uterm: vt: do nothing if target-VT is already active during deactivation
If we deactivate our VT and the target-VT is already active (probably
because we opened the _current_ VT during uterm-vt creation), we shouldn't
do anything but simply close the VT.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-19 13:00:38 +01:00
David Herrmann
75435623e1 seat: fix forwarding errors in seat_pause()
If we force a pause we need to forward the error code. Otherwise, we
cannot properly react on it and print warnings.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-17 20:25:29 +01:00
David Herrmann
527a73120b seat: allow calling go_foreground if already in foreground
If we are asleep and in foreground, go_foreground() should return success
so we can safely unload asynchronous sessions. Otherwise, we wouldn't be
able to handle them properly while being inactive or we would need a whole
bunch of other checks.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-17 20:13:27 +01:00
David Herrmann
c7707560de uterm: vt: do not check SIGUSR1/2 for SI_KERNEL
If we want to run as client under user-space fake-VT implementations like
kmscon-cdev, we need to be able to catch those signals from
userspace-daemons. Therefore, do not check whether the signals were
generated by the kernel.

This doesn't affect security in any way as non-priviledged processes
aren't allowed to send signals, anyway. Moreover, this increases
debugability of VT layers a lot as we can fake these signals now.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-17 19:45:44 +01:00
David Herrmann
0799a4e1fb build: fix wlterm wayland-dependency check
The logic behind this two-layer check is bogus and doesn't work. Merge
both layers so we have a proper dependency-check again. This will make the
error messages less verbose but at least it works again.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-11-17 19:42:57 +01:00