From 92c4340dbd7778a09eeba8f1ab6545639fc81de5 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 30 Sep 2008 15:12:40 +0000 Subject: [PATCH] Video modes can now be windowed or fullscreen. Quite hacky, however. We would need a way to : -Easily change the number of video modes in the list (i'd like to use my 1440x900 screen at full resoluution !) -Maybe add a resizeable window mode, but that would require more work, so i'd like to keep that for 2.0 . In the meantime, i've made the list symetric, ie, mode are loaded from the cfg file and when the list is processed, each mode is copied to a fullscreen equivalent. Note this way of doing things will prevent the config file to save the selected video mode properly, so the program will switch to the default 800x600 windowed. When you load an image, Grafx2 will switch back to windowed mode when selecting the appropriate resolution for that image. The NB_MODES_VIDEO constant is also only the HALF of the actually available video modes git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@183 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- Makefile | 5 +- boutons.c | 24 +- cfg/gfxcfg.pas | 1129 +----------------------------------------------- global.h | 5 +- graph.c | 7 +- init.c | 175 ++++---- modesvdo.h | 219 ---------- sdlscreen.c | 11 +- 8 files changed, 119 insertions(+), 1456 deletions(-) delete mode 100644 modesvdo.h diff --git a/Makefile b/Makefile index 7bba2a67..d4f871ab 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,13 @@ ifdef COMSPEC DELCOMMAND = del BIN = grafx2.exe -COPT = -Wall -O -g -ggdb -Dmain=SDL_main $(SCREEN) +COPT = -Wall -O -g -ggdb -Dmain=SDL_main LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi else # Linux specific DELCOMMAND = rm -rf BIN = grafx2 -COPT = -Wall -c -g $(SCREEN) +COPT = -Wall -c -g LOPT = -lSDL -o $(BIN) endif @@ -17,7 +17,6 @@ endif CC = gcc OBJ = main.o init.o graph.o sdlscreen.o divers.o special.o boutons.o palette.o aide.o operatio.o pages.o loadsave.o readline.o moteur.o files.o op_c.o linux.o op_asm.o readini.o saveini.o shade.o clavier.o io.o -SCREEN = -D WINDOWED OBJDIR = obj/ all : $(BIN) diff --git a/boutons.c b/boutons.c index 54906e35..42bcc792 100644 --- a/boutons.c +++ b/boutons.c @@ -1233,10 +1233,16 @@ void Afficher_liste_modes(short Debut_liste, short Position_curseur) switch (Mode_video[Mode_courant].Mode) { case MODE_SDL : - memcpy(Chaine+8," SDL ",10); + memcpy(Chaine+8," SDL ",10); break; } + + if(Mode_video[Mode_courant].Fullscreen == 1) + memcpy(Chaine+13,"Full",4); + else + memcpy(Chaine+13,"Win ",4); + if (Mode_video[Mode_courant].Refresh>0) { Num2str(Mode_video[Mode_courant].Refresh,Chaine+18,2); @@ -1302,7 +1308,7 @@ void Bouton_Resol(void) Print_dans_fenetre(108, 37,"Height:" ,CM_Fonce,CM_Clair); Print_dans_fenetre( 16, 60,"OK" ,CM_Fonce,CM_Clair); Print_dans_fenetre( 55, 60,"X Y" ,CM_Fonce,CM_Clair); - Print_dans_fenetre(131, 60,"Mode" ,CM_Fonce,CM_Clair); + Print_dans_fenetre(104, 60,"Mode Full" ,CM_Fonce,CM_Clair); Print_dans_fenetre(183, 60,"Hz" ,CM_Fonce,CM_Clair); Print_dans_fenetre(219, 60,"Ratio" ,CM_Fonce,CM_Clair); Print_dans_fenetre( 30,170,"\03" ,CM_Fonce,CM_Clair); @@ -1324,14 +1330,14 @@ void Bouton_Resol(void) if (Mode_choisi>=6) { - if (Mode_choisi'^' - then Temp:=Temp+Titre[i] - else - begin - Print(X1+(X2-X1+1-length(Temp)) shr 1,Y1+1+Num_titre,Temp,Couleur); - Temp:=''; - inc(Num_titre); - end; - end; - - Num_choix:=1; - Temp:=''; - for i:=1 to length(Choix) do - begin - if Choix[i]<>'^' - then Temp:=Temp+Choix[i] - else - begin - Print(X1+(X2-X1+1-length(Temp)) shr 1,Y1+2+Num_choix+Num_titre,Temp,Couleur); - Temp:=''; - inc(Num_choix); - end; - end; - dec(Num_choix); - - Option_choisie:=Choix_debut; - Set_color_of_line(Y1+2+Num_titre+Option_choisie,X1+2,X2-2,Couleur_choix); - Repeat - Touche:=Lire_touche; - case Touche of - $0048 : begin - Set_color_of_line(Y1+2+Num_titre+Option_choisie,X1+2,X2-2,Couleur); - if Option_choisie=1 - then Option_choisie:=Num_choix - else dec(Option_choisie); - Set_color_of_line(Y1+2+Num_titre+Option_choisie,X1+2,X2-2,Couleur_choix); - end; - $0050 : begin - Set_color_of_line(Y1+2+Num_titre+Option_choisie,X1+2,X2-2,Couleur); - if Option_choisie=Num_choix - then Option_choisie:=1 - else inc(Option_choisie); - Set_color_of_line(Y1+2+Num_titre+Option_choisie,X1+2,X2-2,Couleur_choix); - end; - end; - until Touche=$001C; - - move(Memoire_video,mem[$B800:0000],8000); - - Fenetre_choix:=Option_choisie; -end; - {------------------------ Passer en mode texte 80x25 ------------------------} procedure Dessiner_ecran_principal; var @@ -314,20 +121,6 @@ begin Cadre( 0,46,79,49,COULEUR_EXPLIC); end; -{------------------------- D‚finition d'une option --------------------------} -procedure Definir_option(Numero:word;Libelle,Explic1,Explic2:string; Supprimable:boolean; Touche_par_defaut:word); -begin - Config[Numero_definition_option].Numero :=Numero; - Config[Numero_definition_option].Touche :=Touche_par_defaut; - Config[Numero_definition_option].Touche2:=$00FF; - Config[Numero_definition_option].Libelle:=Libelle; - Config[Numero_definition_option].Explic1:=Explic1; - Config[Numero_definition_option].Explic2:=Explic2; - Config[Numero_definition_option].Erreur :=false; - Config[Numero_definition_option].Suppr :=Supprimable; - inc(Numero_definition_option); -end; - {--------------- Transformer une chaŒne AZT en String Pascal ----------------} function Pchar2string(Chaine:pchar):string; var @@ -344,66 +137,6 @@ begin Pchar2string:=Temp; end; -{------------- Renvoyer une chaŒne donnant une touche "en clair" ------------} -function Nom_touche(Touche:word):string; -var - Temp,Temp2:string; - Num_table:byte; -begin - Num_table:=1; - Temp:=''; - if (hi(Touche) and 1)>0 then - begin - Temp:=Temp+' + '; - Num_table:=2; - end; - if (hi(Touche) and 2)>0 then - begin - Temp:=Temp+' + '; - Num_table:=3; - end; - if (hi(Touche) and 4)>0 then - begin - Temp:=Temp+' + '; - Num_table:=4; - end; - case Num_table of - 1: begin - Temp2:=Pchar2string(Table_Normal[lo(Touche)]); - if Temp2='???' - then Temp:='********** Invalid key! **********' - else if Temp2='' - then Temp:='' - else Temp:=Temp+'<'+Temp2+'>'; - end; - 2: begin - Temp2:=Pchar2string(Table_Shift[lo(Touche)]); - if Temp2='???' - then Temp:='**** Invalid key combination! ****' - else if Temp2='' - then Temp:='' - else Temp:=Temp+'<'+Temp2+'>'; - end; - 3: begin - Temp2:=Pchar2string(Table_Ctrl[lo(Touche)]); - if Temp2='???' - then Temp:='**** Invalid key combination! ****' - else if Temp2='' - then Temp:='' - else Temp:=Temp+'<'+Temp2+'>'; - end; - 4: begin - Temp2:=Pchar2string(Table_Alt[lo(Touche)]); - if Temp2='???' - then Temp:='**** Invalid key combination! ****' - else if Temp2='' - then Temp:='' - else Temp:=Temp+'<'+Temp2+'>'; - end; - end; - Nom_touche:=Temp; -end; - {------------------- ComplŠte une chaine avec un caractŠre ------------------} function Completer_chaine(Chaine:string; Taille:byte; Caractere:char):string; var @@ -415,198 +148,6 @@ begin Completer_chaine:=Chaine; end; -{------------------- Ecrire les informations sur une option -----------------} -procedure Ecrire(Ligne:byte; Num_option:word; Couleur:byte); -begin - Print( 2,Ligne,Completer_chaine(Config[Num_option].Libelle,35,' '),Couleur); - Print(40,Ligne,Completer_chaine(Nom_touche(Config[Num_option].Touche),34,' '),Couleur); - if Config[Num_option].Erreur - then Print(77,Ligne,'X',Couleur) - else Print(77,Ligne,' ',Couleur); -end; - -{-------------------- Ecrire un commentaire sur une option ------------------} -procedure Ecrire_commentaire(Num_option:word); -begin - Print(2,47,Completer_chaine(Config[Num_option].Explic1,76,' '),COULEUR_EXPLIC); - Print(2,48,Completer_chaine(Config[Num_option].Explic2,76,' '),COULEUR_EXPLIC); -end; - -{----------------- Ecrire toutes les premieres lignes visibles --------------} -procedure Tout_ecrire(Decalage_curseur, Position_curseur:word); -var - i:byte; -begin - i:=HAUTEUR_DEBUT_SETUP; - while (i<=HAUTEUR_FIN_SETUP) and (i0 then - begin - if Position_curseur>1 then - begin - Set_color_of_line(Position_Curseur+HAUTEUR_DEBUT_SETUP-1,1,78,COULEUR_SETUP); - dec(Position_curseur); - Set_color_of_line(Position_Curseur+HAUTEUR_DEBUT_SETUP-1,1,78,COULEUR_SELECT); - end - else - begin - if Decalage_curseur>0 then - begin - Set_color_of_line(Position_Curseur+HAUTEUR_DEBUT_SETUP-1,1,78,COULEUR_SETUP); - dec(Decalage_curseur); - Tout_Scroller_bas(Decalage_curseur,Position_curseur); - end; - end; - Ecrire_commentaire(Position_curseur+Decalage_curseur); - end; -end; - -{-------------------------- Scroller vers le bas ----------------------------} -procedure Scroll_bas(var Decalage_curseur, Position_curseur:word); -begin - if Position_curseur+Decalage_Curseur0 then - begin - if Position_curseur>1 then - begin - Set_color_of_line(Position_Curseur+HAUTEUR_DEBUT_SETUP-1,1,78,COULEUR_SETUP); - Position_curseur:=1; - Set_color_of_line(Position_Curseur+HAUTEUR_DEBUT_SETUP-1,1,78,COULEUR_SELECT); - end - else - begin - if Decalage_curseur>0 then - begin - Set_color_of_line(Position_Curseur+HAUTEUR_DEBUT_SETUP-1,1,78,COULEUR_SETUP); - if Decalage_curseur>HAUTEUR_FIN_SETUP-HAUTEUR_DEBUT_SETUP - then dec(Decalage_curseur,HAUTEUR_FIN_SETUP-HAUTEUR_DEBUT_SETUP) - else Decalage_curseur:=0; - Tout_ecrire(Decalage_curseur,Position_curseur); - end; - end; - Ecrire_commentaire(Position_curseur+Decalage_curseur); - end; -end; - -{-------------------------- Scroller vers le bas ----------------------------} -procedure Page_down(var Decalage_curseur, Position_curseur:word); -begin - if Position_curseur+Decalage_Curseur (:/ en AZERTY)} - NB_OPTIONS:=Numero_definition_option-1; - - assign(Fichier_INI,'GFX2.INI'); - {$I-} - reset(Fichier_INI,1); - {$I+} - if IOresult<>0 then {Si GFX2.INI est absent, on l'extrait de GFX2.DAT} - Erreur:=Recreer_INI - else - close(Fichier_INI); - - if not Erreur then Interpretation_du_fichier_config; - - Initialiser_config:=Erreur; -end; - - -{------------------- Enregistrement de la configuration ---------------------} -procedure Enregistrer_config; -var - Fichier:file; - Indice:word; - Octet:byte; -begin - if Choix_enreg=1 then {Enregistrement des touches (si souhait‚)} - begin - assign(Fichier,'GFX2.CFG'); - reset(Fichier,1); - - seek(Fichier,sizeof(Type_header)+Sizeof(Type_chunk)); {Positionnement sur la 1Šre touche} - - for Indice:=1 to NB_OPTIONS do - blockwrite(Fichier,Config[Indice],sizeof(Type_infos_touche)); {Les 3 premiers champs (words) sont: Num‚ro,Touche,Touche2} - - close(Fichier); - end; -end; - -{---------- V‚rifier qu'on peut ‚crire sur le lecteur de lancement ----------} -function Verifier_ecriture_possible:boolean; -var - Fichier:file; -begin - assign(Fichier,'GFX2.$$$'); - {$I-} - rewrite(Fichier,1); - close(Fichier); - erase(Fichier); - {$I+} - Verifier_ecriture_possible:=(IOresult=0); -end; - -{============================================================================} -var - Keyb_mode:byte; - -begin - if Verifier_ecriture_possible then - begin - - asm - mov ax,0AD83h - int 2Fh - mov Keyb_mode,bl - mov ax,0AD82h - xor bl,bl - int 2Fh - end; - - Text_mode_80x50; - Cacher_curseur; - Dessiner_ecran_principal; - if not Initialiser_config then - begin - Setup; - Enregistrer_config; - - Text_mode_80x25; - Montrer_curseur; - - asm - mov ax,0AD82h - mov bl,Keyb_mode - int 2Fh - end; - - halt(0); - end - else - begin - Text_mode_80x25; - writeln('Error reading GFX2.DAT! This file is either absent or corrupt.'); - Montrer_curseur; - - asm - mov ax,0AD82h - mov bl,Keyb_mode - int 2Fh - end; - halt(1); - end; - end - else - begin - writeln('Error: You mustn''t run this setup program from a read-only drive!'); - writeln; - writeln('The most probable cause of this error is that you are either running this'); - writeln('program from a CD-ROM or a protected floppy disk.'); - writeln('You should try to copy all the files of GrafX 2.00 on a hard drive, or to'); - writeln('unprotect your floppy disk if you really want to run it from this medium.'); - halt(1); - end; -end. diff --git a/global.h b/global.h index 9bee0ba3..25eec4d3 100644 --- a/global.h +++ b/global.h @@ -72,11 +72,11 @@ struct S_Mode_video word Facteur_Y; char Ratio[5]; signed char Refresh; // <0 => entrelacé - word Mode_VESA_de_base; + word Fullscreen; void * Pointeur; byte Etat; // 0:Cool 1:OK ; 2:Bof ; 3:Naze ; si on rajoute +128 => incompatible }; -GLOBAL struct S_Mode_video Mode_video[NB_MODES_VIDEO]; +GLOBAL struct S_Mode_video Mode_video[2*NB_MODES_VIDEO]; GLOBAL struct @@ -187,6 +187,7 @@ GLOBAL short Ecran_original_X; // |_ Dimensions de l' GLOBAL short Ecran_original_Y; // | l'image qui vient d'être chargée. GLOBAL short Largeur_ecran; // Largeur de l'écran GLOBAL short Hauteur_ecran; // Hauteur de l'écran +GLOBAL byte Plein_ecran; // Indique si on est en mode plein écran ou fenêtré GLOBAL short Limite_Haut; // | GLOBAL short Limite_Bas; // |_ Limites dans lesquelles GLOBAL short Limite_Gauche; // | on peut écrire diff --git a/graph.c b/graph.c index e654b994..af12174d 100644 --- a/graph.c +++ b/graph.c @@ -59,8 +59,8 @@ void Mettre_Ecran_A_Jour(short X, short Y, short Largeur, short Hauteur) // Et ensuite dans la partie zoomée if(Loupe_Mode) { - X_effectif = Max(X-Loupe_Decalage_X,0) * Loupe_Facteur; - Y_effectif = Max(Y-Loupe_Decalage_Y,0) * Loupe_Facteur; + X_effectif = Min(Max(X-Loupe_Decalage_X,0) * Loupe_Facteur, Principal_Largeur_image); + Y_effectif = Min(Max(Y-Loupe_Decalage_Y,0) * Loupe_Facteur, Menu_Ordonnee); Largeur *= Loupe_Facteur; Hauteur *= Loupe_Facteur; @@ -69,7 +69,7 @@ void Mettre_Ecran_A_Jour(short X, short Y, short Largeur, short Hauteur) // mais personne ne devrait demander d'update en dehors de cette limite, même le fill est contraint // a rester dans la zone visible de l'image if(X_effectif + Largeur <= Principal_Largeur_image) L_effectif = Largeur; - else L_effectif = Principal_Largeur_image - X_effectif; + else L_effectif = Principal_Largeur_image - X_effectif - 1; if(Y_effectif + Hauteur <= Menu_Ordonnee) H_effectif = Hauteur; else H_effectif = Menu_Ordonnee - Y_effectif; @@ -912,6 +912,7 @@ void Initialiser_mode_video(int Numero) { Largeur_ecran = Mode_video[Numero].Largeur; Hauteur_ecran = Mode_video[Numero].Hauteur; + Plein_ecran = Mode_video[Numero].Fullscreen; switch (Config.Ratio) { diff --git a/init.c b/init.c index 8522f415..81f37c18 100644 --- a/init.c +++ b/init.c @@ -12,7 +12,6 @@ #include "const.h" #include "struct.h" #include "global.h" -#include "modesvdo.h" #include "graph.h" #include "boutons.h" #include "palette.h" @@ -85,21 +84,18 @@ void Ajouter_lecteur(byte Numero, char Lettre, byte Type) // Rechercher la liste et le type des lecteurs de la machine void Rechercher_drives(void) { - #ifdef __linux__ + #ifdef __linux__ //Sous linux, il n'y a pas de lecteurs, on va juste mettre // un disque dur qui pointera vers la racine, // et un autre vers le home directory de l'utilisateur. Ajouter_lecteur(0,'/', LECTEUR_HDD); Ajouter_lecteur(1,'~', LECTEUR_HDD); - - #else - + #else + int DriveBits = GetLogicalDrives(); + int IndiceLecteur; + int IndiceBit; // Sous Windows, on a la totale, presque aussi bien que sous DOS: - - int DriveBits = GetLogicalDrives(); - int IndiceLecteur; - int IndiceBit; IndiceLecteur = 0; for (IndiceBit=0; IndiceBit<26 && IndiceLecteur<23; IndiceBit++) { @@ -130,8 +126,8 @@ void Rechercher_drives(void) break; } Ajouter_lecteur(IndiceBit, 'A'+IndiceBit, TypeLecteur); - IndiceLecteur++; - } + IndiceLecteur++; + } } #endif } @@ -1319,90 +1315,103 @@ void Definir_mode_video(int Numero, word Facteur_X, word Facteur_Y, char * Ratio, unsigned char Refresh, - word Mode_VESA_de_base, + word Plein_Ecran, void * Pointeur) { - Mode_video[Numero].Largeur =Largeur; - Mode_video[Numero].Hauteur =Hauteur; - Mode_video[Numero].Mode =Mode; - Mode_video[Numero].Facteur_X =Facteur_X; - Mode_video[Numero].Facteur_Y =Facteur_Y; + Mode_video[Numero].Largeur = Largeur; + Mode_video[Numero].Hauteur = Hauteur; + Mode_video[Numero].Mode = Mode; + Mode_video[Numero].Facteur_X = Facteur_X; + Mode_video[Numero].Facteur_Y = Facteur_Y; strcpy(Mode_video[Numero].Ratio,Ratio); - Mode_video[Numero].Refresh =Refresh; - Mode_video[Numero].Mode_VESA_de_base=Mode_VESA_de_base; - Mode_video[Numero].Pointeur =Pointeur; + Mode_video[Numero].Refresh = Refresh; + Mode_video[Numero].Fullscreen = 0; + Mode_video[Numero].Pointeur = Pointeur; + + // On passe aux modes plein écran + Numero += NB_MODES_VIDEO; + + Mode_video[Numero].Largeur = Largeur; + Mode_video[Numero].Hauteur = Hauteur; + Mode_video[Numero].Mode = Mode; + Mode_video[Numero].Facteur_X = Facteur_X; + Mode_video[Numero].Facteur_Y = Facteur_Y; + strcpy(Mode_video[Numero].Ratio,Ratio); + Mode_video[Numero].Refresh = Refresh; + Mode_video[Numero].Fullscreen = 1; + Mode_video[Numero].Pointeur = Pointeur; } // Initiliseur de toutes les opérations: void Definition_des_modes_video(void) -{ // Numero LargHaut Mode FXFY Ratio Ref Vesa Pointeur - Definir_mode_video( MODE_320_200, 320,200,MODE_SDL ,1,1,"0.85", 71,0 ,NULL ); - Definir_mode_video( MODE_320_224, 320,224,MODE_SDL ,1,1,"1.20", 51,0 ,X320Y224); - Definir_mode_video( MODE_320_240, 320,240,MODE_SDL ,1,1,"1.00", 60,0 ,X320Y240); - Definir_mode_video( MODE_320_256, 320,256,MODE_SDL ,1,1,"1.10", 58,0 ,X320Y256); - Definir_mode_video( MODE_320_270, 320,270,MODE_SDL ,1,1,"1.15", 64,0 ,X320Y270); - Definir_mode_video( MODE_320_282, 320,282,MODE_SDL ,1,1,"1.20", 52,0 ,X320Y282); - Definir_mode_video( MODE_320_300, 320,300,MODE_SDL ,1,1,"1.20",-49,0 ,X320Y300); - Definir_mode_video( MODE_320_360, 320,360,MODE_SDL ,1,1,"1.65", 71,0 ,X320Y360); - Definir_mode_video( MODE_320_400, 320,400,MODE_SDL ,1,2,"1.70", 71,0 ,X320Y400); - Definir_mode_video( MODE_320_448, 320,448,MODE_SDL ,1,2,"2.20", 51,0 ,X320Y448); - Definir_mode_video( MODE_320_480, 320,480,MODE_SDL ,1,2,"2.00", 60,0 ,X320Y480); - Definir_mode_video( MODE_320_512, 320,512,MODE_SDL ,1,2,"2.20", 58,0 ,X320Y512); - Definir_mode_video( MODE_320_540, 320,540,MODE_SDL ,1,2,"2.25", 64,0 ,X320Y540); - Definir_mode_video( MODE_320_564, 320,564,MODE_SDL ,1,2,"2.40", 59,0 ,X320Y564); - Definir_mode_video( MODE_320_600, 320,600,MODE_SDL ,1,2,"2.80", 51,0 ,X320Y600); +{ // Numero LargHaut Mode FXFY Ratio Ref WinOnly Pointeur + Definir_mode_video( MODE_320_200, 320,200,MODE_SDL ,1,1,"0.85", 71,0 ,NULL); + Definir_mode_video( MODE_320_224, 320,224,MODE_SDL ,1,1,"1.20", 51,0 ,NULL); + Definir_mode_video( MODE_320_240, 320,240,MODE_SDL ,1,1,"1.00", 60,0 ,NULL); + Definir_mode_video( MODE_320_256, 320,256,MODE_SDL ,1,1,"1.10", 58,0 ,NULL); + Definir_mode_video( MODE_320_270, 320,270,MODE_SDL ,1,1,"1.15", 64,0 ,NULL); + Definir_mode_video( MODE_320_282, 320,282,MODE_SDL ,1,1,"1.20", 52,0 ,NULL); + Definir_mode_video( MODE_320_300, 320,300,MODE_SDL ,1,1,"1.20",-49,0 ,NULL); + Definir_mode_video( MODE_320_360, 320,360,MODE_SDL ,1,1,"1.65", 71,0 ,NULL); + Definir_mode_video( MODE_320_400, 320,400,MODE_SDL ,1,2,"1.70", 71,0 ,NULL); + Definir_mode_video( MODE_320_448, 320,448,MODE_SDL ,1,2,"2.20", 51,0 ,NULL); + Definir_mode_video( MODE_320_480, 320,480,MODE_SDL ,1,2,"2.00", 60,0 ,NULL); + Definir_mode_video( MODE_320_512, 320,512,MODE_SDL ,1,2,"2.20", 58,0 ,NULL); + Definir_mode_video( MODE_320_540, 320,540,MODE_SDL ,1,2,"2.25", 64,0 ,NULL); + Definir_mode_video( MODE_320_564, 320,564,MODE_SDL ,1,2,"2.40", 59,0 ,NULL); + Definir_mode_video( MODE_320_600, 320,600,MODE_SDL ,1,2,"2.80", 51,0 ,NULL); - Definir_mode_video( MODE_360_200, 360,200,MODE_SDL ,1,1,"0.80", 72,0 ,X360Y200); - Definir_mode_video( MODE_360_224, 360,224,MODE_SDL ,1,1,"1.10", 51,0 ,X360Y224); - Definir_mode_video( MODE_360_240, 360,240,MODE_SDL ,1,1,"0.90", 61,0 ,X360Y240); - Definir_mode_video( MODE_360_256, 360,256,MODE_SDL ,1,1,"1.00", 57,0 ,X360Y256); - Definir_mode_video( MODE_360_270, 360,270,MODE_SDL ,1,1,"0.95", 57,0 ,X360Y270); - Definir_mode_video( MODE_360_282, 360,282,MODE_SDL ,1,1,"1.10", 52,0 ,X360Y282); - Definir_mode_video( MODE_360_300, 360,300,MODE_SDL ,1,1,"1.10",-49,0 ,X360Y300); - Definir_mode_video( MODE_360_360, 360,360,MODE_SDL ,1,1,"1.50", 72,0 ,X360Y360); - Definir_mode_video( MODE_360_400, 360,400,MODE_SDL ,1,2,"1.60", 72,0 ,X360Y400); - Definir_mode_video( MODE_360_448, 360,448,MODE_SDL ,1,2,"2.20", 51,0 ,X360Y448); - Definir_mode_video( MODE_360_480, 360,480,MODE_SDL ,1,2,"1.80", 61,0 ,X360Y480); - Definir_mode_video( MODE_360_512, 360,512,MODE_SDL ,1,2,"2.00", 57,0 ,X360Y512); - Definir_mode_video( MODE_360_540, 360,540,MODE_SDL ,1,2,"1.85", 57,0 ,X360Y540); - Definir_mode_video( MODE_360_564, 360,564,MODE_SDL ,1,2,"2.20", 60,0 ,X360Y564); - Definir_mode_video( MODE_360_600, 360,600,MODE_SDL ,1,2,"2.40", 45,0 ,X360Y600); + Definir_mode_video( MODE_360_200, 360,200,MODE_SDL ,1,1,"0.80", 72,0 ,NULL); + Definir_mode_video( MODE_360_224, 360,224,MODE_SDL ,1,1,"1.10", 51,0 ,NULL); + Definir_mode_video( MODE_360_240, 360,240,MODE_SDL ,1,1,"0.90", 61,0 ,NULL); + Definir_mode_video( MODE_360_256, 360,256,MODE_SDL ,1,1,"1.00", 57,0 ,NULL); + Definir_mode_video( MODE_360_270, 360,270,MODE_SDL ,1,1,"0.95", 57,0 ,NULL); + Definir_mode_video( MODE_360_282, 360,282,MODE_SDL ,1,1,"1.10", 52,0 ,NULL); + Definir_mode_video( MODE_360_300, 360,300,MODE_SDL ,1,1,"1.10",-49,0 ,NULL); + Definir_mode_video( MODE_360_360, 360,360,MODE_SDL ,1,1,"1.50", 72,0 ,NULL); + Definir_mode_video( MODE_360_400, 360,400,MODE_SDL ,1,2,"1.60", 72,0 ,NULL); + Definir_mode_video( MODE_360_448, 360,448,MODE_SDL ,1,2,"2.20", 51,0 ,NULL); + Definir_mode_video( MODE_360_480, 360,480,MODE_SDL ,1,2,"1.80", 61,0 ,NULL); + Definir_mode_video( MODE_360_512, 360,512,MODE_SDL ,1,2,"2.00", 57,0 ,NULL); + Definir_mode_video( MODE_360_540, 360,540,MODE_SDL ,1,2,"1.85", 57,0 ,NULL); + Definir_mode_video( MODE_360_564, 360,564,MODE_SDL ,1,2,"2.20", 60,0 ,NULL); + Definir_mode_video( MODE_360_600, 360,600,MODE_SDL ,1,2,"2.40", 45,0 ,NULL); - Definir_mode_video( MODE_400_200, 400,200,MODE_SDL ,1,1,"0.75", 68,0 ,X400Y200); - Definir_mode_video( MODE_400_224, 400,224,MODE_SDL ,1,1,"1.00", 49,0 ,X400Y224); - Definir_mode_video( MODE_400_240, 400,240,MODE_SDL ,1,1,"0.85", 58,0 ,X400Y240); - Definir_mode_video( MODE_400_256, 400,256,MODE_SDL ,1,1,"0.90", 55,0 ,X400Y256); - Definir_mode_video( MODE_400_270, 400,270,MODE_SDL ,1,1,"0.90", 54,0 ,X400Y270); - Definir_mode_video( MODE_400_282, 400,282,MODE_SDL ,1,1,"1.00", 50,0 ,X400Y282); - Definir_mode_video( MODE_400_300, 400,300,MODE_SDL ,1,1,"1.00",-46,0 ,X400Y300); - Definir_mode_video( MODE_400_360, 400,360,MODE_SDL ,1,1,"1.40", 68,0 ,X400Y360); - Definir_mode_video( MODE_400_400, 400,400,MODE_SDL ,1,2,"1.50", 67,0 ,X400Y400); - Definir_mode_video( MODE_400_448, 400,448,MODE_SDL ,1,2,"1.95", 49,0 ,X400Y448); - Definir_mode_video( MODE_400_480, 400,480,MODE_SDL ,1,2,"1.70", 58,0 ,X400Y480); - Definir_mode_video( MODE_400_512, 400,512,MODE_SDL ,1,2,"1.80", 55,0 ,X400Y512); - Definir_mode_video( MODE_400_540, 400,540,MODE_SDL ,1,2,"1.90", 54,0 ,X400Y540); - Definir_mode_video( MODE_400_564, 400,564,MODE_SDL ,1,2,"2.00", 57,0 ,X400Y564); - Definir_mode_video( MODE_400_600, 400,600,MODE_SDL ,1,2,"2.20", 43,0 ,X400Y600); + Definir_mode_video( MODE_400_200, 400,200,MODE_SDL ,1,1,"0.75", 68,0 ,NULL); + Definir_mode_video( MODE_400_224, 400,224,MODE_SDL ,1,1,"1.00", 49,0 ,NULL); + Definir_mode_video( MODE_400_240, 400,240,MODE_SDL ,1,1,"0.85", 58,0 ,NULL); + Definir_mode_video( MODE_400_256, 400,256,MODE_SDL ,1,1,"0.90", 55,0 ,NULL); + Definir_mode_video( MODE_400_270, 400,270,MODE_SDL ,1,1,"0.90", 54,0 ,NULL); + Definir_mode_video( MODE_400_282, 400,282,MODE_SDL ,1,1,"1.00", 50,0 ,NULL); + Definir_mode_video( MODE_400_300, 400,300,MODE_SDL ,1,1,"1.00",-46,0 ,NULL); + Definir_mode_video( MODE_400_360, 400,360,MODE_SDL ,1,1,"1.40", 68,0 ,NULL); + Definir_mode_video( MODE_400_400, 400,400,MODE_SDL ,1,2,"1.50", 67,0 ,NULL); + Definir_mode_video( MODE_400_448, 400,448,MODE_SDL ,1,2,"1.95", 49,0 ,NULL); + Definir_mode_video( MODE_400_480, 400,480,MODE_SDL ,1,2,"1.70", 58,0 ,NULL); + Definir_mode_video( MODE_400_512, 400,512,MODE_SDL ,1,2,"1.80", 55,0 ,NULL); + Definir_mode_video( MODE_400_540, 400,540,MODE_SDL ,1,2,"1.90", 54,0 ,NULL); + Definir_mode_video( MODE_400_564, 400,564,MODE_SDL ,1,2,"2.00", 57,0 ,NULL); + Definir_mode_video( MODE_400_600, 400,600,MODE_SDL ,1,2,"2.20", 43,0 ,NULL); - Definir_mode_video( MODE_640_224, 640,224,MODE_SDL ,2,1,"0.60", -1,0x101,Y224); - Definir_mode_video( MODE_640_240, 640,240,MODE_SDL ,2,1,"0.50", -1,0x101,Y240); - Definir_mode_video( MODE_640_256, 640,256,MODE_SDL ,2,1,"0.55", -1,0x101,Y256); - Definir_mode_video( MODE_640_270, 640,270,MODE_SDL ,2,1,"0.60", -1,0x101,Y270); -// Definir_mode_video( MODE_640_282, 640,282,MODE_SDL ,2,1,"?.??", -1,0x101,Y282); - Definir_mode_video( MODE_640_300, 640,300,MODE_SDL ,2,1,"0.60", -1,0x101,Y300); - Definir_mode_video( MODE_640_350, 640,350,MODE_SDL ,2,1,"0.75", -1,0x100,Y350); -// Definir_mode_video( MODE_640_360, 640,360,MODE_SDL ,2,1,"?.??", -1,0x101,Y360); - Definir_mode_video( MODE_640_400, 640,400,MODE_SDL ,2,2,"0.85", -1,0x100,NULL); - Definir_mode_video( MODE_640_448, 640,448,MODE_SDL ,2,2,"1.20", -1,0x101,Y448); - Definir_mode_video( MODE_640_480, 640,480,MODE_SDL ,2,2,"1.00", -1,0x101,NULL); - Definir_mode_video( MODE_640_512, 640,512,MODE_SDL ,2,2,"1.10", -1,0x101,Y512); - Definir_mode_video( MODE_640_540, 640,540,MODE_SDL ,2,2,"1.15", -1,0x101,Y540); - Definir_mode_video( MODE_640_564, 640,564,MODE_SDL ,2,2,"1.25", -1,0x101,Y564); - Definir_mode_video( MODE_640_600, 640,600,MODE_SDL ,2,2,"1.45", -1,0x101,Y600); - Definir_mode_video( MODE_800_600, 800,600,MODE_SDL ,2,2,"1.00", -1,0x103,NULL); - Definir_mode_video(MODE_1024_768,1024,768,MODE_SDL ,3,3,"1.00", -1,0x105,NULL); + Definir_mode_video( MODE_640_224, 640,224,MODE_SDL ,2,1,"0.60", -1,0 ,NULL); + Definir_mode_video( MODE_640_240, 640,240,MODE_SDL ,2,1,"0.50", -1,0 ,NULL); + Definir_mode_video( MODE_640_256, 640,256,MODE_SDL ,2,1,"0.55", -1,0 ,NULL); + Definir_mode_video( MODE_640_270, 640,270,MODE_SDL ,2,1,"0.60", -1,0 ,NULL); + //Definir_mode_video( MODE_640_282, 640,282,MODE_SDL ,2,1,"?.??", -1,0 ,NULL); + Definir_mode_video( MODE_640_300, 640,300,MODE_SDL ,2,1,"0.60", -1,0 ,NULL); + Definir_mode_video( MODE_640_350, 640,350,MODE_SDL ,2,1,"0.75", -1,0 ,NULL); + //Definir_mode_video( MODE_640_360, 640,360,MODE_SDL ,2,1,"?.??", -1,0 ,NULL); + Definir_mode_video( MODE_640_400, 640,400,MODE_SDL ,2,2,"0.85", -1,0 ,NULL); + Definir_mode_video( MODE_640_448, 640,448,MODE_SDL ,2,2,"1.20", -1,0 ,NULL); + Definir_mode_video( MODE_640_480, 640,480,MODE_SDL ,2,2,"1.00", -1,0 ,NULL); + Definir_mode_video( MODE_640_512, 640,512,MODE_SDL ,2,2,"1.10", -1,0 ,NULL); + Definir_mode_video( MODE_640_540, 640,540,MODE_SDL ,2,2,"1.15", -1,0 ,NULL); + Definir_mode_video( MODE_640_564, 640,564,MODE_SDL ,2,2,"1.25", -1,0 ,NULL); + Definir_mode_video( MODE_640_600, 640,600,MODE_SDL ,2,2,"1.45", -1,0 ,NULL); + Definir_mode_video( MODE_800_600, 800,600,MODE_SDL ,2,2,"1.00", -1,0 ,NULL); + Definir_mode_video(MODE_1024_768,1024,768,MODE_SDL ,3,3,"1.00", -1,0 ,NULL); } //--------------------------------------------------------------------------- diff --git a/modesvdo.h b/modesvdo.h deleted file mode 100644 index cc1c57fc..00000000 --- a/modesvdo.h +++ /dev/null @@ -1,219 +0,0 @@ -// Différentes tables utilisées pour les changements de modes vidéos X - -/* -word X376Y564[] = - { 0x11EB, 0x6E00, 0x5D01, 0x5E02, 0x9103, 0x6204, 0x8F05, 0x6206, 0xF007, - 0x6009, 0x3E10, 0x8911, 0x3312, 0x2F13, 0x0014, 0x3C15, 0x5C16, 0xE317 }; - -// !! NE MARCHENT PAS DU TOUT !! -word X368Y200[] = - { 0x09C7, 0x3300, 0x2D01, 0x3102, 0x9303, 0x3004, 0x9605, 0x2E13, 0x0014, - 0xE317 }; -word X640Y256[] = - { 0x12E3, 0xAD00, 0x9F01, 0x9F02, 0x8903, 0xA004, 0x0605, 0x2B06, 0x3E07, - 0x0008, 0x6109, 0x9C10, 0x8E11, 0xFF12, 0x5013, 0x0014, 0x7315, 0xFE16, - 0xE317 }; -word X640Y256[] = - { 0x12E3, 0xAD00, 0x9F01, 0x9F02, 0x8903, 0xA004, 0x0605, 0x2B06, 0xB207, - 0x0008, 0x6109, 0x0A10, 0xAC11, 0xFF12, 0x5013, 0x0014, 0x0715, 0x1A16, - 0xE317 }; -*/ - -word X320Y224[] = - { 0x0BA3, 0x6F06, 0xBA07, 0x0008, 0x4109, 0x0810, 0x8A11, 0xBF12, 0x0014, - 0xC715, 0x0416, 0xE317 }; -word X320Y240[] = - { 0x0AE3, 0x0D06, 0x3E07, 0x4109, 0xEA10, 0xAC11, 0xDF12, 0x0014, 0xE715, - 0x0616, 0xE317 }; -word X320Y256[] = - { 0x0CE3, 0x2306, 0xB207, 0x0008, 0x6109, 0x0A10, 0xAC11, 0xFF12, 0x2013, - 0x0014, 0x0715, 0x1A16, 0xE317 }; -word X320Y270[] = - { 0x0BE7, 0x3006, 0xF007, 0x0008, 0x6109, 0x2010, 0xA911, 0x1B12, 0x0014, - 0x1F15, 0x2F16, 0xE317 }; -word X320Y282[] = - { 0x0CE3, 0x6206, 0xF007, 0x6109, 0x310F, 0x3710, 0x8911, 0x3312, 0x2F13, - 0x0014, 0x3C15, 0x5C16, 0xE317 }; -word X320Y300[] = - { 0x0DE3, 0x4606, 0x1F07, 0x0008, 0x4009, 0x3110, 0x8011, 0x2B12, 0x2013, - 0x0014, 0x2F15, 0x4416, 0xE317 }; -word X320Y360[] = - { 0x09E3, 0x4009, 0x8810, 0x8511, 0x6712, 0x2013, 0x0014, 0x6D15, 0xBA16, - 0xE317 }; -word X320Y400[] = - { 0x03E3, 0x4009, 0x0014, 0xE317 }; -word X320Y448[] = - { 0x0BA3, 0x6F06, 0xBA07, 0x0008, 0x4009, 0x0810, 0x8A11, 0xBF12, 0x0014, - 0xC715, 0x0416, 0xE317 }; -word X320Y480[] = - { 0x0AE3, 0x0D06, 0x3E07, 0x4009, 0xEA10, 0xAC11, 0xDF12, 0x0014, 0xE715, - 0x0616 , 0xE317}; -word X320Y512[] = - { 0x0CE3, 0x2306, 0xB207, 0x0008, 0x6009, 0x0A10, 0xAC11, 0xFF12, 0x2013, - 0x0014, 0x0715, 0x1A16, 0xE317 }; -word X320Y540[] = - { 0x0BE7, 0x3006, 0xF007, 0x0008, 0x6009, 0x2010, 0xA911, 0x1B12, 0x0014, - 0x1F15, 0x2F16, 0xE317 }; -word X320Y564[] = - { 0x0CE7, 0x6206, 0xF007, 0x0008, 0x6009, 0x3E10, 0x8911, 0x3312, 0x2013, - 0x0014, 0x3C15, 0x5C16, 0xE317 }; -word X320Y600[] = - { 0x0BE7, 0xBE06, 0xF007, 0x0008, 0x6009, 0x7C10, 0x8C11, 0x5712, 0x0014, - 0x5815, 0x7016, 0xE317 }; -word X360Y200[] = - { 0x09E7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x2D13, 0x0014, - 0xE317 }; -word X360Y224[] = - { 0x12A7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x6F06, 0xBA07, - 0x0008, 0x4109, 0x0810, 0x8A11, 0xBF12, 0x2D13, 0x0014, 0xC715, 0x0416, - 0xE317 }; -word X360Y240[] = - { 0x11E7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x0D06, 0x3E07, - 0x4109, 0xEA10, 0xAC11, 0xDF12, 0x2D13, 0x0014, 0xE715, 0x0616, 0xE317 }; -word X360Y256[] = - { 0x12E7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x2B06, 0xB207, - 0x0008, 0x6109, 0x0E10, 0xAC11, 0xFF12, 0x2D13, 0x0014, 0x0715, 0x1A16, - 0xE317 }; -word X360Y270[] = - { 0x12E7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x3006, 0xF007, - 0x0008, 0x6109, 0x2010, 0xA911, 0x1B12, 0x2D13, 0x0014, 0x1F15, 0x2F16, - 0xE317 }; -word X360Y282[] = - { 0x12E7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x6206, 0xF007, - 0x6109, 0x310F, 0x3710, 0x8911, 0x3312, 0x2D13, 0x0014, 0x3C15, 0x5C16, - 0xE317 }; -word X360Y300[] = - { 0x12E7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x4606, 0x1F07, - 0x0008, 0x4009, 0x3110, 0x8011, 0x2B12, 0x2D13, 0x0014, 0x2F15, 0x4416, - 0xE317 }; -word X360Y360[] = - { 0x0FE7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x4009, 0x8810, - 0x8511, 0x6712, 0x2D13, 0x0014, 0x6D15, 0xBA16, 0xE317 }; -word X360Y400[] = - { 0x0AE7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x4009, 0x2D13, - 0x0014, 0xE317 }; -word X360Y448[] = - { 0x12A7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x6F06, 0xBA07, - 0x0008, 0x4009, 0x0810, 0x8A11, 0xBF12, 0x2D13, 0x0014, 0xC715, 0x0416, - 0xE317 }; -word X360Y480[] = - { 0x11E7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x0D06, 0x3E07, - 0x4009, 0xEA10, 0xAC11, 0xDF12, 0x2D13, 0x0014, 0xE715, 0x0616, 0xE317 }; -word X360Y512[] = - { 0x12E7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x2B06, 0xB207, - 0x0008, 0x6009, 0x0E10, 0xAC11, 0xff12, 0x2D13, 0x0014, 0x0715, 0x1A16, - 0xE317 }; -word X360Y540[] = - { 0x12E7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x3006, 0xF007, - 0x0008, 0x6009, 0x2010, 0xA911, 0x1B12, 0x2D13, 0x0014, 0x1F15, 0x2F16, - 0xE317 }; -word X360Y564[] = - { 0x12EB, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0x6206, 0xF007, - 0x0008, 0x6009, 0x3E10, 0x8911, 0x3312, 0x2D13, 0x0014, 0x3C15, 0x5C16, - 0xE317 }; -word X360Y600[] = - { 0x12E7, 0x6B00, 0x5901, 0x5A02, 0x8E03, 0x5E04, 0x8A05, 0xBE06, 0xF007, - 0x0008, 0x6009, 0x7C10, 0x8C11, 0x5712, 0x2D13, 0x0014, 0x5815, 0x7016, - 0xE317 }; -word X400Y200[] = - { 0x09E7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x3213, 0x0014, - 0xE317 }; -word X400Y224[] = - { 0x12A7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x6F06, 0xBA07, - 0x0008, 0x4109, 0x0810, 0x8A11, 0xBF12, 0x3213, 0x0014, 0xC715, 0x0416, - 0xE317 }; -word X400Y240[] = - { 0x12E7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x0D06, 0x3E07, - 0x0008, 0x4109, 0xEA10, 0xAC11, 0xDF12, 0x3213, 0x0014, 0xE715, 0x0616, - 0xE317 }; -word X400Y256[] = - { 0x12E7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x2B06, 0xB207, - 0x0008, 0x6109, 0x1310, 0xAC11, 0xFF12, 0x3213, 0x0014, 0x0715, 0x1A16, - 0xE317 }; -word X400Y270[] = - { 0x12E7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x3006, 0xF007, - 0x0008, 0x6109, 0x2010, 0xA911, 0x1B12, 0x3213, 0x0014, 0x1F15, 0x2F16, - 0xE317 }; -word X400Y282[] = - { 0x12E7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x6206, 0xF007, - 0x6109, 0x310F, 0x3710, 0x8911, 0x3312, 0x3213, 0x0014, 0x3C15, 0x5C16, - 0xE317 }; -word X400Y300[] = - { 0x12E7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x4606, 0x1F07, - 0x0008, 0x4009, 0x3110, 0x8011, 0x2B12, 0x3213, 0x0014, 0x2F15, 0x4416, - 0xE317 }; -word X400Y360[] = - { 0x0FE7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x4009, 0x8810, - 0x8511, 0x6712, 0x3213, 0x0014, 0x6D15, 0xBA16, 0xE317 }; -word X400Y400[] = - { 0x0AE7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x4009, 0x3213, - 0x0014, 0xE317 }; -word X400Y448[] = - { 0x12A7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x6F06, 0xBA07, - 0x0008, 0x4009, 0x0810, 0x8A11, 0xBF12, 0x3213, 0x0014, 0xC715, 0x0416, - 0xE317 }; -word X400Y480[] = - { 0x11E7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x0D06, 0x3E07, - 0x4009, 0xEA10, 0xAC11, 0xDF12, 0x3213, 0x0014, 0xE715, 0x0616, 0xE317 }; -word X400Y512[] = - { 0x12E7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x2B06, 0xB207, - 0x0008, 0x6009, 0x1310, 0xAC11, 0xFF12, 0x3213, 0x0014, 0x0715, 0x1A16, - 0xE317 }; -word X400Y540[] = - { 0x12E7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x3006, 0xF007, - 0x0008, 0x6009, 0x2010, 0xA911, 0x1B12, 0x3213, 0x0014, 0x1F15, 0x2F16, - 0xE317 }; -word X400Y564[] = - { 0x12EB, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0x6206, 0xF007, - 0x0008, 0x6009, 0x3E10, 0x8911, 0x3312, 0x3213, 0x0014, 0x3C15, 0x5C16, - 0xE317 }; -word X400Y600[] = - { 0x12E7, 0x7100, 0x6301, 0x6402, 0x9203, 0x6604, 0x8205, 0xBE06, 0xF007, - 0x0008, 0x6009, 0x7C10, 0x8C11, 0x5712, 0x3213, 0x0014, 0x5815, 0x7016, - 0xE317 }; - -// Différentes tables utilisées pour les modifications de modes vidéos VESA - -word Y224[] = - { 0x09A3, 0x6F06, 0xBA07, 0x0008, 0x4109, 0x0810, 0x8A11, 0xBF12, 0xC715, - 0x0416 }; -word Y240[] = - { 0x09E3, 0x0D06, 0x3E07, 0x0008, 0x4109, 0xEA10, 0xAC11, 0xDF12, 0xE715, - 0x0616 }; -word Y256[] = - { 0x0900, 0x2B06, 0xB207, 0x0008, 0x6109, 0x0A10, 0xAC11, 0xFF12, 0x0715, - 0x1A16 }; -word Y270[] = - { 0x09E7, 0x3006, 0xF007, 0x0008, 0x6109, 0x2010, 0xA911, 0x1B12, 0x1F15, - 0x2F16 }; -word Y282[] = - { 0x0AE3, 0x6206, 0xF007, 0x0008, 0x6109, 0x310F, 0x3710, 0x8911, 0x3312, - 0x3C15, 0x5C16 }; -word Y300[] = - { 0x09E3, 0x4606, 0x1F07, 0x0008, 0x4009, 0x3110, 0x8011, 0x2B12, 0x2F15, - 0x4416 }; -word Y350[] = - { 0x09A3, 0xBF06, 0x1F07, 0x0008, 0x4009, 0x8310, 0x8511, 0x5D12, 0x6315, - 0xBA16 }; -word Y360[] = - { 0x07E3, 0x0008, 0x4009, 0x8810, 0x8511, 0x6712, 0x6D15, 0xBA16 }; -word Y400[] = - { 0x01E3, 0x4009 }; -word Y448[] = - { 0x09A3, 0x6F06, 0xBA07, 0x0008, 0x4009, 0x0810, 0x8A11, 0xBF12, 0xC715, - 0x0416 }; -word Y480[] = - { 0x09E3, 0x0D06, 0x3E07, 0x0008, 0x4009, 0xEA10, 0xAC11, 0xDF12, 0xE715, - 0x0616 }; -word Y512[] = - { 0x0900, 0x2B06, 0xB207, 0x0008, 0x6009, 0x0A10, 0xAC11, 0xFF12, 0x0715, - 0x1A16 }; -word Y540[] = - { 0x09E7, 0x3006, 0xF007, 0x0008, 0x6009, 0x2010, 0xA911, 0x1B12, 0x1F15, - 0x2F16 }; -word Y564[] = - { 0x09E7, 0x6206, 0xF007, 0x0008, 0x6009, 0x3E10, 0x8911, 0x3312, 0x3C15, - 0x5C16 }; -word Y600[] = - { 0x09E7, 0xBE06, 0xF007, 0x0008, 0x6009, 0x7C10, 0x8C11, 0x5712, 0x5815, - 0x7016 }; diff --git a/sdlscreen.c b/sdlscreen.c index 5acd04d0..7dc1119f 100644 --- a/sdlscreen.c +++ b/sdlscreen.c @@ -437,16 +437,7 @@ void Clear_brush_zoom_SDL (word Pos_X,word Pos_Y,word Decalage_X,word Dec void Set_Mode_SDL() /* On règle la résolution de l'écran */ { - #ifdef WINDOWED - #define FLAGS 0 - #else - #define FLAGS SDL_FULLSCREEN - #endif - - DEBUG("Mode L",Largeur_ecran); - DEBUG("Mode H",Hauteur_ecran); - - Ecran_SDL=SDL_SetVideoMode(Largeur_ecran,Hauteur_ecran,8,FLAGS); + Ecran_SDL=SDL_SetVideoMode(Largeur_ecran,Hauteur_ecran,8,SDL_FULLSCREEN*Plein_ecran); if(Ecran_SDL != NULL) Ecran=Ecran_SDL->pixels; else