X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=c1ad55de96dd55fb92d90688b256210209f314bd;hb=48542a06103232c408ce6250f5bc2d9add00f233;hp=109b1283b9cadc833b9d5bc21d37f71a8ceb85c7;hpb=efd80a08bd5de21956872a615f1d03f2dd90cee2;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 109b1283..c1ad55de 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -28,18 +28,18 @@
 
 /* for DrawSetupScreen(), HandleSetupScreen() */
 #define SETUP_SCREEN_POS_START		2
-#define SETUP_SCREEN_POS_END		16
+#define SETUP_SCREEN_POS_END		(SCR_FIELDY - 1)
 #define SETUP_SCREEN_POS_EMPTY1		(SETUP_SCREEN_POS_END - 2)
 #define SETUP_SCREEN_POS_EMPTY2		(SETUP_SCREEN_POS_END - 2)
 
 /* for HandleSetupInputScreen() */
 #define SETUPINPUT_SCREEN_POS_START	2
-#define SETUPINPUT_SCREEN_POS_END	15
+#define SETUPINPUT_SCREEN_POS_END	(SCR_FIELDY - 2)
 #define SETUPINPUT_SCREEN_POS_EMPTY1	(SETUPINPUT_SCREEN_POS_START + 3)
 #define SETUPINPUT_SCREEN_POS_EMPTY2	(SETUPINPUT_SCREEN_POS_END - 1)
 
 /* for HandleChooseLevel() */
-#define MAX_LEVEL_SERIES_ON_SCREEN	15
+#define MAX_LEVEL_SERIES_ON_SCREEN	(SCR_FIELDY - 2)
 
 #ifdef MSDOS
 extern unsigned char get_ascii(KeySym);
@@ -58,6 +58,8 @@ void DrawMainMenu()
   int i;
   char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
 
+  UnmapAllGadgets();
+  FadeSounds();
   XAutoRepeatOn(display);
 
   /* needed if last screen was the playing screen, invoked from level editor */
@@ -68,10 +70,12 @@ void DrawMainMenu()
     return;
   }
 
-  /* needed if last screen was the level editor */
-  UnmapLevelEditorGadgets();
+  /* needed if last screen was the editor screen */
+  UndrawSpecialEditorDoor();
+
+  /* map gadgets for main menu screen */
+  MapTapeButtons();
 
-  FadeSounds();
   GetPlayerConfig();
   LoadLevel(level_nr);
 
@@ -129,7 +133,10 @@ void DrawMainMenu()
 
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
 
+#if 0
   ClearEventQueue();
+#endif
+
 }
 
 void HandleMainMenu(int mx, int my, int dx, int dy, int button)
