Commit graph

1405 commits

Author SHA1 Message Date
Ray Strode
a71f7ca8d2 [key-file] fix debugging message 2010-03-24 15:01:09 -04:00
Ray Strode
50614ef5b3 [key-file] Add support for comments 2010-03-24 14:59:14 -04:00
Ray Strode
6a6db2c9fb [main] fixed logic inversion when loading config file 2010-03-24 14:42:10 -04:00
Ray Strode
2e81935e03 [key-file] Add debugging messages 2010-03-24 14:31:58 -04:00
Ray Strode
26e51314e3 [main] fix debugging message 2010-03-24 14:08:40 -04:00
Ray Strode
91547048f8 [set-default-theme] properly handle commented out [Daemon] section
Before we would assume there was a valid [Daemon] section already
if a comment contained [Daemon] in it.
2010-03-24 13:59:17 -04:00
Ray Strode
d449a327cf [main] Fix config file look up properly
Before we were writing the config file splash into the
override_splash_path variable instead of the variable meant for
that config file.
2010-03-24 13:53:37 -04:00
Ray Strode
123dcd261a [drm] s/intel/radeon/ in debug statement 2010-03-24 13:42:17 -04:00
Charlie Brej
e168de883e [script] Unref the correct element
Typo in previous commit. Should have unreffed the hash and not the function
object.
2010-03-24 16:26:50 +00:00
Charlie Brej
fe2ec6ffbf [script] Strings automatically adopt from the global String template
This means string operations now can be applied on raw strings rather than
having to cast them using the String() class template wrapper.

String("something").CharAt(3)
now becomes simply:
"something".CharAt(3)
2010-03-24 15:59:02 +00:00
Charlie Brej
669c2dcc0a [script] Use a pre computed value rather than accessing directly
The name_exp was already set to the thing we wanted, so use that. Less
confusing since other sections use it.
2010-03-24 15:59:02 +00:00
Ray Strode
344afa14f5 [drm] Don't remove drm fb's that we don't know about
When we access to the kernel console's fb, we don't own
it and shouldn't remove it.

This is like commit 808e129fd1,
but for radeon and nouveau instead of intel.
2010-03-24 10:19:07 -04:00
Ray Strode
186381ee63 [drm] Add more debug spew 2010-03-24 10:10:34 -04:00
Ray Strode
d4821f7c0b [drm] Compile warning clean ups 2010-03-24 09:42:53 -04:00
Charlie Brej
61afc9ca4c [script] Rearrange script_obj_direct_as_hash_element return conditions
Testing for the presence and falling though to return a NULL makes more sense.
2010-03-24 11:11:28 +00:00
Charlie Brej
ce823509c3 [main] Adds a declaration of toggle_between_splash_and_details
Fixes a compile error about a static declaration following an implicit
declaration.
2010-03-24 10:56:18 +00:00
Ray Strode
b5877c31a0 [drm] Add debug spew 2010-03-24 00:14:58 -04:00
Ray Strode
22d8a8e44e [main] Add debug spew 2010-03-23 23:58:34 -04:00
Ray Strode
09bf42fddc [main] move guts of on_escaped_press to new function
Before we were calling the handler directly when it
wasn't in response to an escape key press event, which
was a little groaty.
2010-03-23 23:54:17 -04:00
Ray Strode
46f7f2104e [boot-server] Add debugging spew
This will just help down the line if there are problems.
2010-03-23 23:49:31 -04:00
Ray Strode
76617409da [main] Fix crash when config files don't exist
I wasn't handling NULL return value correctly before.
2010-03-23 23:26:05 -04:00
Ray Strode
772455097f [script] Silence compiler warning 2010-03-23 23:12:17 -04:00
Ray Strode
ff78fd70cf [daemon] Actually install shipped config files
commit cf766763f2 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.

This commit fixes that.
2010-03-23 23:08:26 -04:00
Ray Strode
f919294e82 [defaults] Drop some debug goo that sneaked in 2010-03-23 22:57:06 -04:00
Ray Strode
b75a0ab5a7 [branch-merge] Add daemon configuration mechanism
This series of commits adds a few configuration files
to replace the kludgey symlink we use now for theme
specification.

In the future, these config files could potentially
be used for other things as well.
2010-03-23 18:02:22 -04:00
Ray Strode
cf766763f2 [daemon] Ship default configuration files
This commit adds plymouthd.defaults and plymouthd.conf.

