menu_displaymessages and displaytext changed, it can take now formates like printf does

include/menu.h

@@ -1,4 +1,4 @@
-/* $Id: menu.h,v 1.6 2004/02/05 22:59:02 stpohle Exp $
+/* $Id: menu.h,v 1.7 2004/02/07 11:47:09 stpohle Exp $
  * GUI for menuhandling
  */
 
@@ -83,7 +83,8 @@ extern _menuitem *menu_get_lastid ();
 extern _menuitem *menu_get_firstid ();
 extern int menu_create_dirlist (char *path, signed char dirflags, _charlist *cl, int maxentry);
 extern char *menu_dir_select (char *title, char *path, signed char dirflags);
-extern void menu_displaymessage (char *title, char *line1, char *line2, char *line3, char *line4);
+extern void menu_displaymessage (char *title, char *fmt,...);
-extern void menu_displaytext (char *title, char *line1, char *line2, char *line3, char *line4);
+extern void menu_displaytext (char *title, char *fmt,...);
+extern void menu_formattext (char *input, char *out, char **start, int *lines, int *maxlinelen);
 
 #endif

src/game.c

@@ -1,4 +1,4 @@
-/* $Id: game.c,v 1.77 2004/02/05 22:59:03 stpohle Exp $ 
+/* $Id: game.c,v 1.78 2004/02/07 11:47:10 stpohle Exp $ 
   game.c - procedures for the game. */
 
 #include <string.h>
