Remove all wlterm sources. I never intended to maintain it longer than any
major terminal-emulator needs to get ported over to wayland. Hence, remove
it. It was buggy, anyway.
If anyone is interested, a GTK+ based wlterm is available on:
http://cgit.freedesktop.org/~dvdhrm/wlterm
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
If we get a display-refresh event, redraw the screen. Otherwise, we might
stay blank during VT switches if we get a delayed set-master.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
If we get a display-refresh event from the session layer, we must redraw
the screen to avoid staying blank.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
On UTERM_REFRESH events we now forward the event to all sessions on the
bound seat. Sessions can then react to it and repaint the screen.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
If drm-wakeup fails, we now retry after 20ms continously to gain
DRM-Master again. If we succeed we send UTERM_REFRESH events for all
available displays so existing code can pick it up.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We only use uint8_t as length-counter so MAX_DATA_SIZE must be <256 to
make our length-checks work. This fixes a bug where we read invalid data
if someone uses modified genunifont data files. As this just produces
garbled glyphs if garbled data is given, this is actually not critical at
all.
Reported-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We need to use signed types to actually see errors from ftell(). Fix it by
using "long" for status bits now.
Reported-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Instead of passing display-ops to every helper store it in vdrm-objects.
During vdrm-setup we set the pointer and reuse it in all helpers. This
simplifies the function headers and allows calling them from
helper-callbacks without requiring a pointer from the respective user.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
The genshader and genunifont utilities are run during the build process
to generate source files. In order for that to work when cross-compiling
the files need to be built using the native compiler instead of the
cross-compiler.
Add the AX_PROG_CC_FOR_BUILD m4 macro which defines various *_FOR_BUILD
variables that are the native equivalents of CC, CFLAGS, LDFLAGS, etc.
Override CC, CFLAGS and LDFLAGS for genshader and genunifont and their
object files so that they will be built natively and can be executed
during the build.
Signed-off-by: Thierry Reding <treding@nvidia.com>
(added TODO marker)
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
wlterm doesn't work with current Wayland/Weston; the events are never
sent and the window doesn't come up. We need to flush the display, as
per wl_display_dispatch_pending(3):
To proper integrate the wayland display fd into a main loop, the
client should always call wl_display_dispatch_pending() and then
wl_display_flush() prior to going back to sleep.
Signed-off-by: Ran Benita <ran234@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
With mesa-9.2 fragment shaders are required to define default precisions
as defined in the standard. We didn't do this.. whoops. Add the mediump
declarations and everything should be working again.
fixes fdo bug: #68934
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Khronos updated their GLES2 headers and broke backwards compatibility,
hurray. Fix it for real now.
Reported-by: Yichao Yu <yyc1992@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Khronos "fixed" their new OpenGLES2 headers and added a bunch of _EXT
suffixes. Now we need to test for both, the old and new macros, yay!
Thanks to Yichao Yu for spotting that.
Reported-by: Yichao Yu <yyc1992@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We currently use the old systemd syntax that was copied from
getty@.service. It doesn't allow enabling specific TTYs, though. So use
the new WantedBy syntax instead.
Thanks to "trusktr" for investigating and reporting upstream to systemd
developers.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We need to correctly set the VTNR for each new pty, otherwise the pty
cannot set the XDG_VTNR correctly. Note that we do this only for real VTs,
that is, vtnr > 0.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
A caller can now pass a VT-num to the PTY which will get set as XDG_VTNR
in the environment of new childs.
This can be used to tell systemd-logind to associate the session with
the correct VT. But note that this still cannot overwrite VT-associations
if the pty is created from within an existing session.
Reported-by: Thomas Hebb
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This helper returns the VT-number for the given VT if, and only if, it
is a real VT. In all other cases 0 is returned.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Wayland compositors are not required to send buffer release notifications
on an implicit buffer-attach. That is, an attach->commit->commit series
does not cause a buffer-release notification after the second commit.
Hence, send a buffer-attach on every commit that requires a new
buffer-release notification.
For the related wayland-protocol changes, see:
http://cgit.freedesktop.org/wayland/wayland/commit/?id=7165bf21917ed1c4f5ec823a1e1642a9e83aa984
This fixes a bug where wlterm only redraws the window-content when
resizing (due to explicit buffer-attach calls during redraw).
Reported by: MoD
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This moves the description of kmscon.conf to a separate "Configuration"
section and adds some example kmscon.conf configuration lines.
This addresses #71 (at least, with this change in place I probably would
not have been momentarily confused by the exact syntax used in
kmsconf.conf).
(removed trailing whitespaces)
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This adds an --xkb-keymap <FILE> option to kmscon. When given, kmscon
will try to compile the keymap from the file before trying the other
options (like the XkbKeymap option in xorg.conf).
This is useful for users who have a customized XKB keymap, which is
usually kept in a single file. Example, in X:
xkbcomp $DISPLAY my_keymap.xkb
Customize my_keymap.xkb to your liking, and then in .xinitrc, or
xorg.conf:
xkbcomp my_keymap.xkb $DISPLAY
Now you can also do this in kmscon.conf.
Additionally, lacking such an option, kmscon is quite difficult to use
without an installed xkeyboard-config package, which provides the
infrastructure for the "rules" configuration mechanism. We might even
want to distribute some plain xkb file as a last ditch, for
robustness, if even the default RMLVO fails... without a keyboard a
terminal is not very useful.
(changed Ran's patch to use *_from_string() instead of *_from_file())
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This reads in a complete file as a string and returns it to the caller.
The string is 0 terminated (which isn't guaranteed by mmap()) so this
helper is needed if we have to work with APIs that don't accept buffer
lengths.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This implements two new keyboard shortcuts zoom-in and zoom-out that
increase/decrease font size of the current terminal.
This is similar to how wlterm does it and allows runtime modification of
fonts.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
If the terminal screen is smaller than the real screen, we never paint to
the margins. This doesn't hurt as long as we never resize the terminal.
The uterm layer clears all framebuffers during allocation.
However, uterm behavior may change and our terminal may get resized (eg.,
during hotplugging) so we really should clear all the margins.
We now clear them on every frame as it is a trivial task. However, if we
speed up rendering, we should probably set a "needs_clear" flag that
simply clears the framebuffer.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We currently retrieve one font object per screen (which is in fact shared
in the font-layer), but we can also move it one layer up to the terminal
layer. This shares the same font per terminal between all screens.
This simplifies on-the-fly font modifications and speeds up monitor
hotplugging.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
pango_ft2_render_layout_line() requires the baseline offset as argument,
not the vertical extent of the glyphs. This is important as we currently
align glyphs to the bottom edge instead of the baseline.
Fix this by passing the cached baseline offset so all glyphs are correctly
aligned to the baseline. We then clip according to the cell-extents as
usual.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
It is currently pretty annoying to use multiple wlterm windows stacked on
top on each other when the terminal-background is black. The border
doesn't use multiple colors so it is hard to distinguish from the
main-frame.
This patch changes the border color to white (as most terminal-backgrounds
are black by default) and additionally draws a black 1px frame around it.
This guarantees that the frame is even visible with white terminal
backgrounds.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
The ld.gold linker doesn't provide --format=default but needs --format=elf
instead. However, this doesn't work with ld.bfd. To avoid any linker
detection, we now link any binary file via partial-linking into a proper
object file itself and then link this object file in the final linking
step.
This also produces a fake libtool *.lo file so the libtool linking command
doesn't complain about PIC/non-PIC problems.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We now keep a link to our parent seat and set it to NULL when our session
is unregistered. In this case, any further request that depends on the
session being registered and probably a valid seat pointer, we will stop
with ENODEV.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
These ioctls are used to retrieve and set the VT-mode. That is, the
signals and PID information that correspond to the VT controlling process.
It is notified whenever the VT gets active/inactive so it can react to it
or prevent/acknowledge it.
This doesn't implement the signal-sending logic, yet. It only implements
state-tracking.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Session IDs provide a unique ID for each registered session. They are used
to sort the sessions so next/prev return the correct neighbour-sessions.
Furthermore, they can be used by outside users to refer to a session
directly without knowing the session implementation.
Sessions with ID=0 are always linked at the end and considered to be
"unnamed".
The algorithm to switch to a session with a given ID is:
Try to find the first session with the exact same ID. If there is none,
return the session with the next higher ID. If there is none, return the
ID'th session in the list. If there is none, return the last session.
This provides a fairly predictable way of switching between session. It is
modeled after the classic VT F1-F12 keys that switch between sessions. If
a session is not given, these keys will switch to the next higher session
instead.
All "unnamed" sessions are put at the end. So if you have only F1-F4, then
F5-F12 will map to unnamed sessions.
Please note that new sessions are always linked at the end of their group.
So new unnamed sessions are at the far end, new named sessions are linked
in the sorted list but behind all sessions with the same ID.
Hence, the caller should avoid multiple sessions with the same ID,
otherwise, some sessions might not be reachable even though they're named
(unless you use next/prev of course).
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Add dummies for the ioctl VT callbacks. Also implement the KD-MODE and
KB-MODE state tracking as it is fairly trivial.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We should let the user move or resize the window while it is fullscreen or
maximized. This depends on the compositor to stop pending move/resize
requests when maximizing or setting a window fullscreen.
We can implement some "snap away from edges" behavior that allows to move
or resize while maximized. This will "unmaximize" the window if you move
it more than a given threshold. However, that's not needed now so lets do
that later when the wl_shell system is fully figured out.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
These helpers return whether a window is maximized/fullscreen. This can be
used by the theme/terminal control layer to change behavior depending on
these flags.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
A terminal's GL and GR sets can be mapped to 4 different registers g0 to
g3. The g0-g3 registers can be freely set by the application to predefined
or uploaded character-sets.
We implemented GL and GR as separate registers that are set to the current
g0-g3 states when the applications requests a remapping. So subsequent
changes to g0-g3 don't affect GL and GR. Unfortunately, it turns out this
is wrong. GL and GR should point to the g0-g3 registers instead of copying
them.
This commit fixes the GL and GR pointers to point to g0-g3 instead of
pointing to the underlying character sets. This fixes line-drawing
applications like alsamixer, make-menuconfig and other ncurses based
software.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Add callbacks for all major ioctls. We currently only implement ioctls
that are used by xserver on linux machines. Feel free to implement the new
ioctls.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We now create a VT for each legacy node and assign all clients to it. For
control nodes, we create a different VT for each open-file/client.
Note that we do not recreate VTs or CDEVs directly on HUP instead of
during the next open() or reconfiguration. This avoids trapping into the
same error again and gives control to the user to recreate the nodes at
the right time.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
The VT subsystem manages the virtual VTs and registers them with the
seat/session-scheduler. They manage control and legacy nodes as they are
mostly the same.
The different contexts create these VTs and assign them to cdev clients.
This allows us to split the VT and cdev logic apart so they can be
assigned freely to different clients.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This adds the uvt_client symbols to the public symbol list and exports
them so we can use them in uvtd.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We _must_ unlink the client and cdev first, then reset the VT. Otherwise,
the set_vt() call might think we are still alive and call user-defined
callbacks which might call kill again.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
The ctx subsystem manages the CDEV devices for each seat. It currently
allocates one manager device and a given number of legacy devices that can
be accessed via subdirectories.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Two new functions to retrieve the current major number and dynamically
allocate minor numbers.
This can be used by clients that allocate more than one CDEV for VTs to
dynamically retrieve a new minor number.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We need to export the symbols to make use of them. This exports all useful
ctx+cdev functions for outside use. The other subsystems still need to get
reviewed before we export them.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We used an incorrectly formatted arguments as we mixed up two local
variables. Use the correct DEVNAME format now.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
These numbers are pretty useful during debugging so print them before
attempting to create the cdev devices.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
A flagset is a dynamic array where each bit of the array can be
independently set/reset. It can be used for minor/major allocations or
for other dynamically growing bitsets.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
We now have official upload space on freedesktop.org. No need to link to
my personal upload space, anymore.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