The former is for distributions to override, and the latter
is for administrators to change.
2010-03-23 18:00:50 -04:00
Ray Strode
5baed15f09 [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.

That's what this commit does.
2010-03-23 17:54:08 -04:00
Ray Strode
27562c4f69 [main] Try getting default theme from config file
Right now we figure out the default theme via a symlink.
This apprach is very simple, but is also a little cumbersome.

It means as the default theme is changed around we have to move
the symlink around.

The symlink is in /usr.  We really shouldn't be mucking with
/usr when changing defaults.

This commit checks the filesystem for two config files:

/usr/share/plymouth/plymouthd.defaults
and
/etc/plymouth/plymouthd.conf

The first one is for distributions to use.  This is how they can
manage which splash to show from release to release.

The second one is for system administrators.  This is how they
can override distribution policy.

We don't actually ship these files yet.  In the mean time,
(and even after for the forseeable future) the old symlink method
will still work.
2010-03-23 16:46:56 -04:00
Ray Strode
65550c2d5d [configure] drop --with-default-plugin-link
It's an old interface that I don't think anyone is using.
2010-03-23 16:35:42 -04:00
Ray Strode
73e6e29a98 [configure] change bug report link in AC_INIT
It was my email address, but should probably be bugzilla
(or the mailing list)
2010-03-22 20:54:14 -04:00
Ray Strode
541844965e [configure] run through autoupdate
This just modernizes the file a bit.
2010-03-22 20:46:03 -04:00
Charlie Brej
d28ff94b69 [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.
2010-03-22 23:39:32 +00:00
Charlie Brej
0bbc243722 [script] Correctly initialise the minimum width when getting minimal window
Values were preset to zero which was the smallest width/height.
2010-03-22 23:33:21 +00:00
Charlie Brej
78edb5ab1e [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.
2010-03-22 23:16:21 +00:00
Charlie Brej
e70dfbe3e0 [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.
2010-03-22 22:41:17 +00:00
Charlie Brej
a0d16a9bbd [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.
2010-03-22 22:26:47 +00:00
Ray Strode
5b518486ce [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.
2010-03-22 00:21:43 -04:00
Ray Strode
93482b7647 [terminal] Add new ply_terminal_deactivate function
This will jump off the VT associated with the terminal
and deallocate it.
2010-03-22 00:11:13 -04:00
Scott James Remnant
9d488d5e48 [ply-text-display] don't set mode on every write
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.
2010-03-21 23:57:56 -04:00
Scott James Remnant
e9a22723da [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.
2010-03-21 23:48:21 -04:00
Scott James Remnant
0ed7480ed7 [main] deactivate renderer before hiding
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.
2010-03-21 23:48:11 -04:00
Scott James Remnant
d54ae45721 [daemon] add "has active vt?" request
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
2010-03-21 23:23:40 -04:00
Scott James Remnant
33e4d43f42 [client] add "has active vt?" request
This asks the daemon whether it has an active VT, used for a smooth
transition into X.

I've implemented this to look like ping.
2010-03-21 23:23:39 -04:00
Scott James Remnant
5eba40e42b [two-step] resume animations on display_normal
Change the display_normal() function so that rather than being a no-op
if we already saved the state as normal, it restarts any animations and
redraws the views.

The only thing we now do if the state is not previously the same is
hide any prompt.

This allows this to be used to reanimate the plugin on reactivate.
2010-03-21 23:23:39 -04:00
Scott James Remnant
49162f4304 [throbgress] resume animations on display_normal
Change the display_normal() function so that rather than being a no-op
if we already saved the state as normal, it restarts any animations and
redraws the views.

The only thing we now do if the state is not previously the same is
hide any prompt.

This allows this to be used to reanimate the plugin on reactivate.
2010-03-21 23:23:39 -04:00
Scott James Remnant
2346efabb4 [space-flares] resume animations on display_normal
Change the display_normal() function so that rather than being a no-op
if we already saved the state as normal, it restarts any animations and
redraws the views.

The only thing we now do if the state is not previously the same is
hide any prompt.

This allows this to be used to reanimate the plugin on reactivate.
2010-03-21 23:23:39 -04:00
Scott James Remnant
1b4a60cc5c [fade-throbber] resume animations on display_normal
Change the display_normal() function so that rather than being a no-op
if we already saved the state as normal, it restarts any animations and
redraws the views.

The only thing we now do if the state is not previously the same is
hide any prompt.

This allows this to be used to reanimate the plugin on reactivate.
2010-03-21 23:23:39 -04:00
Scott James Remnant
117a434bed [main] update display after reactivate
Since deactivate uses on_boot_splash_idle, there's a good chance that
plugins will have stopped animating.  Prod them to animate again by
calling update_display()
2010-03-21 23:23:39 -04:00
Scott James Remnant
301d372416 [client] Add new reactivate command
This tells the daemon to reactivate itself after having previously
been suspended by the deactivate command.
2010-03-21 23:23:39 -04:00
Scott James Remnant
1976a90cd4 [daemon] Add new reactivate command
More for debugging and completeness than anything else, add a
"reactivate" command to the daemon that undoes the effects of
deactivate and continues the splash screen on its way.

Another possible use for this could be (for example) providing a
seamless shutdown experience.

A future commit will implement the client bits needed.
2010-03-21 23:22:45 -04:00