From 835ddcb765f3b1ea6087b616b78a3fa04864ac72 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Fri, 12 Oct 2001 14:21:47 +0000
Subject: [PATCH]  + show error if switch to new screen mode failed

---
 ide/fpmopts.inc | 22 +++++++++++++++++++---
 ide/fpstre.inc  |  7 +++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ide/fpmopts.inc b/ide/fpmopts.inc
index affea5e78a..d85f5fd835 100644
--- a/ide/fpmopts.inc
+++ b/ide/fpmopts.inc
@@ -711,7 +711,8 @@ var R,R2: TRect;
     D: PCenterDialog;
     C: PVideoModeCollection;
     VMLB: PVideoModeListBox;
-    VM: TVideoMode;
+    OldScreenMode,VM: TVideoMode;
+    ScreenModeInfo : array[1..3] of longint;
     CurVP,VP: PVideoMode;
     RB1: PPlainRadioButtons;
     CB1,CB2: PPlainCheckBoxes;
@@ -796,7 +797,19 @@ begin
              VM.Color:=Color;
            end;
          if (VM.Col<>ScreenMode.Col) or (VM.Row<>ScreenMode.Row) or (VM.Color<>ScreenMode.Color) then
-         SetScreenVideoMode(VM);
+           Begin
+             OldScreenMode:=ScreenMode;
+             SetScreenVideoMode(VM);
+             if (VM.Col<>ScreenMode.Col) or (VM.Row<>ScreenMode.Row) or (VM.Color<>ScreenMode.Color) then
+               begin
+                 SetScreenVideoMode(OldScreenMode);
+                 ScreenModeInfo[1]:=VM.col;
+                 ScreenModeInfo[2]:=VM.row;
+                 ScreenModeInfo[3]:=byte(VM.color);
+
+                 ErrorBox(msg_cantsetscreenmode,@ScreenModeInfo);
+               end;
+           End;
        end;
      AutoSaveOptions:=CB1^.Value;
      MiscOptions:=CB2^.Value;
@@ -1273,7 +1286,10 @@ end;
 
 {
   $Log$
-  Revision 1.3  2001-10-11 11:35:53  pierre
+  Revision 1.4  2001-10-12 14:21:47  pierre
+   + show error if switch to new screen mode failed
+
+  Revision 1.3  2001/10/11 11:35:53  pierre
    * adapt to new video unit layout
 
   Revision 1.2  2001/08/05 12:23:00  peter
diff --git a/ide/fpstre.inc b/ide/fpstre.inc
index ee73032c9c..38d2c0610d 100644
--- a/ide/fpstre.inc
+++ b/ide/fpstre.inc
@@ -587,7 +587,7 @@ const
       msg_windowlist_hidden = 'hidden';
 
       msg_userscreennotavailable = 'Sorry, user screen not available.';
-
+      msg_cantsetscreenmode = #3'Impossible to set'#13#3'%dx%d mode';
       { Tools $PROMPT() dialog }
       dialog_programarguments = 'Program Arguments';
       label_enterprogramargument = '~E~nter program argument';
@@ -1007,7 +1007,10 @@ const
 
 {
   $Log$
-  Revision 1.2  2001-08-29 23:31:27  pierre
+  Revision 1.3  2001-10-12 14:21:47  pierre
+   + show error if switch to new screen mode failed
+
+  Revision 1.2  2001/08/29 23:31:27  pierre
    * fix some m68k specific options
 
   Revision 1.1  2001/08/04 11:30:23  peter