Instead of using "NULL, NULL, NULL, " in every macro, we now provide a
*_FULL variant which allows setting these. All other macros simply set
these to NULL by default.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We need to call afterchecks after any parsing we do. To signal that there
are no extra-arguments, we pass argv==NULL.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
The "file" callback is used to parse configuration files. If it is not
given, the string is parsed via "parse".
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We build several tools inside of this repository and we need to make sure
all dependencies are met. Furthermore, we must make sure that default
values are recognized even on dependencies.
Hence, this reworks the whole configure.ac handling and does some renaming
of the constants that are used all over the source.
We need to test this some more weeks, but it should finally be a proper
autotools handling that we can release with kmscon-6.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
DRM buffers are not guaranteed to be cleared after allocation. This is to
boost performance for small buffers that are allocated and freed often.
However, for render-buffers we can clear them without loosing any
performance as they are allocated once and then only freed on shutdown.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We now have the ability to pass on local configurations so we no longer
need the global kmscon_conf.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We allow options to specify "aftercheck" callbacks but do not call them
during a copy. Therefore, we need a way to copy side-effects. As we cannot
do that generically, we now allow each option to specify such a callback.
We use it for the "all_seats" and "argv" parameters in kmscon.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
If we copy entries into another context, we must not overwrite locked
entries. Furthermore, if we copy a locked entry, we must also copy that
lock.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Sorry for the huge commit, but this reworks the whole configuration
handler. We now provide conf_ctx contexts which contain a pointer to the
backing storage and the config-options that are used.
It is also possible to copy config-options now. So we can use the
main-config as default value for seat-configurations.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
EGL_DISPLAY is a no-op and we probably want to set EGL_PLATFORM. However,
it doesn't make any sense to set it, because EGL should be able to
properly detect the platform.
If this doesn't work on your machine, you should really try fixing your
environment before forcing this. If there are corner cases where this
doesn't work, you should file a bug against mesa.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This allows changing the backing-memory of a kmscon-config object. This
way, we can parse the same options into a per-seat config object.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We are about to introduce per-seat-configuration so we need some helper
macros that will later select the right configuration that we read from.
These helpers simply hook into the kmscon-config and return the correct
value.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This drops all config-file support except for the new
/etc/kmscon/kmscon.conf. For backwards-compatibility, we still parse
/etc/kmscon.conf but this will be removed soon.
We want to add one kmscon-config for each seat so you can have different
configurations per seat. These will all be put into /etc/kmscon/ so we
need this directory.
We also drop ~/.kmscon.conf. This was never really useful as kmscon is a
system daemon and should not be used with user-configuration files.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This new helper allows easily parsing arbitrary filenames. It does the
same as conf_parse_file() but allows giving filenames in printf format.
The other parsers are slightly adjusted so they can be more easily reused
by other projects.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This just rearranges all options so they are logically grouped and in the
same order at all places. It also changes the internal variable for
"--fbdev" from "use_fbdev" to "fbdev" so all variables have the same name
as the option-names.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This parameter allows to limit the maximum number of sessions to a sane
limit. Otherwise, a user could DOS a systemd by opening as many session as
they want.
This can be set to 0 to drop that limit, however, this is not recommended.
Instead, if you want an ability to add more sessions than that limit, you
should implement a flag to register_session() that overwrites the limit.
This can then be used by a safe way to register new sessions.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This makes the seat implementation register one dummy session as fallback.
This session isn't switched to except if no other session is available.
Furthermore, if the dummy is active and a new session is registered, it is
automatically activated.
External applications should never know of this dummy session. It's a
kmscon internal fallback so we can draw the screen even if there is no
other session available.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
The dummy session is a very simply session implementation that simply
draws a black background. It will be used by each seat as fallback if no
other session is available. If we didn't do that, we wouldn't be able to
guarantee that the screen is cleared after a session is unregistered.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
You can now use ctrl+alt+w to close the current session and
ctrl+alt+Return to start a new terminal (if it is built-in).
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We used to create all sessions that listen to displays during startup.
Therefore, all displays were kind of "hotplugged". However, we must also
send already existing displays to new sessions so we can create them
during runtime just fine.
This simply calls the session-callback during session-registration so you
must be fine getting the session callback when calling
kmscon_session_register().
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We currently do not reset the key-repeat-delay when key-presses are
changed fast enough to fall into the repeat-rate range. Therefore, we
might get spurios key-repeats, even though the key itself wasn't held for
repeat-delay milliseconds.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
If the compositor cannot be created, we now still stay alive and allow
other sessions to work. However, the terminal session is still required as
it is considered to be crucial.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
All of the (xkb) keyboard handling code was written by David and me;
even the old code was not based on xlib but written against the
specification (not entirely correct, too). All of this logic was moved
to libxkbcommon, which we merely link against.
We also no longer carry our own uterm_keysyms.h file, so that section is
not relevant either.
Signed-off-by: Ran Benita <ran234@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We needed these files before libxkbcommon had a function to convert
keysyms to unicode, and then for the 'plain' keyboard backend, which
didn't use libxkbcommon. Since this backend was removed, these files are
no longer needed.
Signed-off-by: Ran Benita <ran234@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This adds a wayland compositor which registers sessions for each top-level
window within kmscon. This means, you can run any arbitrary
wayland-application on kmscon. Each top-level window that is registered by
the applications is put into a separate session and you can switch between
the sessions with the previously introduced session-shortcuts.
The compositor is still very basic. It doesn't support input devices at
all (not even talking about DnD). The only thing it does is surface
management (and even that is not fully implemented).
However, this shows the direction that kmscon will go. You can run the
Wayland "simple-shm" and "simple-egl" demos on kmscon to see how it works.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This adds two new grabs to switch sessions within kmscon. They are set to
ctrl+alt+Left/Right by default.
To improve debugging, we also add some log-messages to session management.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
The *_but_one() variants of dlist-loops start from within a loop instead
of at the head and iterate over all elements except the start-element. The
start element is skipped as we would need a temporary variable to include
it and in most times you want to skip the start-element, anyway.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We allow users to specify grabs on the command-line or in config-options.
We sometimes want multiple grabs to do the same. Therefore, this changes
the grab-parser and handlers to allow this.
Furthermore, this adds support for keysyms that are assembled of multiple
syms. This isn't needed by any keymap, yet, but might be used in the
future.
Last but not least, you can also specify modifiers only now. This might be
used by subsystems to use the default keysyms but let the user specify
what modifiers should be used.
However, be careful when specifying modifiers-only for normal grabs as
this means the grab is executed everytime the modifier is reported with
_any_ key.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We must not recreate a video-mode if we re-activate an fbdev display after
wake-up. Otherwise, the "current" pointer changes and users might get
confused. We guarantee that the "current" pointer stays the same during
operation as we currently do not support changing display size without
reactiating the display.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
fbdev does not provide any vertical-blanks so this introduces a generic
framework for uterm-videos as replacement. We simply schedule a timer
event that fires after a fixed timeout. This allows other subsystems to
rely on the page-flip event to occur either at the next real page-flip or
at a fixed timeout. As this is what we want in most places, we just
implement it inside of uterm. So relying on page-flips no longer hogs the
CPU because swap() generates the right away.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Users might be interested in vertical-blank events so we now allow them to
register event-callbacks on displays. The only event that we currently
pass is a page-flip event that is always sent as reaction to a swap. If
there is no hardware support for such events, we simply throw it from
within the swap() function.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Instead of requiring to create uterm-screens, it is now possible to blit
and fill displays directly similar to fake-blends.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
If we deactivate a session, we must not activate the next session we find
but we need to look for an enabled session instead.
This also changes the session_deactivate() helper to allow deactivating
disabled sessions. This shouldn't be relyed on, but it is a safe fallback
if some session turns out to be disabled but still active.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We use this naming-scheme for all the session-helpers so we should also
use it for the callback notifications.
Also rename all the callback-helpers to *_call_* so we have no
name-clashes.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
If we want to allow dummy sessions, we need some way to disable these so
they are never activated on a seat. This patch disables every session by
default and you need to explicitely enable them to be available for
activation.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This helper allows to check whether a given session is currently the
active session on its registered seat.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This helper allows API users to check whether a session object is still
registered to a seat.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We currently do not handle modifier-changes during key-repeats. This is
odd as pressing shift should change a repeating key.
To avoid duplicating a lot of code, this patch puts most of the
key-handling into helper functions and cleans it up. We now handle all
kinds of key-repeat specialties and everything should work fine.
Reported-by: Ran Benity <ran234@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
A key-repeat is about keycodes, not keysyms. We repeat the keycode and the
events that are generated by it, so we must also stop repeating if the
given keycode is released.
This fixes a bug where a key would still be repeated if we press:
<a-down> - <Shift-down> - <a-up> - <Shift-up>
Reported-by: Ran Benita <ran234@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
The XKB functions actually return <0 if the modifier is invalid. This
cannot happen for the hard-coded modifiers that we use, but it is still
safer to check correctly whether the returned value is >0.
Reported-by: Ran Benita <ran234@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Even though I really like the high repeat-rates, it might not be the best
default option. Hence, change it to some sane default.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
It isn't clear from the xterm documentation which buffer to clear when
resetting private mode 1047. However, testing showed that the
alternate-screen is cleared, not the main-screen.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
The alternate screen is mainly used to avoid linking lines to the
scrollback buffer. This implements this feature so only main-screen lines
end up in the scrollback buffer.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We correctly free all new space and this is really needed due to rotations
in the active screen and scrollback buffer.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We didn't correctly initialize new lines on resize. In fact, we didn't
initialize new cells at all. This was all covered by a nasty-fix in the
screen-resize handler.
This fixes the line-resize handler to initialize all new cells correctly.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
We have to free both, main and alternate buffers on shutdown. We only used
to free the currently active buffer.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
On DECSET 47, 1047-1049 we switch between normal screen mode and alternate
screen mode. xterm and friends support a titeInhibit resource that
disables this feature, so we add a flag to set this, too. However, there
is currently no way to set this on the command-line. If someone needs
that, we can easily add that.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
The VTE layer can now set the TSM_SCREEN_ALTERNATE flag to switch to the
alternate screen-buffer and back.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This changes the line-allocation helpers of TSM-screen to allocate an
alternate buffer along with the main-buffer. We still keep the "lines"
pointer to the main-buffer all the time, but this will allow to implement
alternate-xterm-screens later.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
