pipe-game

git clone git://bebou.netlib.re/pipe-game
Log | Files | Refs | README |

commit cc4d1ee4e986e62a34816d11da645932a0cc93be
parent 1d05d754b7c9307f076b81c9c67a620a26db5a2f
Auteurice: Arthur Pons <arthur.pons@unistra.fr>
Date:   Wed, 22 Jan 2025 11:53:47 +0100

Ajout fonction pour afficher bloc de text

Et ajout d'un retour à la ligne après le texte de la commande pour que
tout fonctionne bien
Divers passage de TB_BLACK vers TB_DEFAULT
Et autres trucs que j'ai oublié ?

Diffstat:
M
interface.c
 | 
37
+++++++++++++++++++++----------------

1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/interface.c b/interface.c
@@ -29,9 +29,10 @@ int nblines(char *str) {
 }
 
 void hr(int rowoffset, int lineoffset, int length) {
-	char ruler[length];
+	char ruler[length+1];
 	for(int i=0;i<length;i++){ruler[i]='-';}
-	tb_printf(rowoffset, lineoffset, TB_DEFAULT, TB_BLACK, ruler);
+	ruler[length]='\0';
+	tb_printf(rowoffset, lineoffset, TB_DEFAULT, TB_DEFAULT, ruler);
 }
 
 void vr(int rowoffset, int lineoffset, int length) {
@@ -89,7 +90,7 @@ void updatecmd(char* cmd, const pile p) {
 		strcat(cmd," | \n./");
 		strcat(cmd,p.cards[i]);
 	}
-	strcat(cmd," ) 2> /dev/null");
+	strcat(cmd," ) 2> /dev/null\n");
 }
 
 void updateinterncmd(char *res, const pile p) {
@@ -124,8 +125,7 @@ pile file2pile(char* filename) {
 	return p;
 }
 
-int displaypile(pile p, pile curmenu, int lineoffset, int rowoffset, bool selection) {
-	if(lineoffset!=0){lineoffset++;}
+int displaypile(pile p, pile curmenu, int rowoffset, int lineoffset, bool selection) {
 	int newlineoffset=lineoffset;
 	for (int i=0;i<p.cardCount;i++) {
 		if (i==p.curline && p.name == curmenu.name ) {
@@ -135,26 +135,31 @@ int displaypile(pile p, pile curmenu, int lineoffset, int rowoffset, bool select
 		else { tb_printf(rowoffset, lineoffset+i, TB_DEFAULT, TB_DEFAULT, p.cards[i]); }
 		newlineoffset++;
 	}
-	hr(rowoffset,newlineoffset,5);
-	return newlineoffset;
+	hr(rowoffset,newlineoffset,7);
+	return newlineoffset+1;
+}
+
+int displaytextblock(char *text, int rowoffset, int lineoffset) {
+	tb_printf(rowoffset, lineoffset, TB_DEFAULT, TB_DEFAULT, text);
+	int nbl=nblines(text)+lineoffset;
+	hr(rowoffset,nbl,2);
+	return nbl+1;
 }
 
 void display(pile** piles, pile curmenu, bool selection, char* cmd, char* res, char* intern) {
+	int lineoffset=0;
 	tb_clear();
-	int i, lineoffset=0;
 
 	lineoffset=displaypile(*piles[HAND], curmenu, 0, 0, selection);
-	lineoffset=displaypile(*piles[ARGS], curmenu, lineoffset, 0, selection);
-	displaypile(*piles[PLAYED], curmenu, 0, CARD_NAME_SIZE+2, selection);
+	lineoffset=displaypile(*piles[ARGS], curmenu, 0, lineoffset, selection);
+	displaypile(*piles[PLAYED], curmenu, CARD_NAME_SIZE+2, 0, selection);
 
 	vr(CARD_NAME_SIZE,0,lineoffset);
 
-	tb_printf(0, lineoffset+1+piles[ARGS]->cardCount, TB_DEFAULT, TB_BLACK, cmd);
-	hr(0,lineoffset,5);
-	tb_printf(0, lineoffset+1+piles[ARGS]->cardCount+piles[PLAYED]->cardCount+1+piles[ARGS]->cardCount, TB_DEFAULT, TB_BLACK, res);
-	int l=0; l=nblines(res);
-	hr(0,lineoffset,5);
-	tb_printf(0, lineoffset+1+piles[ARGS]->cardCount+piles[PLAYED]->cardCount+2+l, TB_DEFAULT, TB_BLACK, intern);
+	lineoffset=displaytextblock(cmd,0,lineoffset);
+	lineoffset=displaytextblock(res,0,lineoffset);
+	lineoffset=displaytextblock(intern,0,lineoffset);
+
 	tb_printf(0,30,TB_DEFAULT,TB_DEFAULT,curmenu.name);
 	char str[100];sprintf(str,"%d",curmenu.cardCount);
 	tb_printf(0,31,TB_DEFAULT,TB_DEFAULT,str);