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>
David Herrmann [Wed, 8 Aug 2012 09:21:20 +0000 (11:21 +0200)]
uterm: video: drm: adopt new libgbm API
libgbm changed the API (why?) so we need to use get_stride() instead of
get_pitch().
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 8 Aug 2012 09:20:36 +0000 (11:20 +0200)]
terminal: remove OpenGL drawing stubs
Drawing with OpenGL didn't work, so we can safely remove the stubs.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 6 Aug 2012 17:04:04 +0000 (19:04 +0200)]
misc: remove log references
The static-* code does not depend on the log subsystem so it should not
include the header nor define some internal logging helpers.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 6 Aug 2012 13:44:41 +0000 (15:44 +0200)]
text: bblit: remove unused private data
The bit-blitting renderer does not really use the helper structure so
remove it and simplify the code a lot.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 6 Aug 2012 13:27:53 +0000 (15:27 +0200)]
build: add --disable-optimizations option
We are in a state where redrawing the console can take a significant
amount of time on slower machines. Therefore, we definitely need gcc code
optimizations which help here a _lot_. However, they are currently bundled
to the debug flags.
This splits this into two options. We still need this flag to get getter
backtraces. Otherwise, those inlined functions are horrible to track done.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 6 Aug 2012 13:04:42 +0000 (15:04 +0200)]
Suppress some odd gcc warnings
As gcc is not aware of out list-semantics, it warns about uninitialized
variables when in fact we know that they must be initialized. Suppress
some by initializing the variables to NULL.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 6 Aug 2012 12:54:34 +0000 (14:54 +0200)]
text: bblit: do not clear screen
The console layer guarantees that all glyphs are sent to the renderer so
there is no need to clear the screen before redrawing.
This reduces flickering of single-buffered video backends.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 6 Aug 2012 12:48:22 +0000 (14:48 +0200)]
text: font: Simplify font-system and add freetype2 renderer
The freetype2 renderer uses ft2 and fontconfig to provide a very
simplistic renderer. We also simplify the logic of the whole subsystem a
lot and guarantee that each glyph will have the same size now.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 6 Aug 2012 12:47:12 +0000 (14:47 +0200)]
uterm: uxkb: fix typo in (u)xkb_available=false
When compiling without xkbcommon we currently get compiler errors as the
uxkb_available variable hasn't been correctly renamed previously.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 6 Aug 2012 12:45:03 +0000 (14:45 +0200)]
conf: add "font-engine" option
This option allows to select the font-engine during run-time.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 1 Aug 2012 13:42:35 +0000 (15:42 +0200)]
Remove old font renderer sources
font_freetype.c was unused for long and font_pango.c has been removed
recently.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Wed, 1 Aug 2012 13:41:22 +0000 (15:41 +0200)]
Use new text renderer
This fixes the console and terminal layer to use the new text renderer
instead of the old one.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 14:59:36 +0000 (16:59 +0200)]
text: font: pango: fix memory allocation
Whoops, we were checking the wrong variable. Fix the OOM check to
correctly catch the right errors.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 14:50:20 +0000 (16:50 +0200)]
text: add bblit text-renderer
The bblit text-renderer is the most basic renderer which simply blits or
blends the glyphs into the framebuffer memory. It cannot be used with
displays that do not provide framebuffer access but only 3D access.
However, 3D rendering is currently broken, anyway, so we can ignore it.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 14:49:32 +0000 (16:49 +0200)]
text: add text renderer subsystem
The text-renderer subsystem provides a way to register arbitrary
text-rendering backends. These backends use the font-objects to draw the
console into a framebuffer.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 14:46:22 +0000 (16:46 +0200)]
text: font: pango: fix font width being 0
We must avoid having a width of zero, otherwise, the text renderers might
divide by zero.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 14:44:28 +0000 (16:44 +0200)]
text: font: correctly measure pango fonts
We need to actually increase the character count, otherwise, we will never
have a measurement set.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 12:57:47 +0000 (14:57 +0200)]
vte: add CHA CSI
The CHA CSI is used to move the cursor horizontally but keep the vertical
position.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 12:57:04 +0000 (14:57 +0200)]
vte: add VPA/VPR CSIs
VPA and VPR are used to change the current line but keep the column. One
does an absolute positioning and one a relative positioning.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 12:56:11 +0000 (14:56 +0200)]
vte: add SU/SD CSIs
SU and SD are used to scroll-up and scroll-down the visible buffer.
Margins are kept and the cursor position does not change. This is a valid
vt510 CSI.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 12:54:58 +0000 (14:54 +0200)]
console: add *_console_scroll_up()/_down() helpers
Xterm supports CSIs which simply move the visible buffer up/down so we
need these helpers to perform such operations from the VTE layer.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 12:24:45 +0000 (14:24 +0200)]
uterm: video: add blend() helper
When drawing single glyphs we often have the glyph as alpha-only buffer so
we can draw it with any color we want. blit() requires a full image that
can be copied, so the new blend() helper is introduced which takes a
foreground and background color and blends in an image. Only plain-alpha
buffers are currently supported.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 11:35:18 +0000 (13:35 +0200)]
uterm: video: fix blit() and fill() height adjustments
Whoops, we missed the last line for all blit()/fill() operations. Fix the
decrement to correctly count as many lines as given.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 11:12:05 +0000 (13:12 +0200)]
uterm: video: remove unused UTERM_FORMAT_MONO
This format is not used, neither implemented, so it is safe to remove the
constant.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 08:32:43 +0000 (10:32 +0200)]
uterm: video: remove fbdev_display_map() orphan
The dummy fbdev backend included this function to allow outside access to
the framebuffer. This has for long been replaced with blit() and fill()
helpers and it was never actually implemented. Hence, remove the helper
function.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 08:31:40 +0000 (10:31 +0200)]
test_output: add blitting support
When opengl rendering is not available on the target device, we now fall
back to software rendering. Instead of drawing a nice gradient we now draw
a white screen to the target device to avoid heavy calculations.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 08:29:52 +0000 (10:29 +0200)]
uterm: video: add fill() helper
When using unaccelerated video we want to be able to fill a region of the
target framebuffer with a solid color. Hence, this adds the fill() helper
function with similar semantics to blit() but it uses a solid RGB color
value to fill in the framebuffers.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 08:22:39 +0000 (10:22 +0200)]
uterm: video: change blit'ting logic
Instead of passing width/height separately, we now use the values from the
buffer object. The caller has to manipulate the buffer object to change
these values. In fact, they can simply create a buffer object on the stack
with the same values copied from the real buffer and just adjust the
offset, width, height and stride. With the help of the stride value, it is
possible to even shrink the buffer horizontally.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 08:01:32 +0000 (10:01 +0200)]
test_input: fix compilation for kbd_keysym_to_string()
Since we moved to a runtime backend system for the input subsystem, we
cannot access the internal keysym_to_string() helpers anymore. Hence, use
the recently introduced uterm-input forwarding helper.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 31 Jul 2012 08:00:03 +0000 (10:00 +0200)]
uterm: input: add uterm_input_keysym_to_string()
There is no much gain from having an internal kbd_desc_keysym_to_string()
function if we cannot get access to the kbd_desc object. Therefore, add a
forward helper to uterm_input() which forwards the call to its internal
kbd_desc object. This allows outside access to the keysym_to_string()
function.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 30 Jul 2012 15:44:02 +0000 (17:44 +0200)]
text: font: add pango font backend
The pango font backend is similar to the currently used older backend but
provides the new API. It is modular so we can disable it if not needed.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 30 Jul 2012 15:42:21 +0000 (17:42 +0200)]
text: font: replace x/y offsets with baseline attribute
When rendering underlines we need the baseline attribute. Therefore,
replace the unused x/y offsets with a baseline attribute.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 30 Jul 2012 09:09:57 +0000 (11:09 +0200)]
build: add text-subsystem to build-sources
This finally adds the new font renderers to the build-sources so they are
actually built.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Mon, 30 Jul 2012 09:08:55 +0000 (11:08 +0200)]
external: htable: remove config.h inclusion
There is no need to include config.h manually so remove this to avoid
compilation errors when compiling external applications.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 28 Jul 2012 14:40:22 +0000 (16:40 +0200)]
text: font: Add 8x16 font
The 8x16 font is a static in-memory font that can be used as safe
fallback. It does not allow scaling or other font decorations so it's
really just for very basic text-layouts.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 28 Jul 2012 14:37:22 +0000 (16:37 +0200)]
text: font: add x/y offsets for glyphs
A single glyph might be bigger/smaller than the other glyphs so allow them
to be positioned. As we are not interested in details like baselines, we
simply use an x/y offset.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 28 Jul 2012 11:12:54 +0000 (13:12 +0200)]
text_font: add new font renderer subsystem
When running as emergency console, we must correctly deal with missing
libraries. Therefore, our font renderers must be modular so if freetype2
is not found we must be able to load another font. Therefore, this
introduces a new font-subsystem which can add/remove font-renderers
on-the-fly.
The real font-renderer backends will follow. This only provides the
modular infrastructure.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sun, 22 Jul 2012 14:16:51 +0000 (16:16 +0200)]
uterm: video: replace bpp with format id
Instead of using bpp as parameter for buffers we now use format
identifiers so we can add different formats with the same bpp. Please note
that currently only xrgb32 is supported.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 21:32:07 +0000 (23:32 +0200)]
misc: free hashtable on destruction
Fix memory leak as we didn't free the hashtable memory after destruction.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 19:01:22 +0000 (21:01 +0200)]
video: fbdev: fix freeing fake display
We currently leak the fake display that is created for every fbdev video
device. Fix this by simply freeing this device during destruction.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 18:45:30 +0000 (20:45 +0200)]
vt: fix dropping reference on deallocation
The vt allocation returns a referenced object so deallocation should
correctly drop it again. We already depend on this behavior so fix it.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 18:20:09 +0000 (20:20 +0200)]
eloop: prevent recursive dispatching
We do not support recursive dispatching so prevent it explicitely.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 18:14:38 +0000 (20:14 +0200)]
eloop: fix invalid memory access during dispatch
We use a temporary array of "to-be-dispatched" event sources while
dispatching. However, we incorrectly set the "count" variable so sources
may access invalid memory when removing themself from the event loop.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 18:12:00 +0000 (20:12 +0200)]
conf: fix invalid memory access in strip_spaces()
We must not assume that the string is longer than 0 characters. Therefore,
check whether we would access invalid memory before the string when
removing trailing whitespaces.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 17:06:50 +0000 (19:06 +0200)]
Refactor input backend-system
This is a rewrite of the input system. The backends itself are not
modified. However, it is now possible to have multiple backends and change
them on runtime.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 15:22:05 +0000 (17:22 +0200)]
ui: dispatch redraws in UI instead of terminal
We now schedule the terminal redraw from the UI to avoid having the
terminal using uterm-video directly.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 14:40:05 +0000 (16:40 +0200)]
terminal: allow external redraw-schedule
Allow UI subsystem to schedule redraws.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 13:47:51 +0000 (15:47 +0200)]
ui: explicitely remove displays from terminals
Move display-removal from terinal subsystem to UI subsystem to avoid
needing video-callback in the terminal subsystem.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 13:44:41 +0000 (15:44 +0200)]
terminal: add API to remove displays
This new function allows external subsystems to remove displays from the
terminal objects. It is required to make the terminal subsystem
independent of the uterm-video subsystem to allow different displays from
different video-objects to be part of a terminal.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 13:38:04 +0000 (15:38 +0200)]
ui: arrange video objects in a list
If multiple video objects are added to a UI object, we need to manage them
in a list to allow each of them to be added to a running terminal.
This only changes the internal structure but does still create the video
object when creating the UI object. This is, because the terminal
subsystem depends on uterm-video and this needs to be resolved, first.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Sat, 21 Jul 2012 13:32:19 +0000 (15:32 +0200)]
terminal: be more verbose when adding displays
When adding displays, we know print errors if we cannot allocate buffers
or other resources. This helps debugging video problems where the device
is ready but the terminal is not printed.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
David Herrmann [Tue, 17 Jul 2012 20:47:15 +0000 (22:47 +0200)]
conf: add config-file parser
This again refactors the whole config subsystem but this should be the
last time. We now have generic parsers for booleans and strings and don't
leak any memory, anymore. Furthermore, this adds a config-file parser so
common options can now be placed into /etc/kmscon.conf or ~/.kmscon.conf.
The config files parse the same arguments as the command-line and the
command-line always has precedence even though it is parsed first.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>