667 Commits

Author SHA1 Message Date
David Herrmann
6ae5ddc0e7 text: add bbulk renderer
The bbulk renderer is very similar to the bblit renderer but it assembles
a request-buffer of all characters and then pushes these requests via a
vector-call to the video hardware.
This turns out to increase performance slightly as we do not call into the
video subsystem for every characters but only once.

This renderer can reduce performance when used with partial-redraws (which
are not implemented, yet), so we keep the bblit renderer around.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-09-04 17:58:37 +02:00
David Herrmann
720d8d8dfd uterm: video: greatly enhance performance by special casing
If we special-case the "src == 0" and "src == 0xff" cases, then we can
avoid all the heavy calculations most of the time. This reduces rendering
time by like 50%.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-09-04 17:56:03 +02:00
David Herrmann
69bde6077e pty: improve application data read-path
The kernel tty buffer is actually too small to buffer data for 20ms, which
is the time a frame may take in kmscon so we can still get 50 fps.
However, profiling showed that we often read multiple times from the pty.
We can optimize this by increasing the buffer to match the tty internal
buffer.

The kernel internal buffering is currently the only performance slowdown
that we have. That is, the data an application writes while we do a single
rendering is more than the kernel can buffer. Therefore, the application
waits until we read from the pty again. We then wait with redrawing until
the next vblank.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-31 20:19:55 +02:00
David Herrmann
3386aa955b uterm: video: add vectorized blending
Vectorized blending allows pushing multiple blending-requests to the video
hardware at once. This can speed up rendering on 2D devices a lot.
However, the gl-rendering is really just for completeness and shouldn't be
used if performance matters.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-31 00:00:07 +02:00
David Herrmann
107581b7e4 uterm: video: drm: fix running without gles2 stride support
Similar to the gltex renderer we need to work around the missing stride
support in plain gles2. Most drivers provide it but we cannot rely on it.
Therefore, we simply allocate a temporary buffer for it. This horribly
breaks performance, but the 2D blitting via DRM was never fast, anyway.
Don't use it except for testing and debugging.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-30 23:57:18 +02:00
David Herrmann
efce8e1747 uterm: video: improve blitting performance
Turns out gcc didn't optimize this trivial math so we do it by hand. This
reduces the number of divisions per color to 1. This increases performance
by like 15%.

As a second optimization, we replace the division with a left shift, that
is, we divide by 256. Technically, this is wrong as we will get slightly
incorrect results. However, this is hardly noticible by human eye so we
can safely use it. This increases performance by like 20% again.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-29 17:56:38 +02:00
David Herrmann
c0047d701a misc: add timer infrastructure
Timers can be used to measure time-delays with microsecond resolution.
This is heavily used for performance-tests and to improve rendering
performance.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-29 17:54:16 +02:00
David Herrmann
e1a6437473 main: add --render-engine option
This option allows changing the console renderer during runtime. This is
only useful for debugging. The default choice should be best for all
situations.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-28 10:41:33 +02:00
David Herrmann
232486dfd3 gl: shader: do not include uterm.h
The "static" library does not have any dependencies. To avoid compilation
errors, remove this inclusion.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-26 18:18:33 +02:00
Ted Kotz
4788267a9c text: font: add unifont backend
This adds a new Unifont font-backend based on the recently added Unifont
data. The backend is disabled by default for 2 reasons:
  - It takes about 5min to compile and needs >1GB of memory on an Intel
    Atom N450
  - License situation is unclear as it is GPL

Written-by: Ted Kotz <ted@kotz.us>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-25 17:04:51 +02:00
David Herrmann
e9b523c3f1 text: font: unifont: add genunifont generator
This new generator converts the unifont hex-encoded data into a C-source
file which then can be compiled statically into the kmscon binary. Please
note that the resulting source file is bigger than 100MB and can take
quite a while to compile.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-25 15:36:55 +02:00
David Herrmann
ec808aba12 text: include errno.h in text.h
text.h uses -EOPNOTSUPP so we should include errno.h to avoid compilation
errors.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-25 14:00:19 +02:00
David Herrmann
711b4ffe76 text: font: add unifont font description
The GNU Unifont project provides a bitmap font with a fixed 8x16/16x16
size. The source is encoded as simple hex-file.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-25 10:45:51 +02:00
Marcin Slusarz
569868ed62 build: improve gbm_bo_get_stride check
There were 3 problems with previous version:
- it didn't take into account libgbm cflags (fatal error: gbm.h: No such file or directory)
- it was vulnerable to gbm.h include bugs (gbm.h:259:50: error: unknown type name 'size_t')
- it was checked even when libgbm was not detected
Fix it.

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-23 22:03:02 +02:00
David Herrmann
beb7c25137 terminal: remove debug messages
These messages should have never been committed, oops. Remove them as they
are really not needed.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-22 12:59:11 +02:00
Marcin Slusarz
a0a6237825 uterm: video: drm: check for EGL_KHR_surfaceless_context
Mesa 8.1-devel/9.0-devel stopped exposing EGL_KHR_surfaceless_opengl because
it never actually existed and started exposing EGL_KHR_surfaceless_context.
Check that in addition to EGL_KHR_surfaceless_opengl.