@@ -313,7 +313,7 @@ game_start ()
 {
 	int p, i;
 	
-    menu_displaytext ("Loading..", NULL, NULL, "Please Wait", NULL);
+    menu_displaytext ("Loading..", "Please Wait");
 
 	bman.players_nr_s = 0;
 
@@ -386,7 +386,7 @@ void game_showresult () {
     Uint8 *keys;
 	int done = 0, keypressed = 0, x, y, i, p;
 	
-    menu_displaytext ("Loading..", NULL, NULL, "Please Wait", NULL);
+    menu_displaytext ("Loading..", "Please Wait");
     dest.x = dest.y = 0;
     dest.w = gfx.res.x;
     dest.h = gfx.res.y;

src/main.c

@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.21 2004/01/07 23:04:32 patty21 Exp $ */
+/* $Id: main.c,v 1.22 2004/02/07 11:47:10 stpohle Exp $ */
 
 #include "basic.h"
 #include "bomberclone.h"
@@ -35,6 +35,7 @@ main (int argc, char **argv)
 	SDL_EnableUNICODE(1);
 	
 	config_init (argc, argv);
+	
 	while (menuselect != -1 && bman.state != GS_quit) {
 
 		menu_new (text, 400, 200);
@@ -60,9 +61,6 @@ main (int argc, char **argv)
 		}
 	}
 
-//	network_init ();
-//	network_shutdown ();
-	
     gfx_shutdown ();
 
     return 0;

src/menu.c

@@ -1,4 +1,4 @@
-/* $Id: menu.c,v 1.39 2004/02/05 22:59:04 stpohle Exp $
+/* $Id: menu.c,v 1.40 2004/02/07 11:47:10 stpohle Exp $
  * Menuhandling */
 
 #include "basic.h"
@@ -8,12 +8,18 @@
 #include "network.h"
 #include "ogcache-client.h"
 
+#define MENU_MESSAGES_MAXLINES 5
+#define MENU_MESSAGES_MAXLINELEN 50
+
+
 _menuitem menuitems[MENU_MAXENTRYS];
 _menu menu;
 int menu_looprunning = 0;
 
 /* delete all informations and create a totally new menuscreen */
-void menu_new (char *title, int x, int y) {
+void
+menu_new (char *title, int x, int y)
+{
     int i;
     if (menu.oldscreen != NULL)
         menu_delete ();
@@ -41,7 +47,9 @@ void menu_new (char *title, int x, int y) {
 
 
 /* restore the screen and reset all needed informations, free the old screen */
-void menu_delete () {
+void
+menu_delete ()
+{
     gfx_restorescreen (menu.oldscreen, &menu.oldscreenpos);
     gfx_blitdraw ();
     SDL_FreeSurface (menu.oldscreen);
@@ -56,9 +64,18 @@ void menu_delete () {
 
 
 /* draw only a part of the Screen */
-void menu_draw_background (SDL_Rect *updaterect) {
+void
-	int x,y, dx, dy;
+menu_draw_background (SDL_Rect * updaterect)
-	SDL_Rect dest, cdest, src, csrc, window;
+{
+    int x,
+      y,
+      dx,
+      dy;
+    SDL_Rect dest,
+      cdest,
+      src,
+      csrc,
+      window;
 
     y = 0;                      // start at the updaterect. start pos
     for (; y <= (menu.oldscreenpos.h - 2 * menu.images[0]->h - 1) / menu.images[4]->h; y++) {
@@ -82,7 +99,10 @@ void menu_draw_background (SDL_Rect *updaterect) {
             if (dest.w > 0 || dest.h > 0) {
                 dest.x += MENUOFFSET_X;
                 dest.y += MENUOFFSET_Y;
-				src.x = 0; src.y = 0; src.h = dest.h; src.w = dest.w;
+                src.x = 0;
+                src.y = 0;
+                src.h = dest.h;
+                src.w = dest.w;
 
                 if (updaterect == NULL)
                     gfx_blit (menu.images[4], &src, gfx.screen, &dest, 10000);
@@ -91,7 +111,8 @@ void menu_draw_background (SDL_Rect *updaterect) {
                     window.x += MENUOFFSET_X;
                     window.y += MENUOFFSET_Y;
                     rect_clipping (&src, &dest, &window, &csrc, &cdest);
-					if (csrc.w < UINT16_HALF && csrc.h < UINT16_HALF && cdest.w < UINT16_HALF && cdest.h < UINT16_HALF)
+                    if (csrc.w < UINT16_HALF && csrc.h < UINT16_HALF && cdest.w < UINT16_HALF
+                        && cdest.h < UINT16_HALF)
                         gfx_blit (menu.images[4], &csrc, gfx.screen, &cdest, 10000);
                 }
             }
@@ -101,9 +122,12 @@ void menu_draw_background (SDL_Rect *updaterect) {
 
 
 /* draws the menuborders, this function does not save the background */
-void menu_draw_border () {
+void
+menu_draw_border ()
+{
     SDL_Rect dest;
-	int i, dx;
+    int i,
+      dx;
 
     // draw top left
     dest.x = menu.oldscreenpos.x;
@@ -158,16 +182,21 @@ void menu_draw_border () {
     menu_draw_background (NULL);
     // draw title
     dx = menu.oldscreenpos.x + (menu.oldscreenpos.w - font[2].size.x * strlen (menu.title)) / 2;
-	font_gfxdrawbold (dx, menu.oldscreenpos.y + menu.images[0]->h + 8, menu.title, 2, COLOR_brown, 2, 10000);
+    font_gfxdrawbold (dx, menu.oldscreenpos.y + menu.images[0]->h + 8, menu.title, 2, COLOR_brown,
-	font_gfxdraw (dx, menu.oldscreenpos.y + menu.images[0]->h + 8, menu.title, 2, COLOR_yellow, 10000);
+                      2, 10000);
+    font_gfxdraw (dx, menu.oldscreenpos.y + menu.images[0]->h + 8, menu.title, 2, COLOR_yellow,
+                  10000);
 };
 
 
 /* draw the menu, even it is only put into the gfx_blitlist. gfx_blitdraw needs
  * to be called before the menu is drawed on the screen */
-void menu_draw () {
+void
+menu_draw ()
+{
     _menuitem *m;
-	if (!menu_looprunning)	return;
+    if (!menu_looprunning)
+        return;
 
     menu_draw_border ();
 
@@ -178,8 +207,11 @@ void menu_draw () {
 
 
 /* draw an item on the screen */
-inline void menu_draw_menuitem (_menuitem *m) {
+inline void
-	if (!menu_looprunning) return;
+menu_draw_menuitem (_menuitem * m)
+{
+    if (!menu_looprunning)
+        return;
     switch (m->type) {
     case (MENU_label):
         menu_draw_label (m);
@@ -204,7 +236,9 @@ inline void menu_draw_menuitem (_menuitem *m) {
 
 
 /* reload all variables into all menuelements */
-void menu_reload () {
+void
+menu_reload ()
+{
     _menuitem *m;
 
     for (m = menu.items; m != NULL; m = m->next)
@@ -214,7 +248,9 @@ void menu_reload () {
 
 
 /* reload variable into menuelement */
-inline void menu_reload_menuitem (_menuitem *m) {
+inline void
+menu_reload_menuitem (_menuitem * m)
+{
     switch (m->type) {
     case (MENU_entrytext):
     case (MENU_entryint16):
@@ -230,7 +266,9 @@ inline void menu_reload_menuitem (_menuitem *m) {
 
 
 /* find the last menuitem in the list. */
-int menu_getlastitem (_menuitem *first) {
+int
+menu_getlastitem (_menuitem * first)
+{
     int i = 0;
     _menuitem *result = first;
 
@@ -245,15 +283,21 @@ int menu_getlastitem (_menuitem *first) {
 
 
 /* get the last and the first id number */
-_menuitem *menu_get_firstid () {
+_menuitem *
-	_menuitem *result = NULL, *mi = menu.items;
+menu_get_firstid ()
+{
+    _menuitem *result = NULL,
+        *mi = menu.items;
     for (mi = menu.items; mi != NULL; mi = mi->next)
         if ((result == NULL || mi->id < result->id) && mi->id != -1)
             result = mi;
     return result;
 };
-_menuitem *menu_get_lastid () {
+_menuitem *
-	_menuitem *result = NULL, *mi = menu.items;
+menu_get_lastid ()
+{
+    _menuitem *result = NULL,
+        *mi = menu.items;
     for (mi = menu.items; mi != NULL; mi = mi->next)
         if ((result == NULL || mi->id > result->id) && mi->id != -1)
             result = mi;
@@ -263,7 +307,9 @@ _menuitem *menu_get_lastid () {
 
 
 /* change the focus to the givin element */
-void menu_change_focus (_menuitem *newfocus) {
+void
+menu_change_focus (_menuitem * newfocus)
+{
     _menuitem *oldmi;
 
     if (newfocus == menu.focus) // no focus change
@@ -295,11 +341,16 @@ void menu_change_focus (_menuitem *newfocus) {
 
 
 /* focus next element, order by ID */
-void menu_focus_next () {
+void
-	_menuitem *newmi = menu.focus, *mi, *oldmi = menu.focus;
+menu_focus_next ()
+{
+    _menuitem *newmi = menu.focus,
+        *mi,
+        *oldmi = menu.focus;
 
     for (mi = menu.items; mi != NULL; mi = mi->next)
-		if (mi->id != oldmi->id && mi->id > menu.focus->id && (mi->id < newmi->id || newmi == oldmi))
+        if (mi->id != oldmi->id && mi->id > menu.focus->id
+            && (mi->id < newmi->id || newmi == oldmi))
             newmi = mi;
     if (newmi == oldmi)
         menu_change_focus (menu_get_firstid ());
@@ -309,11 +360,16 @@ void menu_focus_next () {
 
 
 /* focus previous element, order by ID */
-void menu_focus_prev () {
+void
-	_menuitem *newmi = menu.focus, *mi, *oldmi = menu.focus;
+menu_focus_prev ()
+{
+    _menuitem *newmi = menu.focus,
+        *mi,
+        *oldmi = menu.focus;
 
     for (mi = menu.items; mi != NULL; mi = mi->next)
-		if (mi->id != -1 && mi->id != oldmi->id && mi->id < oldmi->id && (mi->id > newmi->id || newmi == oldmi))
+        if (mi->id != -1 && mi->id != oldmi->id && mi->id < oldmi->id
+            && (mi->id > newmi->id || newmi == oldmi))
             newmi = mi;
     if (newmi == oldmi)
         menu_change_focus (menu_get_lastid ());
@@ -323,8 +379,11 @@ void menu_focus_prev () {
 
 
 /* focus element with id ID */
-void menu_focus_id (int id) {
+void
-	_menuitem *mi, *oldmi = menu.focus;
+menu_focus_id (int id)
+{
+    _menuitem *mi,
+     *oldmi = menu.focus;
 
     for (mi = menu.items; mi != NULL; mi = mi->next)
         if (mi->id == id)
@@ -338,10 +397,15 @@ void menu_focus_id (int id) {
 
 /* menu loop, programm will stay in here as long as no ESCAPE is pressed
  * and as long as no Button is clicked.  Return of -2 means something needs to reordered */
-int menu_loop () {
+int
+menu_loop ()
+{
     SDL_Event event;
     Uint8 *keys;
-    int keypressed = 0, done = 0, eventstate = 0, reorder = 0;
+    int keypressed = 0,
+        done = 0,
+        eventstate = 0,
+        reorder = 0;
 
     menu_looprunning = 1;
 
@@ -445,9 +509,12 @@ int menu_loop () {
 /* create a list with all directory entrys, 
  * except we can't put everything in the list because the list is too smal.
  * Return: number of entrys, Pointers will be set*/
-int menu_create_dirlist (char *path, signed char dirflags, _charlist *cl, int maxentry) {
+int
+menu_create_dirlist (char *path, signed char dirflags, _charlist * cl, int maxentry)
+{
     int cnt;
-	_direntry *destart, *de;
+    _direntry *destart,
+     *de;
 
     destart = s_getdir (path);
     destart = s_dirfilter (destart, dirflags);
@@ -468,9 +535,11 @@ int menu_create_dirlist (char *path, signed char dirflags, _charlist *cl, int ma
  * returns the name of the file */
 static char menu_dir_name[LEN_PATHFILENAME];
 char *
-menu_dir_select (char *title, char *path, signed char dirflags) {
+menu_dir_select (char *title, char *path, signed char dirflags)
+{
     _charlist flist[MAX_DIRENTRYS];
-	int flcnt, menuselect;
+    int flcnt,
+      menuselect;
     _charlist *selfile = NULL;
 
     flcnt = menu_create_dirlist (path, dirflags, flist, MAX_DIRENTRYS);
@@ -490,24 +559,111 @@ menu_dir_select (char *title, char *path, signed char dirflags) {
 
 
 /* display a message on the screen and wait untill ESC is pressed */
-void menu_displaymessage (char *title, char *line1, char *line2, char *line3, char *line4) {
+void
-	menu_new (title, 500, 150);
+menu_displaymessage (char *title, char *fmt,...)
-	if (line1 != NULL) menu_create_label (line1, -1, 55, 0);
+{
-	if (line2 != NULL) menu_create_label (line2, -1, 75, 0);
+	va_list args;
-	if (line3 != NULL) menu_create_label (line3, -1, 95, 0);
+
-	if (line4 != NULL) menu_create_label (line4, -1, 115, 0);
+    int maxlinelen = 0,  // max y size for the window
+		i,
+	    linenr;
+	char out[MENU_MESSAGES_MAXLINES * (MENU_MESSAGES_MAXLINELEN + 1)];
+	char *lines[MENU_MESSAGES_MAXLINES+1]; // textlines for the screen
+	char text[512];
+	
+	/* read the whole text and convert it to a normal char text */
+	memset (text, 0, sizeof (text));
+	memset (out, 0, sizeof (out));
+	va_start (args, fmt);
+	vsprintf (text, fmt, args);
+	va_end (args);
+
+	menu_formattext (text, out, lines, &linenr, &maxlinelen); 
+
+	i = maxlinelen * font[0].size.x + 32;
+	if (i < (strlen (title) * font[2].size.x + 16))
+		i = strlen (title) * font[2].size.x + 16;
+    menu_new (title, i , linenr * font[0].size.y + 75);
+
+	for (i = 0; (i <= linenr && i < MENU_MESSAGES_MAXLINES); i++) 
+		menu_create_label (lines[i], -1, 55 + i * font[0].size.y, 0);
     menu_loop ();
     menu_delete ();
 };
 
+/* format display messages */
+void menu_formattext (char *input, char *out, char **start, int *lines, int *maxlinelen) {
+	int i, pos, outpos;
+	char *tmpchar1, *tmpchar2;
+	*maxlinelen = i = pos = outpos = *lines = 0; 
+	start[0] = out;
+
+	/* create all lines and do some word wrapping */
+	do {
+		if (input[i] == ' ') { // new word check if there is still space left for another word
+			/* check what will be found first #13 or space */
+			tmpchar1 = strchr (&input[i+1], ' ');
+			tmpchar2 = strchr (&input[i+1], '\n');
+			if (tmpchar2 != NULL && tmpchar2 < tmpchar1)
+				tmpchar1 = tmpchar2;
+			if (tmpchar1 == NULL)
+				tmpchar1 = input + strlen (input);
+			
+			if (tmpchar1 - (&input[i] - pos) >= MENU_MESSAGES_MAXLINELEN) { /* new line */
+				out[outpos++] = 0;
+				start[++(*lines)] = &out[outpos];
+				if (pos > *maxlinelen)
+					*maxlinelen = pos;
+				pos = 0;
+			}
+			else  /* add this to the line */
+				out[outpos++] = input[i];
+				pos++;
+		}
+		else if (input[i] == '\n') {
+				out[outpos++] = 0;
+				start[++(*lines)] = &out[outpos];
+				if (pos > *maxlinelen)
+					*maxlinelen = pos;
+				pos = 0;
+		}
+		else { /* copy the text */
+			out[outpos++] = input[i];
+			pos++;
+		}
+		i++;
+	} while (i < strlen (input) && i < MENU_MESSAGES_MAXLINES * (MENU_MESSAGES_MAXLINELEN + 1) && *lines < MENU_MESSAGES_MAXLINES);
+};
+
 
 /* display a text on the screen and return */
-void menu_displaytext (char *title, char *line1, char *line2, char *line3, char *line4) {
+void
-	menu_new (title, 500, 150);
+menu_displaytext (char *title, char *fmt,...)
-	if (line1 != NULL) menu_create_label (line1, -1, 55, 0);
+{
-	if (line2 != NULL) menu_create_label (line2, -1, 75, 0);
+	va_list args;
-	if (line3 != NULL) menu_create_label (line3, -1, 95, 0);
+
-	if (line4 != NULL) menu_create_label (line4, -1, 115, 0);
+    int maxlinelen = 0,  // max y size for the window
+		i,
+	    linenr;
+	char out[MENU_MESSAGES_MAXLINES * (MENU_MESSAGES_MAXLINELEN + 1)];
+	char *lines[MENU_MESSAGES_MAXLINES+1]; // textlines for the screen
+	char text[512];
+	
+	/* read the whole text and convert it to a normal char text */
+	memset (text, 0, sizeof (text));
+	memset (out, 0, sizeof (out));
+	va_start (args, fmt);
+	vsprintf (text, fmt, args);
+	va_end (args);
+
+	menu_formattext (text, out, lines, &linenr, &maxlinelen); 
+
+	i = maxlinelen * font[0].size.x + 32;
+	if (i < (strlen (title) * font[2].size.x + 16))
+		i = strlen (title) * font[2].size.x + 16;
+    menu_new (title, i , linenr * font[0].size.y + 75);
+	for (i = 0; (i <= linenr && i < MENU_MESSAGES_MAXLINES); i++) 
+		menu_create_label (lines[i], -1, 55 + i * font[0].size.y, 0);
     menu_looprunning = 1;
     menu_draw ();
     gfx_blitdraw ();

src/multiwait.c

@@ -29,7 +29,7 @@ mw_init ()
 
     draw_logo ();
 
-    menu_displaytext ("Please Wait", NULL, NULL, "Loading GFX Data", NULL);
+    menu_displaytext ("Please Wait", "Loading GFX Data");
 
     gfx_load_players (32, 32);
     network_loop ();
@@ -65,7 +65,7 @@ mw_shutdown ()
 void
 mw_wait_for_connect ()
 {
-    menu_displaytext ("Please Wait", NULL, NULL, "Wait For connection", NULL);
+    menu_displaytext ("Please Wait", "Wait For connection");
 };
 
 

src/netmenu.c

@@ -129,7 +129,7 @@ multiplayer_firstrun ()
  */
 void host_multiplayer_game () {
 	if (bman.firewall) {
-		menu_displaymessage("Error", NULL, "You can not start a network game", "with the firewall option on.", NULL);
+		menu_displaymessage("Error", "You can not start a network game\nwith the firewall option on.");
 		return;
 	}
 	multiplayer_firstrun ();

src/packets.c

@@ -61,12 +61,9 @@ send_error (_net_addr * addr, char *text)
 int
 do_error (struct pkg_error *data, _net_addr * addr)
 {
-	char text[255];
-	
     d_printf ("Network Error from %s:%s : '%s'\n", addr->host, addr->port, data->text);
 	
-	sprintf (text, "Got Error from: %s:%s",addr->host, addr->port);
+    menu_displaymessage ("Network Error", "Got Error from: %s:%s\nMessage:%s", addr->host, addr->port, data->text);
-    menu_displaymessage ("Network Error", NULL, text, data->text, NULL);
     if (data->nr == 1)
         return -1;
     else
@@ -347,7 +344,7 @@ do_servermode (struct pkg_servermode *s_mod, _net_addr * addr)
 
     /* the server changed */
     if (bman.p_servnr != s_mod->p_servnr) {
-		menu_displaymessage ("Server Quit", NULL, NULL, "The Server Quit the game.", NULL);
+		menu_displaymessage ("Server Quit", "The Server Quit the game.");
     }
 
     /* do the normal update */

src/single.c

@@ -1,4 +1,4 @@
-/* $Id: single.c,v 1.58 2004/02/05 22:59:06 stpohle Exp $ */
+/* $Id: single.c,v 1.59 2004/02/07 11:47:11 stpohle Exp $ */
 /* single player */
 
 #include "basic.h"
@@ -792,7 +792,7 @@ single_select_player ()
     Uint8 *keys;
     Uint32 timeloop1;
 
-    menu_displaytext ("Loading..", NULL, NULL, "Please Wait", NULL);
+    menu_displaytext ("Loading..", "Please Wait");
 
     dest.x = dest.y = 0;
     dest.w = gfx.res.x;