X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=1095dd52e18f3f1d9aacc563c53f9fcb0b7885ad;hp=741ce7fdf4ca1a5cc94bb07e43ccf871442fcaea;hb=65bfe5289ae5bcb4c1ea9bee97ebc619e1ecfc16;hpb=e3cd6c447d4d85960247a5ac2a639bf52fe65268

diff --git a/src/tools.c b/src/tools.c
index 741ce7fd..1095dd52 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -35,8 +35,11 @@
 #define TOOL_CTRL_ID_PLAYER_2	4
 #define TOOL_CTRL_ID_PLAYER_3	5
 #define TOOL_CTRL_ID_PLAYER_4	6
+#define TOOL_CTRL_ID_TOUCH_YES	7
+#define TOOL_CTRL_ID_TOUCH_NO	8
+#define TOOL_CTRL_ID_TOUCH_CONFIRM 9
 
-#define NUM_TOOL_BUTTONS	7
+#define NUM_TOOL_BUTTONS	10
 
 // constants for number of doors and door parts
 #define NUM_DOORS		2
@@ -3133,10 +3136,13 @@ static void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
     {
       MapGadget(tool_gadget[TOOL_CTRL_ID_YES]);
       MapGadget(tool_gadget[TOOL_CTRL_ID_NO]);
+      MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_YES]);
+      MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_NO]);
     }
     else if (req_state & REQ_CONFIRM)
     {
       MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]);
+      MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_CONFIRM]);
     }
     else if (req_state & REQ_PLAYER)
     {
@@ -4333,24 +4339,21 @@ static int RequestHandleEvents(unsigned int req_state)
 		button_status = MB_RELEASED;
 	    }
 
-	    if (HandleGlobalAnimClicks(mx, my, button_status, FALSE))
-	    {
-	      // do not handle this button event anymore
-	      continue;		// force mouse event not to be handled at all
-	    }
-
 	    // this sets 'request_gadget_id'
 	    HandleGadgets(mx, my, button_status);
 
 	    switch (request_gadget_id)
 	    {
 	      case TOOL_CTRL_ID_YES:
+	      case TOOL_CTRL_ID_TOUCH_YES:
 		result = TRUE;
 		break;
 	      case TOOL_CTRL_ID_NO:
+	      case TOOL_CTRL_ID_TOUCH_NO:
 		result = FALSE;
 		break;
 	      case TOOL_CTRL_ID_CONFIRM:
+	      case TOOL_CTRL_ID_TOUCH_CONFIRM:
 		result = TRUE | FALSE;
 		break;
 
@@ -4368,6 +4371,8 @@ static int RequestHandleEvents(unsigned int req_state)
 		break;
 
 	      default:
+		// only check clickable animations if no request gadget clicked
+		HandleGlobalAnimClicks(mx, my, button_status, FALSE);
 		break;
 	    }
 