http://cgit.freedesktop.org/mesa/mesa/commit/?id=b50703aea55450e04bcd8154335774786e0f253b

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-22 12:57:08 +02:00
David Herrmann
8398f4b0f9 terminal: add --fps to limit framerate
Instead of redrawing on change, we now use a framerate-timer which
redraws the screen. This timer stays active for 1s after the last redraw
so we do not enable/disable the timer while the console is under heavy
work-load. This still needs to be benchmarked but it seems to work nicely.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-21 17:59:02 +02:00
David Herrmann
a05815eb71 pty: read all available data instead of only one chunk
If there is plenty data available, we should read all of it before
returning. Otherwise, we might spend too much time letting the other
subsystems perform actions. This can have the effect, that we render after
each read() on the pty if a redraw takes more time than a single frame.
This is definitely not what we want.

To avoid staying here too long we use a hard-coded maximum. Otherwise, if
the vte layer takes longer than the pty-end writes data to us, we might
stay here forever. This is very unlikely as the VTE layer as no immediate
side-effects that make long computations, but we use it to be on the safe
side.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-21 17:44:43 +02:00
David Herrmann
5f59c7953c text: gltex: fix rendering whithout GL_EXT_unpack_subimage
OpenGLESv2 doesn't support specifying stride values for textures without
this extension. So allocate a temporary storage when uploading values
which have a default-stride.

This was reported by "towolf / Tobias Wolf" on github:
  https://github.com/dvdhrm/kmscon/issues/17

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-21 14:53:59 +02:00
David Herrmann
7ad970c1f4 build: add build-time check for gbm_bo_get_stride()
Upstream mesa renamed gbm_bo_get_pitch() to gbm_bo_get_stride(). As gbm
has not seen an official release, they actually don't care but several
users complained about this. Therefore, we simply add a build-time check
for this. However, this may break when mesa is updated without recompiling
kmscon but that is less intrusive.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-21 14:38:30 +02:00
David Herrmann
585879281f gl: add gl_err_to_str() helper
This helper converts an GL error into a string for easier debugging.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-20 20:10:29 +02:00
David Herrmann
5dfc12ee6a uterm: vt: fix resetting access control on VT-close
This is a weird fix. One would think that this is automatically reset when
calling close() on the fd but, suprise, it's not. So lets reset this
manually, otherwise when we close the VT but our application is still
active, the user will never be able to leave the VT again.

Again a hilarious example why the VT API sucks. Really... Get rid of it.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-20 14:57:39 +02:00
David Herrmann
06d33f6636 uterm: vt: add fake VT via user-input
This actually incorporates the fakevt tool into kmscon. That is, if the
user presses ctrl+mod4+F12, we activate or deactivate the fake VT.

This is for debugging only and needs to be made more configurable. Use it
on your own risk.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-15 09:27:11 +02:00
David Herrmann
7ad2044077 console: suppress multiple warnings
If a single rendering-round prints more than 3 warnings for
unrenderable-glyphs, we suppress these warnings. This is useful for
debugging rendering errors. As sometimes no glyph was renderable and this
caused >80x24 warnings.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-15 09:25:55 +02:00
David Herrmann
40ef6f9491 terminal: add wake-up/sleep logic
Similar to the UI subsystem, we also need to be aware of our current state
inside of the terminal subsystem. We can now avoid rendering graphics when
not awake. This suppresses odd warnings that occured when keeping an
application active and printing in the terminal while the terminal was in
background.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-15 09:24:45 +02:00
David Herrmann
2ba0cc5ec2 main: correctly wake up UI subsystem
We must wake up the UI system _after_ wakeing up everything else,
otherwise, they might assume everything else is already up.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-15 09:23:24 +02:00
David Herrmann
dbb589c55b ui: add sleep/awake logic to UI
We need to forward all sleep/awake states to the lower subsystems to avoid
overdoing stuff like rendering an user-input. That is, while being asleep
we shouldn't render and/or do any other user-interaction.