@@ -675,6 +682,7 @@ void DrawHelpScreen()
 {
   int i;
 
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
   for(i=0;i<MAX_HELPSCREEN_ELS;i++)
@@ -755,7 +763,7 @@ void HandleTypeName(int newxpos, KeySym key)
   }
 
   if (((key >= XK_A && key <= XK_Z) || (key >= XK_a && key <= XK_z)) && 
-      xpos < MAX_NAMELEN - 1)
+      xpos < MAX_PLAYER_NAME_LEN)
   {
     char ascii;
 
@@ -794,6 +802,7 @@ void HandleTypeName(int newxpos, KeySym key)
 
 void DrawChooseLevel()
 {
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
   FadeToFront();
@@ -811,9 +820,10 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
 
   for(i=0; i<num_page_entries; i++)
   {
-    strncpy(buffer, leveldir[first_entry + i].name , SCR_FIELDX - 1);
+    strncpy(buffer, leveldir[first_entry + i].name_short , SCR_FIELDX - 1);
     buffer[SCR_FIELDX - 1] = '\0';
-    DrawText(SX + 32, SY + (i + 2) * 32, buffer, FS_BIG, FC_YELLOW);
+    DrawText(SX + 32, SY + (i + 2) * 32, buffer,
+	     FS_BIG, leveldir[first_entry + i].color);
     DrawGraphic(0, i + 2, GFX_KUGEL_BLAU);
   }
 
@@ -826,16 +836,23 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
 
 static void drawChooseLevelInfo(int leveldir_nr)
 {
+  int x, last_redraw_mask = redraw_mask;
+
   XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 32, 32);
   DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
 		    leveldir[leveldir_nr].levels,
 		    leveldir[leveldir_nr].readonly ? "readonly" : "writable");
+
+  /* let BackToFront() redraw only what is needed */
+  redraw_mask = last_redraw_mask | REDRAW_TILES;
+  for (x=0; x<SCR_FIELDX; x++)
+    MarkTileDirty(x, 1);
 }
 
 void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 {
   static int choice = 3;
-  static int first_entry = 0;
+  static int first_entry = -1;
   static unsigned long choose_delay = 0;
   static int redraw = TRUE;
   int x = (mx + 32 - SX) / 32, y = (my + 32 - SY) / 32;
@@ -849,17 +866,15 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
   if (button == MB_MENU_INITIALIZE)
   {
-    redraw = TRUE;
-    choice = leveldir_nr + 3 - first_entry;
-
-    if (choice > num_page_entries + 2)
+    if (first_entry == -1)
     {
-      choice = num_page_entries + 2;
-      first_entry = num_leveldirs - num_page_entries;
+      first_entry = leveldir_nr - num_page_entries + 1;
+      choice = leveldir_nr - first_entry + 3;
     }
 
     drawChooseLevelList(first_entry, num_page_entries);
     drawChooseLevelInfo(leveldir_nr);
+    redraw = TRUE;
   }
 
   if (redraw)
@@ -879,7 +894,15 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
       y = choice + dy;
     }
     else
-      x = y = 0;
+      x = y = 0;	/* no action */
+
+    if (ABS(dy) == SCR_FIELDY)	/* handle XK_Page_Up, XK_Page_Down */
+    {
+      dy = SIGN(dy);
+      step = num_page_entries - 1;
+      x = 1;
+      y = (dy < 0 ? 2 : num_page_entries + 3);
+    }
   }
 
   if (x == 1 && y == 2)
