summaryrefslogtreecommitdiff
path: root/src/libplybootsplash/ply-renderer.c
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2009-10-04 10:47:36 -0400
committerRay Strode <rstrode@redhat.com>2009-10-04 10:47:36 -0400
commita29f25bc6c67e87f38f323e8739f06249205d766 (patch)
tree6d648dbcc6f144e3d3436bc77436f629341cde90 /src/libplybootsplash/ply-renderer.c
parente73e8cadd6b2b28e448710cffd85e32eb2083c83 (diff)
parent08466deaf8203ddff508d492056d2e9f705724e9 (diff)
[branch-merge] Add x11 renderer plugin
This merges the "x11-renderer" branch to master. In order to make debugging splash plugins easier, and in order to make debugging multi-head renderering possible on single head displays, Charlie wrote an X11 rendering plugin. This plugin displays plymouth in a running X session, instead of on the console. It currently only supports graphical plugins. At some point it may grow support for text plugins, too, using vte. That will take some reworking of the plymouth daemon core. This could some day serve as a basis for providing a graphical theme chooser application (like gnome-screensaver-preferences), although it's not clear yet that's a good idea. Right now, it's a great debugging and development tool, though.
Diffstat (limited to 'src/libplybootsplash/ply-renderer.c')
-rw-r--r--src/libplybootsplash/ply-renderer.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libplybootsplash/ply-renderer.c b/src/libplybootsplash/ply-renderer.c
index 5410feb8..08a246ba 100644
--- a/src/libplybootsplash/ply-renderer.c
+++ b/src/libplybootsplash/ply-renderer.c
@@ -220,6 +220,7 @@ ply_renderer_open (ply_renderer_t *renderer)
220 */ 220 */
221 const char *known_plugins[] = 221 const char *known_plugins[] =
222 { 222 {
223 PLYMOUTH_PLUGIN_PATH "renderers/x11.so",
223 PLYMOUTH_PLUGIN_PATH "renderers/drm.so", 224 PLYMOUTH_PLUGIN_PATH "renderers/drm.so",
224 PLYMOUTH_PLUGIN_PATH "renderers/frame-buffer.so", 225 PLYMOUTH_PLUGIN_PATH "renderers/frame-buffer.so",
225 NULL 226 NULL
@@ -299,10 +300,6 @@ ply_renderer_flush_head (ply_renderer_t *renderer,
299 assert (renderer->plugin_interface != NULL); 300 assert (renderer->plugin_interface != NULL);
300 assert (head != NULL); 301 assert (head != NULL);
301 302
302 if (ply_console_get_active_vt (renderer->console) !=
303 ply_terminal_get_vt_number (renderer->terminal))
304 return;
305
306 renderer->plugin_interface->flush_head (renderer->backend, head); 303 renderer->plugin_interface->flush_head (renderer->backend, head);
307} 304}
308 305