diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-06-05 17:30:23 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-06-05 17:30:23 +0000 |
commit | f6d02365b46b3891c0df4b8ad607bc80cdde8d81 (patch) | |
tree | 537b0920bbe0295f454412f993f52ba58c244925 /lib/Xconfig/various.pm | |
parent | 9d968363c52ee1febd9ff0fce38e2e56acee1270 (diff) | |
download | drakx-kbd-mouse-x11-f6d02365b46b3891c0df4b8ad607bc80cdde8d81.tar drakx-kbd-mouse-x11-f6d02365b46b3891c0df4b8ad607bc80cdde8d81.tar.gz drakx-kbd-mouse-x11-f6d02365b46b3891c0df4b8ad607bc80cdde8d81.tar.bz2 drakx-kbd-mouse-x11-f6d02365b46b3891c0df4b8ad607bc80cdde8d81.tar.xz drakx-kbd-mouse-x11-f6d02365b46b3891c0df4b8ad607bc80cdde8d81.zip |
- XFdrake:
o Composite is now the default in xserver 1.4 (#35043)
Diffstat (limited to 'lib/Xconfig/various.pm')
-rw-r--r-- | lib/Xconfig/various.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm index 5379d21..a762f0c 100644 --- a/lib/Xconfig/various.pm +++ b/lib/Xconfig/various.pm @@ -70,7 +70,7 @@ sub various { my $various = { if_($::isStandalone, xdm => runlevel() == 5), if_($b_read_existing, - Composite => ($raw_X->get_Section('Extensions') || {})->{Composite}, + Composite => $raw_X->get_extension('Composite') ne 'Disable', if_($card->{Options}{MonitorLayout} eq 'NONE,CRT+LFP' || $card->{Options}{TwinViewOrientation} eq 'Clone', Clone => 1), @@ -111,13 +111,13 @@ sub config { my ($raw_X, $card, $various) = @_; if ($various->{Composite}) { - my $raw = $raw_X->get_Section('Extensions') || $raw_X->add_Section('Extensions', {}); - $raw->{Composite} = { 'Option' => 1 }; + $raw_X->remove_extension('Composite'); if ($card->{Driver} eq 'nvidia') { $card->{Options}{AddARGBGLXVisuals} = undef; } } else { - $raw_X->remove_extension('Composite'); + my $raw = $raw_X->get_Section('Extensions') || $raw_X->add_Section('Extensions', {}); + $raw->{Composite} = { 'Option' => 1, val => 'Disable' }; if ($card->{Driver} eq 'nvidia') { delete $card->{Options}{AddARGBGLXVisuals}; |