From 75cd00ab4b084fbfe37bf87d5dda197a9bad5553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Fri, 22 Jun 2018 14:56:45 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D1=91=D0=BD=20?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B3=D0=BE=D1=80=D0=B8=D1=82=D0=BC=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D1=87=D0=B8=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B7=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D1=84=D1=80=D0=B5=D0=B9=D0=BC=D0=B1=D1=83=D1=84=D1=84?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* если используется KMS видео драйвер, то разрешение то, что и в Xorg
* в противном случае подбирается наиболее подходящее разрешение среди
  доступных для vesa (список получается при помощи hwinfo --framebuffer)
* если ни одно разрешение не подходит, а так же в случае сбоя hwinfo,
  выставляется 1024x768
---
 pym/install/variables/X11.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pym/install/variables/X11.py b/pym/install/variables/X11.py
index 99c6777..259cdea 100644
--- a/pym/install/variables/X11.py
+++ b/pym/install/variables/X11.py
@@ -23,6 +23,7 @@ import glob
 from calculate.lib.datavars import Variable, VariableError, ReadonlyVariable
 from calculate.lib.utils.portage import isPkgInstalled
 from calculate.lib.utils.files import readFile
+from calculate.lib.utils.tools import get_best_nearest_resolution
 import calculate.lib.utils.device as device
 from calculate.lib.utils.common import (getVideoFromXorgLog,
                                         getVideoFromXorgConf,
@@ -339,8 +340,21 @@ class VariableOsInstallFbResolution(ResolutionVariable):
         self.help = _("set the framebuffer resolution")
         self.label = _("Framebuffer resolution")
 
+    def using_kms(self):
+        drv = self.Get('install.os_install_x11_video_drv')
+        kms = self.Get('install.os_x11_kms_video_drv')
+        return drv in kms
+
     def get(self):
-        return self.Get('os_install_x11_resolution') or self.fallback_resolution
+        x11res = self.Get('os_install_x11_resolution')
+        if self.using_kms():
+            return x11res
+        hwinfo = device.Hwinfo()
+        try:
+            return get_best_nearest_resolution(
+                x11res, hwinfo) or self.fallback_resolution
+        except device.HwinfoError:
+            return self.fallback_resolution
 
 class VariableClGrubImageHash(ReadonlyVariable):
     """