paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-24 23:11:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

* released -dnewmodes

Browse Source
This commit is contained in:
Jonas Maebe 2000-06-27 13:37:04 +00:00
parent 1b29bfff5b
commit 8d2b35c5ef
3 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rtl/inc/graph/graph.inc
View File

@ -126,9 +126,9 @@ var
DriverName: String; DriverName: String;
DirectColor : Boolean ; { Is it a direct color mode? } DirectColor : Boolean ; { Is it a direct color mode? }
ModeList : PModeInfo; ModeList : PModeInfo;
{$ifdef newmodes} {$ifndef nonewmodes}
newModeList: TNewModeInfo; newModeList: TNewModeInfo;
{$endif newmodes} {$endif nonewmodes}
DirectVideo : Boolean; { Direct access to video memory? } DirectVideo : Boolean; { Direct access to video memory? }
@ -2174,7 +2174,7 @@ end;
begin begin
HiMode := -1; HiMode := -1;
LoMode := -1; LoMode := -1;
{$ifdef newmodes} {$ifndef nonewmodes}
if not calledFromInitGraph or if not calledFromInitGraph or
(graphDriver < lowNewDriver) or (graphDriver < lowNewDriver) or
(graphDriver > highNewDriver) then (graphDriver > highNewDriver) then
@ -2225,7 +2225,7 @@ end;
_GraphResult := grNotDetected; _GraphResult := grNotDetected;
exit; exit;
end; end;
{$else newmodes} {$else nonewmodes}
{ We start at VGA } { We start at VGA }
GraphDriver := VGA; GraphDriver := VGA;
CpyMode := 0; CpyMode := 0;
@ -2251,7 +2251,7 @@ end;
_GraphResult := grNotDetected; _GraphResult := grNotDetected;
exit; exit;
end; end;
{$endif newmodes} {$endif nonewmodes}
_GraphResult := grOK; _GraphResult := grOK;
GraphDriver := CpyDriver; GraphDriver := CpyDriver;
GraphMode := CpyMode; GraphMode := CpyMode;
@ -2282,7 +2282,7 @@ end;
DriverName:=InternalDriverName; { DOS Graphics driver } DriverName:=InternalDriverName; { DOS Graphics driver }
if (Graphdriver=Detect) if (Graphdriver=Detect)
{$ifdef newmodes} {$ifndef nonewmodes}
or (GraphMode = detectMode) or (GraphMode = detectMode)
{$endif} {$endif}
then then
@ -2356,7 +2356,7 @@ end;
list:=list^.next; list:=list^.next;
dispose(tmp); dispose(tmp);
end; end;
{$ifdef newmodes} {$ifndef nonewmodes}
for c := lowNewDriver to highNewDriver do for c := lowNewDriver to highNewDriver do
begin begin
list := newModeList.modeinfo[c]; list := newModeList.modeinfo[c];
@ -2367,7 +2367,7 @@ end;
dispose(tmp); dispose(tmp);
end; end;
end; end;
{$endif newmodes} {$endif nonewmodes}
{$IFDEF DPMI} {$IFDEF DPMI}
{ We had copied the buffer of mode information } { We had copied the buffer of mode information }
{ and allocated it dynamically... now free it } { and allocated it dynamically... now free it }
@ -2387,11 +2387,11 @@ begin
{$endif logging} {$endif logging}
isgraphmode := false; isgraphmode := false;
ModeList := nil; ModeList := nil;
{$ifdef newmodes} {$ifndef nonewmodes}
fillChar(newModeList.modeinfo,sizeof(newModeList.modeinfo),#0); fillChar(newModeList.modeinfo,sizeof(newModeList.modeinfo),#0);
{ lo and hi modenumber are -1 currently (no modes supported) } { lo and hi modenumber are -1 currently (no modes supported) }
fillChar(newModeList.loHiModeNr,sizeof(newModeList.loHiModeNr),#255); fillChar(newModeList.loHiModeNr,sizeof(newModeList.loHiModeNr),#255);
{$endif newmodes} {$endif nonewmodes}
SaveVideoState := nil; SaveVideoState := nil;
RestoreVideoState := nil; RestoreVideoState := nil;
{$ifdef oldfont} {$ifdef oldfont}
@ -2430,7 +2430,10 @@ begin
end; end;
{ {
$Log$ $Log$
Revision 1.37 2000-06-23 19:56:37 jonas Revision 1.38 2000-06-27 13:37:04 jonas
* released -dnewmodes
Revision 1.37 2000/06/23 19:56:37 jonas
* setviewport was sometimes called with parameters from the previous * setviewport was sometimes called with parameters from the previous
active mode, either directly from setgraphmode or from active mode, either directly from setgraphmode or from
setbkcolor setbkcolor

17
rtl/inc/graph/graphh.inc
View File

@ -329,7 +329,7 @@ type
VGA = 9; VGA = 9;
VESA = 10; VESA = 10;
{$ifdef newmodes} {$ifndef nonewmodes}
D1bit = 11; D1bit = 11;
D2bit = 12; D2bit = 12;
@ -345,7 +345,7 @@ type
lowNewDriver = 11; lowNewDriver = 11;
highNewDriver = 21; highNewDriver = 21;
{$endif newmodes} {$endif nonewmodes}
{ graph modes } { graph modes }
@ -356,7 +356,7 @@ type
VGAMed = 1; VGAMed = 1;
VGAHi = 2; VGAHi = 2;
{$ifdef newmodes} {$ifndef nonewmodes}
{ They start at such a high number to make sure they don't clash } { They start at such a high number to make sure they don't clash }
{ with the mode numbers returned by getmoderange (those mode numbers } { with the mode numbers returned by getmoderange (those mode numbers }
{ are about the same modes, but all supported modes must have a } { are about the same modes, but all supported modes must have a }
@ -399,7 +399,7 @@ type
(x:1280;y:1024), (x:1280;y:1024),
(x:1600;y:1200), (x:1600;y:1200),
(x:2048;y:1536)); (x:2048;y:1536));
{$endif newmodes} {$endif nonewmodes}
{ Hercules mono card } { Hercules mono card }
@ -624,14 +624,14 @@ TYPE
next: PModeInfo; next: PModeInfo;
end; end;
{$ifdef newmodes} {$ifndef nonewmodes}
TNewModeInfo = record TNewModeInfo = record
modeInfo: array[lowNewDriver..highNewDriver] of PModeInfo; modeInfo: array[lowNewDriver..highNewDriver] of PModeInfo;
loHiModeNr: array[lowNewDriver..highNewDriver] of record loHiModeNr: array[lowNewDriver..highNewDriver] of record
lo,hi: smallint; lo,hi: smallint;
end; end;
end; end;
{$endif newmodes} {$endif nonewmodes}
@ -804,7 +804,10 @@ Function GetDriverName: string;
{ {
$Log$ $Log$
Revision 1.9 2000-06-19 08:57:52 jonas Revision 1.10 2000-06-27 13:37:04 jonas
* released -dnewmodes
Revision 1.9 2000/06/19 08:57:52 jonas
* fixed newHighMode constant * fixed newHighMode constant
Revision 1.8 2000/06/19 01:18:19 carl Revision 1.8 2000/06/19 01:18:19 carl

23
rtl/inc/graph/modes.inc
View File

@ -19,7 +19,7 @@
{ Internal routines } { Internal routines }
{-----------------------------------------------------------------------} {-----------------------------------------------------------------------}
{$ifdef newmodes} {$ifndef nonewmodes}
procedure res2Mode(x, y, maxColor: longint; var driver,mode: smallInt); procedure res2Mode(x, y, maxColor: longint; var driver,mode: smallInt);
var var
l: longint; l: longint;
@ -67,7 +67,7 @@ begin
x := resolutions[modeNr].x; x := resolutions[modeNr].x;
y := resolutions[modeNr].y; y := resolutions[modeNr].y;
end; end;
{$endif newmodes} {$endif nonewmodes}
procedure addmode(const mode: TModeInfo); procedure addmode(const mode: TModeInfo);
@ -78,14 +78,14 @@ end;
{ modes. Duplicates are allowed. } { modes. Duplicates are allowed. }
{********************************************************} {********************************************************}
var var
{$ifdef newmodes} {$ifndef nonewmodes}
driverNr, modeNr: smallint; driverNr, modeNr: smallint;
prev: PModeInfo; prev: PModeInfo;
{$endif newmodes} {$endif nonewmodes}
list: PModeInfo; list: PModeInfo;
newlst : PModeInfo; newlst : PModeInfo;
begin begin
{$ifdef newmodes} {$ifndef nonewmodes}
res2Mode(mode.maxx+1,mode.maxy+1,mode.maxColor,driverNr,ModeNr); res2Mode(mode.maxx+1,mode.maxy+1,mode.maxColor,driverNr,ModeNr);
{ bitdepth supported? } { bitdepth supported? }
if (driverNr <> maxsmallint) then if (driverNr <> maxsmallint) then
@ -171,7 +171,7 @@ end;
end; end;
end; end;
end; end;
{$endif newmodes} {$endif nonewmodes}
{ TP-like mode stuff } { TP-like mode stuff }
if not assigned(ModeList) then if not assigned(ModeList) then
begin begin
@ -217,14 +217,14 @@ end;
{********************************************************} {********************************************************}
var var
list, lastModeInfo: PModeInfo; list, lastModeInfo: PModeInfo;
{$ifdef newmodes} {$ifndef nonewmodes}
x,y: longint; x,y: longint;
{$endif} {$endif}
begin begin
{$ifdef logging} {$ifdef logging}
LogLn('Searching for driver '+strf(reqdriver)+' and mode '+strf(reqmode)); LogLn('Searching for driver '+strf(reqdriver)+' and mode '+strf(reqmode));
{$endif logging} {$endif logging}
{$ifdef newmodes} {$ifndef nonewmodes}
if (reqDriver >= lowNewDriver) and if (reqDriver >= lowNewDriver) and
(reqDriver <= highNewDriver) then (reqDriver <= highNewDriver) then
begin begin
@ -280,7 +280,7 @@ end;
end; end;
exit; exit;
end; end;
{$endif newmodes} {$endif nonewmodes}
searchmode := nil; searchmode := nil;
list := ModeList; list := ModeList;
If assigned(list) then If assigned(list) then
@ -571,7 +571,10 @@ end;
{ {
$Log$ $Log$
Revision 1.27 2000-06-23 19:56:38 jonas Revision 1.28 2000-06-27 13:37:04 jonas
* released -dnewmodes
Revision 1.27 2000/06/23 19:56:38 jonas
* setviewport was sometimes called with parameters from the previous * setviewport was sometimes called with parameters from the previous
active mode, either directly from setgraphmode or from active mode, either directly from setgraphmode or from
setbkcolor setbkcolor