@@ -887,13 +910,10 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
     if (first_entry > 0 &&
 	(dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
     {
-#if 0
-      first_entry--;
-#else
       first_entry -= step;
       if (first_entry < 0)
 	first_entry = 0;
-#endif
+
       drawChooseLevelList(first_entry, num_page_entries);
       drawChooseLevelInfo(first_entry);
       DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
@@ -905,13 +925,10 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
     if (first_entry + num_page_entries < num_leveldirs &&
 	(dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
     {
-#if 0
-      first_entry++;
-#else
       first_entry += step;
       if (first_entry + num_page_entries > num_leveldirs)
 	first_entry = num_leveldirs - num_page_entries;
-#endif
+
       drawChooseLevelList(first_entry, num_page_entries);
       drawChooseLevelInfo(first_entry + num_page_entries - 1);
       DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
@@ -962,6 +979,7 @@ void DrawHallOfFame(int highlight_position)
 {
   int i;
 
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
   if (highlight_position < 0) 
@@ -1029,9 +1047,11 @@ void DrawSetupScreen()
     { NULL,			"Save and exit"	}
   };
 
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
   ClearWindow();
-  DrawText(SX+16, SY+16, "SETUP",FS_BIG,FC_YELLOW);
+
+  DrawText(SX + 16, SY + 16, "SETUP",FS_BIG,FC_YELLOW);
 
   for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++)
   {
@@ -1914,186 +1934,6 @@ void CalibrateJoystick(int player_nr)
   DrawSetupInputScreen();
 }
 
-
-
-#if 0
-
-void CalibrateJoystick_OLD()
-{
-#ifdef __FreeBSD__
-  struct joystick joy_ctrl;
-#else
-  struct joystick_control
-  {
-    int buttons;
-    int x;
-    int y;
-  } joy_ctrl;
-#endif
-
-#ifdef MSDOS
-  char joy_nr[4];
-#endif
-
-  int joystick_nr = setup.input[0].joystick_nr;
-  int new_joystick_xleft, new_joystick_xright, new_joystick_xmiddle;
-  int new_joystick_yupper, new_joystick_ylower, new_joystick_ymiddle;
-
-  if (joystick_status == JOYSTICK_OFF)
-    goto error_out;
-
-#ifndef MSDOS
-  ClearWindow();
-  DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+8*32, " THE UPPER LEFT ",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+9*32, "AND PRESS BUTTON",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-#ifdef __FreeBSD__
-  joy_ctrl.b1 = joy_ctrl.b2 = 0;
-#else
-  joy_ctrl.buttons = 0;
-#endif
-  while(Joystick() & JOY_BUTTON);
-#ifdef __FreeBSD__
-  while(!(joy_ctrl.b1 || joy_ctrl.b2))
-#else
-  while(!joy_ctrl.buttons)
-#endif
-  {
-    if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
-    {
-      joystick_status=JOYSTICK_OFF;
-      goto error_out;
-    }
-    Delay(10);
-  }
-
-  new_joystick_xleft = joy_ctrl.x;
-  new_joystick_yupper = joy_ctrl.y;
-
-  ClearWindow();
-  DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
-  DrawText(SX+32, SY+8*32, "THE LOWER RIGHT",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+9*32, "AND PRESS BUTTON",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-#ifdef __FreeBSD__
-  joy_ctrl.b1 = joy_ctrl.b2 = 0;
-#else
-  joy_ctrl.buttons = 0;
-#endif
-  while(Joystick() & JOY_BUTTON);
-#ifdef __FreeBSD__
-  while(!(joy_ctrl.b1 || joy_ctrl.b2))
-#else
-  while(!joy_ctrl.buttons)
-#endif
-  {
-    if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
-    {
-      joystick_status=JOYSTICK_OFF;
-      goto error_out;
-    }
-    Delay(10);
-  }
-
-  new_joystick_xright = joy_ctrl.x;
-  new_joystick_ylower = joy_ctrl.y;
-
-  ClearWindow();
-  DrawText(SX+32, SY+16+7*32, "CENTER JOYSTICK",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+16+8*32, "AND PRESS BUTTON",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-#ifdef __FreeBSD__
-  joy_ctrl.b1 = joy_ctrl.b2 = 0;
-#else
-  joy_ctrl.buttons = 0;
-#endif
-  while(Joystick() & JOY_BUTTON);
-#ifdef __FreeBSD__
-  while(!(joy_ctrl.b1 || joy_ctrl.b2))
-#else
-  while(!joy_ctrl.buttons)
-#endif
-  {
-    if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
-    {
-      joystick_status=JOYSTICK_OFF;
-      goto error_out;
-    }
-    Delay(10);
-  }
-
-  new_joystick_xmiddle = joy_ctrl.x;
-  new_joystick_ymiddle = joy_ctrl.y;
-
-  setup.input[player_nr].joy.xleft = new_joystick_xleft;
-  setup.input[player_nr].joy.yupper = new_joystick_yupper;
-  setup.input[player_nr].joy.xright = new_joystick_xright;
-  setup.input[player_nr].joy.ylower = new_joystick_ylower;
-  setup.input[player_nr].joy.xmiddle = new_joystick_xmiddle;
-  setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle;
-
-  CheckJoystickData();
-
-  DrawSetupScreen();
-  while(Joystick() & JOY_BUTTON);
-  return;
-
-#endif
-  error_out:
-
-#ifdef MSDOS
-  joy_nr[0] = '#';
-  joy_nr[1] = SETUP_2ND_JOYSTICK_ON(local_player->setup)+49;
-  joy_nr[2] = '\0';
-
-  remove_joystick();
-  ClearWindow();
-  DrawText(SX+32, SY+7*32, "CENTER JOYSTICK",FS_BIG,FC_YELLOW);
-  DrawText(SX+16+7*32, SY+8*32, joy_nr, FS_BIG,FC_YELLOW);
-  DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-  for(clear_keybuf();!keypressed(););
-  install_joystick(JOY_TYPE_2PADS);
-
-  ClearWindow();
-  DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+8*32, " THE UPPER LEFT ",FS_BIG,FC_YELLOW);
-  DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-  for(clear_keybuf();!keypressed(););
-  calibrate_joystick(SETUP_2ND_JOYSTICK_ON(local_player->setup));
-
-  ClearWindow();
-  DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
-  DrawText(SX+32, SY+8*32, "THE LOWER RIGHT",FS_BIG,FC_YELLOW);
-  DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-  for(clear_keybuf();!keypressed(););
-  calibrate_joystick(SETUP_2ND_JOYSTICK_ON(local_player->setup));
-
-  DrawSetupScreen();
-  return;
-#endif
-
-  ClearWindow();
-  DrawText(SX+16, SY+16, "NO JOYSTICK",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+48, " AVAILABLE ",FS_BIG,FC_YELLOW);
-  BackToFront();
-  Delay(3000);
-  DrawSetupScreen();
-}
-
-#endif
-
-
-
 void HandleGameActions()
 {
   if (game_status != PLAYING)
@@ -2109,237 +1949,3 @@ void HandleGameActions()
 
   BackToFront();
 }
-
-void HandleVideoButtons(int mx, int my, int button)
-{
-  if (game_status != MAINMENU && game_status != PLAYING)
-    return;
-
-  switch(CheckVideoButtons(mx,my,button))
-  {
-    case BUTTON_VIDEO_EJECT:
-      TapeStop();
-      if (TAPE_IS_EMPTY(tape))
-      {
-	LoadTape(level_nr);
-	if (TAPE_IS_EMPTY(tape))
-	  Request("No tape for this level !",REQ_CONFIRM);
-      }
-      else
-      {
-	if (tape.changed)
-	  SaveTape(tape.level_nr);
-	TapeErase();
-      }
-      DrawCompleteVideoDisplay();
-      break;
-
-    case BUTTON_VIDEO_STOP:
-      TapeStop();
-      break;
-
-    case BUTTON_VIDEO_PAUSE:
-      TapeTogglePause();
-      break;
-
-    case BUTTON_VIDEO_REC:
-      if (TAPE_IS_STOPPED(tape))
-      {
-	TapeStartRecording();
-
-#ifndef MSDOS
-	if (options.network)
-	  SendToServer_StartPlaying();
-	else
-#endif
-	{
-	  game_status = PLAYING;
-	  InitGame();
-	}
-      }
-      else if (tape.pausing)
-      {
-	if (tape.playing)	/* PLAYING -> PAUSING -> RECORDING */
-	{
-	  tape.pos[tape.counter].delay = tape.delay_played;
-	  tape.playing = FALSE;
-	  tape.recording = TRUE;
-	  tape.changed = TRUE;
-
-	  DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON,0);
-	}
-	else
-	  TapeTogglePause();
-      }
-      break;
-
-    case BUTTON_VIDEO_PLAY:
-      if (TAPE_IS_EMPTY(tape))
-	break;
-
-      if (TAPE_IS_STOPPED(tape))
-      {
-	TapeStartPlaying();
-
-	game_status = PLAYING;
-	InitGame();
-      }
-      else if (tape.playing)
-      {
-	if (tape.pausing)			/* PAUSE -> PLAY */
-	  TapeTogglePause();
-	else if (!tape.fast_forward)		/* PLAY -> FAST FORWARD PLAY */
-	{
-	  tape.fast_forward = TRUE;
-	  DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
-	}
-	else if (!tape.pause_before_death)	/* FFWD PLAY -> + AUTO PAUSE */
-	{
-	  tape.pause_before_death = TRUE;
-	  DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
-	}
-	else					/* -> NORMAL PLAY */
-	{
-	  tape.fast_forward = FALSE;
-	  tape.pause_before_death = FALSE;
-	  DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_OFF, 0);
-	}
-      }
-      break;
-
-    default:
-      break;
-  }
-
-  BackToFront();
-}
-
-void HandleSoundButtons(int mx, int my, int button)
-{
-  if (game_status != PLAYING)
-    return;
-
-  switch(CheckSoundButtons(mx,my,button))
-  {
-    case BUTTON_SOUND_MUSIC:
-      if (setup.sound_music)
-      { 
-	setup.sound_music = FALSE;
-	FadeSound(background_loop[level_nr % num_bg_loops]);
-	DrawSoundDisplay(BUTTON_SOUND_MUSIC_OFF);
-      }
-      else if (sound_loops_allowed)
-      { 
-	setup.sound = setup.sound_music = TRUE;
-	PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
-	DrawSoundDisplay(BUTTON_SOUND_MUSIC_ON);
-      }
-      else
-	DrawSoundDisplay(BUTTON_SOUND_MUSIC_OFF);
-      break;
-
-    case BUTTON_SOUND_LOOPS:
-      if (setup.sound_loops)
-      { 
-	setup.sound_loops = FALSE;
-	DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF);
-      }
-      else if (sound_loops_allowed)
-      { 
-	setup.sound = setup.sound_loops = TRUE;
-	DrawSoundDisplay(BUTTON_SOUND_LOOPS_ON);
-      }
-      else
-	DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF);
-      break;
-
-    case BUTTON_SOUND_SIMPLE:
-      if (setup.sound_simple)
-      { 
-	setup.sound_simple = FALSE;
-	DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF);
-      }
-      else if (sound_status==SOUND_AVAILABLE)
-      { 
-	setup.sound = setup.sound_simple = TRUE;
-	DrawSoundDisplay(BUTTON_SOUND_SIMPLE_ON);
-      }
-      else
-	DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF);
-      break;
-
-    default:
-      break;
-  }
-
-  BackToFront();
-}
-
-void HandleGameButtons(int mx, int my, int button)
-{
-  if (game_status != PLAYING)
-    return;
-
-  switch(CheckGameButtons(mx,my,button))
-  {
-    case BUTTON_GAME_STOP:
-      if (AllPlayersGone)
-      {
-	CloseDoor(DOOR_CLOSE_1);
-	game_status = MAINMENU;
-	DrawMainMenu();
-	break;
-      }
-
-      if (Request("Do you really want to quit the game ?",
-		  REQ_ASK | REQ_STAY_CLOSED))
-      { 
-#ifndef MSDOS
-	if (options.network)
-	  SendToServer_StopPlaying();
-	else
-#endif
-	{
-	  game_status = MAINMENU;
-	  DrawMainMenu();
-	}
-      }
-      else
-	OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
-      break;
-
-    case BUTTON_GAME_PAUSE:
-      if (options.network)
-      {
-#ifndef MSDOS
-	if (tape.pausing)
-	  SendToServer_ContinuePlaying();
-	else
-	  SendToServer_PausePlaying();
-#endif
-      }
-      else
-	TapeTogglePause();
-      break;
-
-    case BUTTON_GAME_PLAY:
-      if (tape.pausing)
-      {
-#ifndef MSDOS
-	if (options.network)
-	  SendToServer_ContinuePlaying();
-	else
-#endif
-	{
-	  tape.pausing = FALSE;
-	  DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
-	}
-      }
-      break;
-
-    default:
-      break;
-  }
-
-  BackToFront();
-}