This patch simply adds this logic to the UI subsystem, which, however,
does not to anything useful, yet.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-15 08:54:02 +02:00
David Herrmann
d372390734 uterm: input: make sleep-state recursive
Instead of using a boolean state we now have an integer and a device needs
to be put asleep as often as it was woken up to be put asleep, and vice
versa.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 22:57:36 +02:00
David Herrmann
5aade75f3d uterm: uxkb: fix correctly resetting input state
We currently have a very subtle bug when modifiers are pressed while
leaving a terminal but released while entering. The internal state will
not be updated and as xkbcommon does not fix this up, we need to recreate
the state when re-entering the terminal.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 22:47:34 +02:00
David Herrmann
b697fcd43c terminal: implement basic scrolling-keys
This implements Shift+UP/DOWN and Shift+PageUp/PageDown as scrolling keys
for terminals. This will later be made configurable so other
keyboard-shortcuts can be used.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 17:09:42 +02:00
David Herrmann
5a24d624ae terminal: add --sb-size to control scrollback buffer size
The new sb-size option specifies the size of the scrollback buffer. Use 0
to disable the scrollback-buffer.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 17:08:55 +02:00
David Herrmann
4f57e7b3d2 console: provide scrollback-buffer helpers
These helpers allow moving around in the scrollback-buffer. Scrolling
bigger portions of the screen is quite slowly as we have to traverse a
list. However, nothing compared to screen-rendering so we can ignore this.
But O(n) is always bad...

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 17:02:56 +02:00
David Herrmann
681c9acb4c vte: return status in kmscon_vte_handle_keyboard()
We now return whether the key had any effect. This can be used by the
terminal handler to perform various actions on user-input.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 17:01:55 +02:00
David Herrmann
4f7188337e main: add --dumb option to control uterm devices
The --dumb option disables hardware-accelerated rendering and instead uses
the dumb-DRM devices.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 16:34:28 +02:00
David Herrmann
4a034895c8 main: add font options
This adds two options --font-size and --font-name that can be used to
configure which font is used.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 16:29:55 +02:00
David Herrmann
572bc3e195 conf: add UINT as new datatype
The "uint" type parses an unsigned integer as argument.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 16:23:03 +02:00
David Herrmann
88a2fa1e63 uterm: input: do not include main.h
The uterm library does not need and must not depend on main.h. Remove the
unneeded inclusion.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 16:22:15 +02:00
David Herrmann
227ada42a2 vte: add --palette=XY to choose color palette
This adds two more color-palettes and a mode to choose the used palette.
The "solarized" palettes are from an online project that tries to optimize
color palettes.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 16:08:30 +02:00
David Herrmann
feb29d857c vte: add COLOR_FOREGROUND/BACKGROUND to palette
Instead of hard-coding these values we simply put them into the palette.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 15:52:26 +02:00
David Herrmann
d74c94360b vte: make color-palette configurable
This adds a color-palette-pointer to VTE objects so each VTE object can
have a different palette. This allows runtime configuration of terminal
colors.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 15:47:13 +02:00
David Herrmann
cb178cdc4e console: add function to set default-attribute
This new function allows other layers to control the default attribute of
a console. This attribute is used when clearing the screen or when
allocating new cells.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 15:44:55 +02:00
David Herrmann
47b1aa3bb9 console: remove kmscon_console_set_bg()
This function is no longer needed so we can safely remove it.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-14 15:11:19 +02:00
David Herrmann
9bce87d564 uterm: vt: fix checking for /dev/tty0 instead of /dev/tty
/dev/tty may be available even though CONFIG_VT is not set. Therefore,
check for /dev/tty0 instead which is guaranteed to be not available with
CONFIG_VT=n.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-12 13:31:19 +02:00
David Herrmann
d97fc0baf0 uterm: monitor: fix crash during device hotplug
We must make sure that the returned value is non-NULL, otherwise we crash
during device-change events for non-DRM-Hotplug events.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-12 13:26:16 +02:00
David Herrmann
f084da1852 uterm: vt: add fake-vt logic for debugging
This adds a very limited non-multi-seat-capable fake-VT logic. If you use
this in production it will break your multi-seat systems so do not use it
except for debugging.

On SIGUSR1 we activate fake VTs and on SIGUSR2 we deactivate them. The
signals must be sent from a priviledged process. Kernel signals are
ignored.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-12 11:18:48 +02:00
David Herrmann
4f3cd2eecd uterm: vt: ignore non-kernel signals in real-mode
If using real linux VTs, we must ignore all signals that are not sent from
the kernel. Otherwise, we might get problems if we reuse SIGUSR for other
functionality.
Note that we already check that we are the active VT before handling
SIGUSR. However, this hardens this check to be more sure that this is
really the signal we want.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-12 10:21:11 +02:00
David Herrmann
4c1da1069d uterm: vt: mark vts as dead during deallocation
To avoid useless checks wether a vt is valid we simply mark it as dead and
centralize the checks in the API entry point.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-12 10:16:55 +02:00
David Herrmann
4029539cd1 uterm: vt: always register signal handlers
This register the SIGUSR1/2 signal handlers even though we are no real VT.
This is needed to implement other fake-VT helpers for systems were real
VTs are not available.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-12 10:11:50 +02:00
David Herrmann
58eb1e85b9 uterm: vt: rename real VTs internally to real_*
Instead of using the old kmscon_vt_* names we now prefix everything that
implements real linux VTs with real_*. An internal flag specifies which
mode the VT is in so we can check whether we are a real VT or a fake one.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-12 10:03:01 +02:00
David Herrmann
1f9867e786 uterm: vt: remove connect_eloop/disconnect_eloop functions
This removes both functions and merges them into the callers. They're
small enough to be directly included.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-08-12 09:40:49 +02:00