paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-09 19:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed setgraphmode together with the new graphdrivers

Browse Source
This commit is contained in:
Jonas Maebe 2000-07-07 17:29:30 +00:00
parent 1104d83363
commit 575f6c0d6d
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtl/inc/graph/graph.inc
View File

@ -115,6 +115,7 @@ var
{ Should be set in InitGraph once only. } { Should be set in InitGraph once only. }
IntCurrentMode : smallint; IntCurrentMode : smallint;
IntCurrentDriver : smallint; { Currently loaded driver } IntCurrentDriver : smallint; { Currently loaded driver }
IntCurrentNewDriver: smallint;
XAspect : word; XAspect : word;
YAspect : word; YAspect : word;
MaxX : smallint; { Maximum resolution - ABSOLUTE } MaxX : smallint; { Maximum resolution - ABSOLUTE }
@ -1476,6 +1477,7 @@ end;
{ Reset to default values } { Reset to default values }
IntCurrentMode := 0; IntCurrentMode := 0;
IntCurrentDriver := 0; IntCurrentDriver := 0;
IntCurrentNewDriver := 0;
XAspect := 0; XAspect := 0;
YAspect := 0; YAspect := 0;
MaxX := 0; MaxX := 0;
@ -2292,6 +2294,7 @@ end;
{ _GraphResult is now already set to grOK by DetectGraph } { _GraphResult is now already set to grOK by DetectGraph }
IntCurrentDriver := GraphDriver; IntCurrentDriver := GraphDriver;
IntCurrentNewDriver := GraphDriver;
SaveVideoState; SaveVideoState;
{ Actually set the graph mode...} { Actually set the graph mode...}
SetGraphMode(GraphMode); SetGraphMode(GraphMode);
@ -2308,6 +2311,7 @@ end;
begin begin
_GraphResult := grOK; _GraphResult := grOK;
IntCurrentDriver := GraphDriver; IntCurrentDriver := GraphDriver;
IntCurrentNewDriver := GraphDriver;
SaveVideoState; SaveVideoState;
{$ifdef logging} {$ifdef logging}
If _GraphResult <> grOK then If _GraphResult <> grOK then
@ -2430,7 +2434,10 @@ begin
end; end;
{ {
$Log$ $Log$
Revision 1.38 2000-06-27 13:37:04 jonas Revision 1.39 2000-07-07 17:29:30 jonas
* fixed setgraphmode together with the new graphdrivers
Revision 1.38 2000/06/27 13:37:04 jonas
* released -dnewmodes * released -dnewmodes
Revision 1.37 2000/06/23 19:56:37 jonas Revision 1.37 2000/06/23 19:56:37 jonas

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

@ -340,7 +340,7 @@ end;
mode:=nil; mode:=nil;
GetModeName:=''; GetModeName:='';
{ only search in the current driver modes ... } { only search in the current driver modes ... }
mode:=SearchMode(IntCurrentDriver,ModeNumber); mode:=SearchMode(IntCurrentNewDriver,ModeNumber);
if assigned(mode) then if assigned(mode) then
GetModeName:=Mode^.ModeName GetModeName:=Mode^.ModeName
else else
@ -367,7 +367,7 @@ end;
inc(i); inc(i);
{ mode 0 always exists... } { mode 0 always exists... }
{ start search at 1.. } { start search at 1.. }
mode:=SearchMode(IntCurrentDriver,i); mode:=SearchMode(IntCurrentNewDriver,i);
until not assigned(mode); until not assigned(mode);
GetMaxMode:=i; GetMaxMode:=i;
end; end;
@ -417,7 +417,7 @@ end;
modeinfo: PModeInfo; modeinfo: PModeInfo;
begin begin
{ check if the mode exists... } { check if the mode exists... }
modeinfo := searchmode(IntcurrentDriver,mode); modeinfo := searchmode(IntcurrentNewDriver,mode);
if not assigned(modeinfo) then if not assigned(modeinfo) then
begin begin
{$ifdef logging} {$ifdef logging}
@ -573,7 +573,10 @@ end;
{ {
$Log$ $Log$
Revision 1.30 2000-07-05 13:07:48 jonas Revision 1.31 2000-07-07 17:29:30 jonas
* fixed setgraphmode together with the new graphdrivers
Revision 1.30 2000/07/05 13:07:48 jonas
* final fixes for linux support (graphdriver value of the modes * final fixes for linux support (graphdriver value of the modes
is now also not modified anymore) is now also not modified anymore)