introduce ->is_fbdev, and use it to simplify ->set_resolution

1 files changed, 9 insertions, 5 deletions

diff --git a/perl-install/Xconfig/xfree4.pm b/perl-install/Xconfig/xfree4.pm
index 7dd57dab1..a6b1e424d 100644
--- a/perl-install/Xconfig/xfree4.pm
+++ b/perl-install/Xconfig/xfree4.pm
@@ -87,11 +87,6 @@ sub set_resolution {
     my ($raw_X, $resolution, $Screen) = @_;
 
     $resolution = +{ %$resolution };
-    if (my $Screen_ = $Screen || $raw_X->get_default_screen) {
-	#- use framebuffer if corresponding Device has Driver framebuffer
-	my $Device = $raw_X->get_Section_by_Identifier('Device', val($Screen_->{Device})) or internal_error("no device named $Screen_->{Device}");
-	$resolution->{fbdev} = 1 if val($Device->{Driver}) eq 'fbdev';
-    }
     #- XFree4 doesn't like depth 32, silently replacing it with 24
     $resolution->{Depth} = 24 if $resolution->{Depth} eq '32';
 
@@ -122,6 +117,15 @@ sub new_screen_sections {
     @l;
 }
 
+sub is_fbdev {
+    my ($raw_X, $Screen) = @_;
+
+    my $Screen_ = $Screen || $raw_X->get_default_screen or return;
+
+    my $Device = $raw_X->get_Section_by_Identifier('Device', val($Screen_->{Device})) or internal_error("no device named $Screen_->{Device}");
+    val($Device->{Driver}) eq 'fbdev';
+}
+
 sub set_Option {
     my ($_raw_X, $category, $node, @names) = @_;