Steve Langasek [Tue, 20 Apr 2010 11:02:24 +0000 (12:02 +0100)]
[main] Create a list of messages and when showing splash display them
The system now keeps a list of messages so they can be shown again when the
user flips themes or if the messages were passed before the splash was shown.
This also enables the splashes to show multiple messages (should they choose to
do so). There will later be a way of undisplaying a message.
Ray Strode [Wed, 14 Apr 2010 19:04:23 +0000 (15:04 -0400)]
[terminal] Lock terminal settings
From time to time, various external programs
will muck with the tty we're using and make
the users password for encrypted disks show
up, make the enter key not work, etc.
We used to work around this by resetting the
tty the way we like it everytime we write the
screen.
Charlie Brej [Tue, 13 Apr 2010 20:05:04 +0000 (21:05 +0100)]
[pixel-buffer] Remove offsets from buffet fill with data functions
The x and y offsets were supposed to allow only a part of the image data to be
drawn, but this didn't work correctly. Instead the clip region can be used to
emulate the same effect. So the x and y paramiters in these functions are now
dropped. The only instance that used these now uses a clip. All other calls had
x and y set to zero.
Ray Strode [Tue, 13 Apr 2010 18:20:23 +0000 (14:20 -0400)]
[event-loop] Add reference count to event sources
This prevents the event loop from freeing sources
early in an iteration of the loop, and then dispatching
handlers for the source later in that same iteration.
Ray Strode [Fri, 9 Apr 2010 20:07:11 +0000 (16:07 -0400)]
[main] Use updated terminal attrs on crash
In commit ea394383c54dda771dcf59e7ec11280fa945280b I changed
the terminal settings used by ply-terminal. This commit puts
those same settings into effect in the crash path.
Ray Strode [Mon, 5 Apr 2010 14:14:47 +0000 (10:14 -0400)]
[client] Allow unlimited unlock attempts
The ask-for-password command has an option
to specify the maximum number of retries to
get the correct password. The default number
of retries was 3. This makes sense for /opt,
and to a lesser degree /home, but it doesn't
make sense at all for /, since failing means
the system won't boot.
The new default is "unlimited". This fixes the
/ case, but has the downside that all integration
code that was depending on the 3 default before
will need to get updated.
Charlie Brej [Fri, 2 Apr 2010 16:24:07 +0000 (17:24 +0100)]
[script] Reference this if function is called with current object as this
If calling a function which is connected to the current object, the object
operated on in the function call is the current object. This is rarely used and
somehow survived without causing crashes despite incorrectly not increasing the
refcount.
Ray Strode [Thu, 1 Apr 2010 18:37:41 +0000 (14:37 -0400)]
[drm] Conditionalize fb fallback with 1-head ttm
When using the old style transition code path where
plymouth quits before X starts, we can't use the drm
renderer for single head nouveau and readeon setups
because their kernel memory manager doesn't allow userspace
write access to the console fb and the old style
transition code needs to dump the last frame of the
plymouth animation to the console fb as intermediate step
of the transition process.
The newer plymouth deactivate mechanism doesn't need the
intermediate console fb copy, so we can stick with the
drm renderer all the time.
This commit conditionalizes the "bail to frame-buffer renderer"
check based on whether the build is configured to enable
the old style transition.
Charlie Brej [Thu, 1 Apr 2010 14:47:29 +0000 (15:47 +0100)]
[script] Connect and disconnect the keyboard on start and stop
Previously we were connecting to the keyboard but not disconnecting from it as
unset_keyboard was not called before the plugin being destroyed. Now we connect
when on splash start and destroy which makes sure we disconnect before being
destroyed.
Charlie Brej [Wed, 31 Mar 2010 18:16:36 +0000 (19:16 +0100)]
[terminal] Do not discard the input when turning the terminal unbuffered
Drawing to renderers was resetting the terminal to unbuffered, but this was
also discarding any queued input keys. The fix should keep the input buffer
untouched.
It's possible for activate to be called before map_to_device, for
example if a non-graphical splash plugin is in use. Initialize
map_address to MAP_FAILED so that we won't try to redraw in this
situation.
Charlie Brej [Mon, 29 Mar 2010 21:56:11 +0000 (22:56 +0100)]
[main] Watch keyboard input after the splash had a chance to quit
If the splash hasn't picked up any displays it will abort. We wait for the
possible abort before attaching the keyboard. This is a slight hack as now
add_displays_and_keyboard_to_boot_splash no longer adds the keyboards. Also the
splash plugin can access the keyboard before it is officially opened.
For now it just fixes the terminal fd < 0 assertion bug.
Ray Strode [Mon, 29 Mar 2010 19:20:44 +0000 (15:20 -0400)]
[main] watch keyboard input after displays are added
Since the boot splashes handle opening the terminal now,
we need to make sure that we don't try to watch for input on
the terminal until they've opened it.
This should fix some crashes users are reportedly seeing with
the details splash.
A potentially better fix would be to make watch_for_input defer
doing anything on its own using the terminal is opened. That
would require a trigger and some new api to ply-terminal, I think.
Steve Langasek [Mon, 29 Mar 2010 10:51:24 +0000 (11:51 +0100)]
[main] Watch-for-keystroke should also be sensitive to enter
Because enter and general keystrokes are handled separately, enter would not
activate the keystroke trigger. Now, you can watch specifically for an enter
press, and enter is accepted as a general any-key trigger.
Ray Strode [Wed, 24 Mar 2010 03:00:11 +0000 (23:00 -0400)]
[daemon] Actually install shipped config files
commit cf766763f26ad0bb8e001a9ecf65b00f4c766e3c was
messed up in more than one way. The biggest problem
was that It didn't include the Makefile changes needed
to ship the files added to the repository.
Ray Strode [Tue, 23 Mar 2010 21:48:48 +0000 (17:48 -0400)]
[set-default-theme] Write plymouthd.conf instead of symlink
Now that the daemon looks for the default theme in configuration
files, we should make plymouth-set-default-theme write the
configuration files instead of doing symlinks.
Charlie Brej [Mon, 22 Mar 2010 23:39:32 +0000 (23:39 +0000)]
[script] Update default script to use the window X and Y offsets every time
Previously the code was assuming the windows were placed at 0,0. This might not
be the case and the window X and Y values should be used when trying to
position items relative to a window.
This change needs to be applied to all other scripts otherwise mutiple screen
setups may have unaligned elements. Updates scripts should be tested using
multi-head test systems or the x11 test renderer.
Charlie Brej [Mon, 22 Mar 2010 23:16:21 +0000 (23:16 +0000)]
[script] Get window value without an index returns area covered by all windows
Calls to Window.GetWidth/Height/X/Y without a window index now return the
values of the area covered by all windows. This is only the case if all the
windows are aligned (either by their centers, or to a corner).
This allows the theme designer to place an object knowing it will be seen on
all screens.
Charlie Brej [Mon, 22 Mar 2010 22:41:17 +0000 (22:41 +0000)]
[script] Return NULL when requesting width of nonexistent window
Minor bug, previously would return the index used rather than a NULL. Would
only cause problems when using a width request as a test of the presence of a
window.
Charlie Brej [Mon, 22 Mar 2010 22:26:47 +0000 (22:26 +0000)]
[script] Move windows to not start at negative coordinates
When multiple screens are found, the system will now arrange them so they are
all centered, and the top left corner of the largest screen is at 0,0.
No changes to any scripts are needed.
Ray Strode [Mon, 22 Mar 2010 04:13:35 +0000 (00:13 -0400)]
[main] Deactivate terminal on quit if necessary
If we're done with the VT plymouth was running on,
and plymouth wasn't running on the initial VT, we
should jump back to the initial VT and try to
clean up plymouth's VT.
Resetting the mode to text on every write means that if you're
using a text plugin and X starts, X's VT keeps getting reset back to
KD_TEXT since those plugins don't stop writing on deactivate (they
have no renderer).
There's no reason to set this mode here anyway; all paths to using
those plugins already do this.
[terminal] keep track of terminal raw/cooked state
Instead of setting the terminal to unbuffered (raw) mode on every
write, keep track of whether it's unbuffered or not at the points
we open and close the terminal.
Deactivate already takes care to set back into buffered mode;
otherwise we can end up resetting the terminal mode under X causing
Enter to send X SIGQUIT.
If we don't deactivate the renderer before hiding the splash, the
drm renderer may scan out the buffer contents to the fbcon buffer;
since we only hide the splash when dumping details or when
--retain-splash is *not* given to quit, this is exactly the
opposite of what we want.
The effect of not doing this is partial splash contents behind the
details in cases of error, or when using quit. This doesn't affect
plymouth quit --retain-splash.
One problem with the current deactivate/quit transition into X is that
the display manager will, if Plymouth was running, re-use the currently
active VT.
That only works if Plymouth was actually displaying a splash screen on
that VT. If --show-splash hasn't been called yet because we booted too
fast, we'll be on the wrong VT.
Add a request to ask whether the Plymouth VT is active; I've done it
this way so the answer defaults to "yes" for Fedora who use VT1.
The pseudo-code for transition is thus:
if plymouth is running (ping):
plymouth deactivate
if plymouth has active vt:
start X on current VT with -nr
if X starts ok:
plymouth quit --retain-splash
else if X fails:
plymouth quit
else if plymouth doesn't have active vt:
plymouth quit
start X as normal
else if plymouth isn't running:
start X as normal