X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.c;h=88ff994e07ae633a0ff980c11607358bfed95d06;hb=228a5718ede5ee00512ed2e333b3cee47baa124c;hp=9f9a78df6e4cc7f7dd440b0f8783947286bf34c0;hpb=36357e8399d0a42ac45a1cd096aee24a9008b5f5;p=rocksndiamonds.git diff --git a/src/buttons.c b/src/buttons.c index 9f9a78df..88ff994e 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -1280,7 +1280,7 @@ void HandleGadgets(int mx, int my, int button) } } -void HandleGadgetsKeyInput(KeySym key) +void HandleGadgetsKeyInput(Key key) { struct GadgetInfo *gi = last_gi; char text[MAX_GADGET_TEXTSIZE]; @@ -1294,7 +1294,7 @@ void HandleGadgetsKeyInput(KeySym key) text_length = strlen(gi->text.value); cursor_pos = gi->text.cursor_position; - letter = getCharFromKeySym(key); + letter = getCharFromKey(key); legal_letter = (gi->type == GD_TYPE_TEXTINPUT_NUMERIC ? letter >= '0' && letter <= '9' : letter != 0); @@ -1307,30 +1307,30 @@ void HandleGadgetsKeyInput(KeySym key) gi->text.cursor_position++; DrawGadget(gi, DG_PRESSED, DG_DIRECT); } - else if (key == XK_Left && cursor_pos > 0) + else if (key == KSYM_Left && cursor_pos > 0) { gi->text.cursor_position--; DrawGadget(gi, DG_PRESSED, DG_DIRECT); } - else if (key == XK_Right && cursor_pos < text_length) + else if (key == KSYM_Right && cursor_pos < text_length) { gi->text.cursor_position++; DrawGadget(gi, DG_PRESSED, DG_DIRECT); } - else if (key == XK_BackSpace && cursor_pos > 0) + else if (key == KSYM_BackSpace && cursor_pos > 0) { strcpy(text, gi->text.value); strcpy(&gi->text.value[cursor_pos - 1], &text[cursor_pos]); gi->text.cursor_position--; DrawGadget(gi, DG_PRESSED, DG_DIRECT); } - else if (key == XK_Delete && cursor_pos < text_length) + else if (key == KSYM_Delete && cursor_pos < text_length) { strcpy(text, gi->text.value); strcpy(&gi->text.value[cursor_pos], &text[cursor_pos + 1]); DrawGadget(gi, DG_PRESSED, DG_DIRECT); } - else if (key == XK_Return) + else if (key == KSYM_Return) { CheckRangeOfNumericInputGadget(gi); DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);