From bf502b7c11d447a0fc9fd2ce7215de1baf0b1773 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: Thu, 22 Apr 2021 18:40:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20gfx?=
 =?UTF-8?q?boot=20nomodeset?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common.inc          | 7 +++++++
 dia_fulloptions.inc | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/common.inc b/common.inc
index b8cff7e..fe41d47 100644
--- a/common.inc
+++ b/common.inc
@@ -474,6 +474,13 @@
 
   menuconfig.init
 
+  "nomodeset" getgfxconfig dup .undef ne {
+    "true" eq { 
+        /fulloptions.nomodeset_default true def
+    } {
+        /fulloptions.nomodeset_default false def
+    }  ifelse
+  } { pop } ifelse
   "audio" getgfxconfig dup .undef ne {
     "true" eq { 
         /audio.use true def
diff --git a/dia_fulloptions.inc b/dia_fulloptions.inc
index 20100a0..608b2a6 100644
--- a/dia_fulloptions.inc
+++ b/dia_fulloptions.inc
@@ -7,6 +7,7 @@
 
 /fulloptions.option .undef def
 /fulloptions.composite .undef def
+/fulloptions.nomodeset_default false def
 /xmenu.fulloptions .undef def
 
 /.fulloptions.expert 0 def
@@ -71,9 +72,14 @@
   0 1 xmenu .xm_list get length 1 sub {
     xmenu .xm_allselected get exch false put
   } for
+
+  fulloptions.nomodeset_default {
+    xmenu .xm_allselected get .fulloptions.nomodeset over over get not put
+  } if
   
   pmenu.init
   menu.entry fulloptions.filter
+  fulloptions.change
 } def
 
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -