Commit graph

1980 commits

Author SHA1 Message Date
Ray Strode
31a958f7e0 [configure] Add some heuristics to find drm headers
On my system, some headers seem to be stuffed in /usr/include/libdrm
and other headers seem to be stuffed in /usr/include/drm .

I think the ultimate upstream goal is for everything to be in
/usr/include/libdrm but my system seems to be in some transition state.

My pkgconfig files only point me to one of the directories, so add some
heuristics to find the other one.
2010-04-09 15:33:28 -04:00
Ray Strode
790f6d4401 [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.
2010-04-05 10:14:47 -04:00
Charlie Brej
417beaca9b [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.
2010-04-02 17:24:07 +01:00
Ray Strode
e588785758 [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.
2010-04-01 14:37:41 -04:00
Charlie Brej
cde2b9c642 [script] Only attach to the keyboard if it has been set
Don't add an input handler to a NULL keyboard.
2010-04-01 17:26:58 +01:00
Charlie Brej
ff77bbfdda [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.
2010-04-01 15:47:29 +01:00
Ray Strode
855ea1bbf5 [drm] Drop drm/ from include directives
They've moved to a different directly with the latest
libdrm, and we should be relying on pkgconfig anyway.
2010-03-31 21:29:16 -04:00
Charlie Brej
0664bce5fd [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.
2010-03-31 19:16:36 +01:00
Colin Watson
f83e2bb5e1 [frame-buffer] Initialize backend->head.map_address
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.
2010-03-30 20:46:57 +01:00
Charlie Brej
92cc20f82f [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.
2010-03-29 22:56:11 +01:00
Ray Strode
2d3dd0c3be [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.
2010-03-29 15:20:44 -04:00
Ray Strode
0ddc9333e4 [drm] Add more debug messages
These messages give a clearer view into what's
happening when moving drawing from plymouths
buffer to the kernel's console buffer.
2010-03-29 15:14:15 -04:00
Steve Langasek
02ca382344 [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.
2010-03-29 11:51:24 +01:00
Charlie Brej
991549626b [plymouth-set-default-theme] Replace tabs with spaces 2010-03-25 22:42:26 +00:00
Charlie Brej
6afeecaafe [script] Allow alpha color component to be set when generating text images
The Image.Text function now accepts an alpha parameter of the color used. If
not set this will be assumed to be 1 (thus reverse compatible).
2010-03-25 18:26:01 +00:00
Frederic Crozat
75ae8d50cc [plymouth-set-default-theme] handle old symlink configuration file 2010-03-25 17:30:41 +01:00
Ray Strode
05dc13ad0f [configure] bump to 0.8.1 2010-03-24 17:03:50 -04:00
Ray Strode
f119e8a047 [client] add update subcommand
This is to replace the old style --update option.
2010-03-24 16:57:40 -04:00
Ray Strode
544f5bae0a [client] add hide-splash and show-splash subcommands
This is to replace the old style --hide-splash and --show-splash
options.
2010-03-24 16:43:19 -04:00
Ray Strode
c0637bd800 [client] add new update-root-fs command
This supercedes --newroot and --sysinit into one
command following the newer subcommand method of
using the plymouth client.
2010-03-24 16:38:40 -04:00
Ray Strode
fb9f087bd2 [key-file] Add more debug spew 2010-03-24 16:25:30 -04:00
Ray Strode
3ce29d08c7 [key-file] Ensure items_matched variable is initialized
The loop condition checks it.  If we bail early because of
comment, we don't want to end up with undefined behavior.
2010-03-24 16:24:16 -04:00
Ray Strode
57f006d4c1 [drm] Add debugging spew
Explain when we fall back to frame buffer renderer on single
head TTM systems.
2010-03-24 15:56:20 -04:00
Ray Strode
6a3a4f69e9 [frame-buffer] add debug spew 2010-03-24 15:20:30 -04:00
Ray Strode
2ecbcd99eb [set-default-theme] Another fix with commented group lines 2010-03-24 15:10:35 -04:00
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