@@ -4680,10 +4685,13 @@ static boolean RequestDoor(char *text, unsigned int req_state)
   {
     MapGadget(tool_gadget[TOOL_CTRL_ID_YES]);
     MapGadget(tool_gadget[TOOL_CTRL_ID_NO]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_YES]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_NO]);
   }
   else if (req_state & REQ_CONFIRM)
   {
     MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_CONFIRM]);
   }
   else if (req_state & REQ_PLAYER)
   {
@@ -5555,36 +5563,49 @@ static struct
   int graphic;
   struct TextPosInfo *pos;
   int gadget_id;
+  boolean is_touch_button;
   char *infotext;
 } toolbutton_info[NUM_TOOL_BUTTONS] =
 {
   {
     IMG_GFX_REQUEST_BUTTON_YES,		&request.button.yes,
-    TOOL_CTRL_ID_YES,			"yes"
+    TOOL_CTRL_ID_YES, FALSE,		"yes"
   },
   {
     IMG_GFX_REQUEST_BUTTON_NO,		&request.button.no,
-    TOOL_CTRL_ID_NO,			"no"
+    TOOL_CTRL_ID_NO, FALSE,		"no"
   },
   {
     IMG_GFX_REQUEST_BUTTON_CONFIRM,	&request.button.confirm,
-    TOOL_CTRL_ID_CONFIRM,		"confirm"
+    TOOL_CTRL_ID_CONFIRM, FALSE,	"confirm"
   },
   {
     IMG_GFX_REQUEST_BUTTON_PLAYER_1,	&request.button.player_1,
-    TOOL_CTRL_ID_PLAYER_1,		"player 1"
+    TOOL_CTRL_ID_PLAYER_1, FALSE,	"player 1"
   },
   {
     IMG_GFX_REQUEST_BUTTON_PLAYER_2,	&request.button.player_2,
-    TOOL_CTRL_ID_PLAYER_2,		"player 2"
+    TOOL_CTRL_ID_PLAYER_2, FALSE,	"player 2"
   },
   {
     IMG_GFX_REQUEST_BUTTON_PLAYER_3,	&request.button.player_3,
-    TOOL_CTRL_ID_PLAYER_3,		"player 3"
+    TOOL_CTRL_ID_PLAYER_3, FALSE,	"player 3"
   },
   {
     IMG_GFX_REQUEST_BUTTON_PLAYER_4,	&request.button.player_4,
-    TOOL_CTRL_ID_PLAYER_4,		"player 4"
+    TOOL_CTRL_ID_PLAYER_4, FALSE,	"player 4"
+  },
+  {
+    IMG_GFX_REQUEST_BUTTON_TOUCH_YES,	&request.button.touch_yes,
+    TOOL_CTRL_ID_TOUCH_YES, TRUE,	"yes"
+  },
+  {
+    IMG_GFX_REQUEST_BUTTON_TOUCH_NO,	&request.button.touch_no,
+    TOOL_CTRL_ID_TOUCH_NO, TRUE,	"no"
+  },
+  {
+    IMG_GFX_REQUEST_BUTTON_TOUCH_CONFIRM, &request.button.touch_confirm,
+    TOOL_CTRL_ID_TOUCH_CONFIRM, TRUE,	"confirm"
   }
 };
 
@@ -5601,8 +5622,9 @@ void CreateToolButtons(void)
     Bitmap *deco_bitmap = None;
     int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0;
     unsigned int event_mask = GD_EVENT_RELEASED;
-    int dx = DX;
-    int dy = DY;
+    boolean is_touch_button = toolbutton_info[i].is_touch_button;
+    int base_x = (is_touch_button ? 0 : DX);
+    int base_y = (is_touch_button ? 0 : DY);
     int gd_x = gfx->src_x;
     int gd_y = gfx->src_y;
     int gd_xp = gfx->src_x + gfx->pressed_xoffset;
@@ -5611,9 +5633,9 @@ void CreateToolButtons(void)
     int y = pos->y;
     int id = i;
 
-    if (global.use_envelope_request)
+    if (global.use_envelope_request && !is_touch_button)
     {
-      setRequestPosition(&dx, &dy, TRUE);
+      setRequestPosition(&base_x, &base_y, TRUE);
 
       // check if request buttons are outside of envelope and fix, if needed
       if (x < 0 || x + gfx->width  > request.width ||
@@ -5660,8 +5682,8 @@ void CreateToolButtons(void)
     gi = CreateGadget(GDI_CUSTOM_ID, id,
 		      GDI_IMAGE_ID, graphic,
 		      GDI_INFO_TEXT, toolbutton_info[i].infotext,
-		      GDI_X, dx + x,
-		      GDI_Y, dy + y,
+		      GDI_X, base_x + x,
+		      GDI_Y, base_y + y,
 		      GDI_WIDTH, gfx->width,
 		      GDI_HEIGHT, gfx->height,
 		      GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
@@ -5673,6 +5695,7 @@ void CreateToolButtons(void)
 		      GDI_DECORATION_SIZE, pos->size, pos->size,
 		      GDI_DECORATION_SHIFTING, 1, 1,
 		      GDI_DIRECT_DRAW, FALSE,
+		      GDI_OVERLAY_TOUCH_BUTTON, is_touch_button,
 		      GDI_EVENT_MASK, event_mask,
 		      GDI_CALLBACK_ACTION, HandleToolButtons,
 		      GDI_END);