David Herrmann [Sat, 25 Aug 2012 12:00:19 +0000 (14:00 +0200)]
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>
David Herrmann [Sat, 25 Aug 2012 08:46:37 +0000 (10:46 +0200)]
build: add temporary files *~ to gitignore
These files are created by several editors as temporary storage. Ignore
them.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 25 Aug 2012 08:43:50 +0000 (10:43 +0200)]
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>
Theodore Kotz [Sat, 25 Aug 2012 08:40:38 +0000 (10:40 +0200)]
docs: add unicode test document
This document contains several special Unicode characters which can be
used to test the terminal font-engine/UTF-8-engine.
Written-by: Theodore Kotz <ted@kotz.us>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Marcin Slusarz [Wed, 22 Aug 2012 19:45:00 +0000 (21:45 +0200)]
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>
Marcin Slusarz [Wed, 22 Aug 2012 19:11:47 +0000 (21:11 +0200)]
build: ...and now fix build without GLES2
Defining *_la_CPPFLAGS var in "if...endif" block breaks generation
of Makefile.in - automake assumes it's defined unconditionally and
uses it for building objects.
configure.ac clears all variables if each dependency is disabled so we can
include it unconditionally.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 22 Aug 2012 10:59:11 +0000 (12:59 +0200)]
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>
Marcin Slusarz [Tue, 21 Aug 2012 21:34:20 +0000 (23:34 +0200)]
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>
Marcin Slusarz [Tue, 21 Aug 2012 21:05:37 +0000 (23:05 +0200)]
build: fix build with GLESv2
CC src/static_gl_math.lo
In file included from src/static_gl_math.c:35:0:
src/static_gl.h:36:23: fatal error: GLES2/gl2.h: No such file or directory
CC src/static_gl_shader.lo
src/static_gl_shader.c:36:23: fatal error: GLES2/gl2.h: No such file or directory
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 21 Aug 2012 15:56:34 +0000 (17:56 +0200)]
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>
David Herrmann [Tue, 21 Aug 2012 15:44:43 +0000 (17:44 +0200)]
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>
David Herrmann [Tue, 21 Aug 2012 12:53:59 +0000 (14:53 +0200)]
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>
David Herrmann [Tue, 21 Aug 2012 12:38:30 +0000 (14:38 +0200)]
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>
David Herrmann [Mon, 20 Aug 2012 18:10:29 +0000 (20:10 +0200)]
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>
David Herrmann [Mon, 20 Aug 2012 12:57:39 +0000 (14:57 +0200)]
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>
David Herrmann [Wed, 15 Aug 2012 07:27:11 +0000 (09:27 +0200)]
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>
David Herrmann [Wed, 15 Aug 2012 07:25:55 +0000 (09:25 +0200)]
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>
David Herrmann [Wed, 15 Aug 2012 07:24:45 +0000 (09:24 +0200)]
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>
David Herrmann [Wed, 15 Aug 2012 07:23:24 +0000 (09:23 +0200)]
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>
David Herrmann [Wed, 15 Aug 2012 06:54:02 +0000 (08:54 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 20:57:36 +0000 (22:57 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 20:47:34 +0000 (22:47 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 15:09:42 +0000 (17:09 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 15:08:55 +0000 (17:08 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 15:02:56 +0000 (17:02 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 15:01:55 +0000 (17:01 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 14:34:28 +0000 (16:34 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 14:29:55 +0000 (16:29 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 14:23:03 +0000 (16:23 +0200)]
conf: add UINT as new datatype
The "uint" type parses an unsigned integer as argument.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 14 Aug 2012 14:22:15 +0000 (16:22 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 14:05:40 +0000 (16:05 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 13:52:26 +0000 (15:52 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 13:47:13 +0000 (15:47 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 13:44:55 +0000 (15:44 +0200)]
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>
David Herrmann [Tue, 14 Aug 2012 13:11:19 +0000 (15:11 +0200)]
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>
David Herrmann [Sun, 12 Aug 2012 11:33:10 +0000 (13:33 +0200)]
fakevt: add fakevt helper for VT-less systems
The fakevt helper binary can be used on VT-less systems or seats to make
kmscon activate the fake VT and deactivate it. This way, you can control
when kmscon acquires video devices and when it releases them.
This is a global setting that affects all seats where kmscon is running
except seat0 if it uses real VTs.
This should only be used for debugging. This is really no intended for use
in production.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sun, 12 Aug 2012 11:31:19 +0000 (13:31 +0200)]
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>
David Herrmann [Sun, 12 Aug 2012 11:30:51 +0000 (13:30 +0200)]
test_output: add --dev parameter
The --dev parameter is used to specify the device that is used for
testing.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sun, 12 Aug 2012 11:26:16 +0000 (13:26 +0200)]
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>
David Herrmann [Sun, 12 Aug 2012 09:18:48 +0000 (11:18 +0200)]
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>
David Herrmann [Sun, 12 Aug 2012 08:21:11 +0000 (10:21 +0200)]
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>
David Herrmann [Sun, 12 Aug 2012 08:16:55 +0000 (10:16 +0200)]
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>
David Herrmann [Sun, 12 Aug 2012 08:11:50 +0000 (10:11 +0200)]
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>
David Herrmann [Sun, 12 Aug 2012 08:03:01 +0000 (10:03 +0200)]
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>
David Herrmann [Sun, 12 Aug 2012 07:40:49 +0000 (09:40 +0200)]
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>
David Herrmann [Sun, 12 Aug 2012 07:37:58 +0000 (09:37 +0200)]
uterm: vt: merge uterm_vt and kmscon_vt
There is no need to use separate structures so merge both into a unified
uterm_vt.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sun, 12 Aug 2012 07:23:23 +0000 (09:23 +0200)]
uterm: vt: remove obsolete kmscon_vt_id
We always open a new VT as there is no need for us to open an existing VT.
Hard-code this behavior but keep the open_tty() backend accepting
VT-numbers just in case we want this some time in the future.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sun, 12 Aug 2012 07:19:36 +0000 (09:19 +0200)]
uterm: vt: remove duplicate kmscon_vt_action
This enum is not needed as the uterm-vt code already has enums for
vt-actions. Replace it with UTERM_VT_ACTIVATE/DEACTIVATE.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sun, 12 Aug 2012 07:11:35 +0000 (09:11 +0200)]
uterm: vt: move all vt.h/c code into uterm_vt.c
This merges both files so we can reduce the code overhead here. This is
still some very old code that was never correctly merged into new
uterm_vt.c subsystem. This should help doing it now.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sun, 12 Aug 2012 07:04:54 +0000 (09:04 +0200)]
uterm: vt: move kmscon_vt_supported() to uterm-vt
Instead of having a global symbol, we simply move the check to uterm-vt
and can remove it from global namespace. Furthermore, we cache the result
so we can reuse it on the VT-master if required.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 21:42:16 +0000 (23:42 +0200)]
main: replace unused --seat argument with --seats
The old --seat argument was no implemented, so replace it with --seats
which accepts a list of seats where kmscon runs on. Each seat is separate
from the others but kmscon allows providing terminal services to multiple
users/seats in a single process sharing resources like fonts and
renderers.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 21:41:36 +0000 (23:41 +0200)]
conf: add string-list type
The string-list type parses an argument as a list of strings separated
with commas. Empty arguments are accepted and correctly parsed.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 20:43:13 +0000 (22:43 +0200)]
tests: make all tests use the new conf-parsers
This allows the tests to have their own command-line parsers. Finally!
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 20:42:51 +0000 (22:42 +0200)]
main: add main.h header
Whoops, I missed this in the previous commits. damnit...
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 20:41:53 +0000 (22:41 +0200)]
uterm: input: pass xkb parameters from outside
Instead of accessing the kmscon configuration from the uterm code, we
should pass it in on creation. Otherwise, uterm depends on main.c which
would be really ugly.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 20:01:08 +0000 (22:01 +0200)]
main: move conf_global to kmscon_conf in new header main.h
The main configuration is now limited to kmscon and thus should not use
the conf_* prefix. Move all code to use the new name and introduce the new
main.h header mainly for kmscon.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 19:50:41 +0000 (21:50 +0200)]
conf: make config functions take conf-options as arguments
This replaces the global conf-options array with a parameter so we can use
the config parsers with different argument-lists.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 19:37:32 +0000 (21:37 +0200)]
conf: make important symbols global
In order to make the conf subsystem more open we need to make all
important symbols visible so others can include them.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 19:32:15 +0000 (21:32 +0200)]
conf: add aftercheck logic
The aftercheck logic allows each argument to make adjustments after the
argument-list has been parsed. It is also used to consume remaining
arguments.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 19:11:41 +0000 (21:11 +0200)]
conf: be more verbose about wrong arguments
We didn't handle the case that an argument has a parameter but doesn't
need one.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 18:56:41 +0000 (20:56 +0200)]
conf: make missing arguments or wrong arguments fatal
It is not acceptable to start the applications with wrong parameters. A
typo must be corrected before starting the application so simply fail
loudly on errors.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 18:52:17 +0000 (20:52 +0200)]
conf: move CONF_HAS_ARG flag to config-types
Whether an option takes an argument or not is definitely a property of the
type and not of the option. Therefore, move the flag to the type structure
and remove it from the option structure.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 18:51:30 +0000 (20:51 +0200)]
conf: make config types constant
Config types are shared so they should never be modified. Hence, make them
constant.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 18:16:38 +0000 (20:16 +0200)]
conf: make types generic
This abstracts the type system of the config parser so other types can be
added without changing the parser itself. This will also be required to
make the conf-subsystem exportable to other users.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 17:52:11 +0000 (19:52 +0200)]
conf: prefix helpers with CONF_*
This is part of an effort to make the conf-subsystem more friendly for
external users like the tests/* binaries.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 13:28:34 +0000 (15:28 +0200)]
Release kmscon-3
This is again a development release. However, the kmscon application is
now at a point where it is quite stable and provides many of the planned
features. API/ABI compatibility is not guaranteed, yet.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 13:27:56 +0000 (15:27 +0200)]
Update NEWS file
Add information about all changes since kmscon-2.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 13:17:47 +0000 (15:17 +0200)]
Update README
Update dependency and configuration information.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 12:59:16 +0000 (14:59 +0200)]
main: add support for multiple video objects per seat
All other subsystems were updated to support multiple video objects. As
last step, the main-handler just has to forward all video objects and
correctly wake them up and put to sleep.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 12:58:08 +0000 (14:58 +0200)]
ui: correctly remove all displays when video is removed
When removing a video object we also need to remove all displays from the
terminal object. Otherwise, the terminal will still try to draw on the
displays which obviously fails.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 12:55:49 +0000 (14:55 +0200)]
ui: fix log-subsystem
Copy and paste error. We obviously should specify the LOG_SUBSYSTEM to be
"ui" and not "config".
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 12:54:43 +0000 (14:54 +0200)]
text: font: pango/freetype2: fix correctly freeing font faces
Whoops, obvious typo. We need to free the face if the refcount drops to
zero and not if it is non-zero.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 12:35:01 +0000 (14:35 +0200)]
text: font: freetype2/pango: fix always setting real attributes
We copy the real attributes into the parent font structure only during
font-creation. However, if multiple renderers run simultaneously, they
might share fonts so we need to copy the attributes when reusing a font,
too.
This fixes a nasty division by zero bug during font rendering.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 12:09:44 +0000 (14:09 +0200)]
ui: convert API to support multiple video objects
Internally, the UI subsystem already supports multiple video objects.
However, the public API didn't expose that, yet. This changes the API to
allow adding and removing video objects from the UI.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 12:01:04 +0000 (14:01 +0200)]
terminal: remove global video object
We used to have a global video object for each terminal. However, this has
all been moved to the UI subsystem which can deal with multiple video
objects simultaneously. Hence, we can remove this as it is no longer used.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 11:48:44 +0000 (13:48 +0200)]
uterm: video: fbdev: add support for non xrgb32 devices
This adds blitting/blending/filling support for devices which are not the
classic xrgb32 device. bpp=24 is not supported as it is still unclear how
3-byte integers look like in mixed/big endian.
This uses a very basic dithering technique to check for errors between the
real and computed values which is then distributed horizontally only.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 11:21:15 +0000 (13:21 +0200)]
test_output: always use blitting backend
This removes the currently non-working OpenGL test and always uses the
blitting functions.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 11 Aug 2012 09:32:55 +0000 (11:32 +0200)]
uterm: fbdev: add udlfb workaround
udlfb incorrectly reports framebuffer sizes. That is, if we request a
framebuffer twice the size as the real framebuffer for double-bufferring,
it will accept these values and report success. We can even map this
virtual framebuffer successfully! However, the memory that is internally
allocated is only the real smaller framebuffer and we will get segfaults.
This might even leak internal kernel memory so we should fix this on
kernel-side as soon as possible.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Fri, 10 Aug 2012 16:03:32 +0000 (18:03 +0200)]
Remove fonts/ directory
This directory and the DejaVu Font is no longer used and replaced with a
proper fontconfig subsystem. There is also another in-memory font in the
8x16 font subsystem so no need to have this one.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Fri, 10 Aug 2012 16:02:32 +0000 (18:02 +0200)]
Move doc/vte.txt to docs/vte.txt
There is really no reason to have _two_ documentation directories.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Fri, 10 Aug 2012 16:01:14 +0000 (18:01 +0200)]
eloop: finish documentation
Finish source code documentation. gtk-doc isn't working very well so this
probably needs to be re-done, but not now...
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Fri, 10 Aug 2012 09:53:25 +0000 (11:53 +0200)]
console: correctly catch text-renderer errors
We should check for errors to avoid doing all the rendering even though
the text-renderer already failed. Also print debug messages if specific
intermediate steps fail.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Fri, 10 Aug 2012 09:51:02 +0000 (11:51 +0200)]
terminal: check for errors when initializing text renderer
We need to check for errors, otherwise, the text-renderer may be invalid
and we will never be able to render on it.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Fri, 10 Aug 2012 09:49:12 +0000 (11:49 +0200)]
terminal: choose "gltex" renderer if OpenGL is available
If the uterm backend supports OpenGL, then we should use the "gltex"
renderer as the "bblit" renderer performs pretty badly on OpenGL displays.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Fri, 10 Aug 2012 09:48:28 +0000 (11:48 +0200)]
text: fix choosing fallback backend
We didn't correctly choose the fallback backend but instead used the
last-registered backend. Fix this.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Fri, 10 Aug 2012 09:43:07 +0000 (11:43 +0200)]
text: gltex: add OpenGL text renderer
This adds an OpenGL text renderer. It uses textures to store glyph
information and renders the characters by assembling a vertex-list first.
To improve performance, we use texture-atlases.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Fri, 10 Aug 2012 09:42:00 +0000 (11:42 +0200)]
text: rework text renderer system
This reworks the text renderer system to make it easier to write backends.
We also allow returning errors during rendering now.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Fri, 10 Aug 2012 09:38:42 +0000 (11:38 +0200)]
uterm: video: drm: reset vertex-attrib-arrays after use
We should reset all used vertex-attrib-arrays, otherwise, we have to reset
them before drawing as we cannot sure that some other renderer left them
on.
As a rule we always assume a reset state similar to our assumption that no
VBO is bound during rendering.
This is a quite bad side-effect from OpenGL being a state-machine. As we
are a library, we cannot make any undocumented assumptions about the
OpenGL state. Therefore, we try to be as strict as possible.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 17:33:34 +0000 (19:33 +0200)]
build: make bblit backend optional
This allows configuring the bblit backend during kmscon-build. If other
rendering backends are preferred, you can now compile kmscon without the
bblit backend.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 17:01:53 +0000 (19:01 +0200)]
uterm: video: drm: implement .blit, .blend and .fill callbacks
This implements the static 2D blitting callbacks for the DRM backend. It
uses OpenGL to push the images with textures through the rendering
pipeline. Please note that this is horribly slow when used like 2D
blitting. However, it is a safe backend and better than nothing.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 13:32:01 +0000 (15:32 +0200)]
gl: add shader helpers
New helper functions for working with OpenGL shaders.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 13:14:35 +0000 (15:14 +0200)]
misc: fix returning false in kmscon_hashtable_find() when invalid
We currently return "true" if the hashtable is invalid which is
irritating. Fix this to be "false".
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 13:13:49 +0000 (15:13 +0200)]
misc: fix rehashing hashtable entries
We need to hash the key instead of the whole entry, otherwise, we have
dead/wrong entries in the hash-table after a rehash-round.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 11:02:44 +0000 (13:02 +0200)]
llog: mark llog_format as unused
Gcc emits useless warnings when llog_format is not used so mark it as
unused.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 10:21:23 +0000 (12:21 +0200)]
static: add gl math helpers
These are the same helpers that were previously removed, however, they are
now part of the static-kmscon library and can be stripped away by the
linker.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 10:13:29 +0000 (12:13 +0200)]
genshader: make shader generation more flexible
The genshader program now takes all input shaders as arguments so we can
easily add new shaders. We also name the constants after the shader file
to be as flexible as possible.
This also moves the generated shaders into the static-kmscon library. The
linker will strip unused symbols, anyway, so we aren't loosing anything
here.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 09:36:51 +0000 (11:36 +0200)]
gl: remove GL subsystem
The GL subsystem is no longer used so we can remove it.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 09:28:23 +0000 (11:28 +0200)]
terminal: remove gl.h include
We do not use this header inside of the terminal subsystem so we can
remove it.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 09:28:03 +0000 (11:28 +0200)]
font: remove font.h
This header is unused so we can remove it.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 09:27:19 +0000 (11:27 +0200)]
text: move font_char_attr to text.h
This way we can now remove all font.h includes. We can rename the
structure later.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>