Project

General

Profile

Download (24 KB)

Feature #899 » 0034-sdl3-Update-key-names.patch

S3_2 - Marko Lindqvist, 09/21/2024 08:18 AM

View differences:

client/gui-sdl3/citydlg.c
if (owner == client.conn.playing) {
set_wstate(buf, FC_WS_NORMAL);
}
buf->key = SDLK_c;
buf->key = SDLK_C;
add_to_gui_list(ID_CITY_DLG_CHANGE_PROD_BUTTON, buf);
/* -------- */
......
buf->size.x = area.x + adj_size(7) + (buf->size.w + adj_size(2));
buf->size.y = area.y + area.h - buf->size.h - adj_size(5);
pcity_dlg->buy_button = buf;
buf->key = SDLK_h;
buf->key = SDLK_H;
if (city_can_buy(pcity)) {
set_wstate(buf, FC_WS_NORMAL);
}
......
buf->info_label = create_utf8_from_char_fonto(_("Citizen Governor"),
FONTO_ATTENTION);
buf->action = cma_city_dlg_callback;
buf->key = SDLK_a;
buf->key = SDLK_A;
buf->size.x = area.x + adj_size(7) + (buf->size.w + adj_size(2)) * 2;
buf->size.y = area.y + area.h - buf->size.h - adj_size(5);
if (owner == client.conn.playing) {
client/gui-sdl3/diplodlg.c
buf->string_utf8->fgcol
= *get_theme_color(COLOR_THEME_DIPLODLG_MEETING_TEXT);
buf->data.player = pplayer;
buf->key = SDLK_c;
buf->key = SDLK_C;
add_to_gui_list(ID_BUTTON, buf);
buf->size.w = MAX(buf->next->size.w, buf->size.w);
buf->next->size.w = buf->size.w;
......
buf->action = withdraw_vision_dlg_callback;
set_wstate(buf, FC_WS_NORMAL);
buf->data.player = pplayer;
buf->key = SDLK_w;
buf->key = SDLK_W;
buf->string_utf8->fgcol
= *get_theme_color(COLOR_THEME_DIPLODLG_MEETING_TEXT);
add_to_gui_list(ID_BUTTON, buf);
......
buf->action = call_meeting_dlg_callback;
set_wstate(buf, FC_WS_NORMAL);
buf->data.player = pplayer;
buf->key = SDLK_m;
buf->key = SDLK_M;
buf->string_utf8->fgcol = *get_theme_color(COLOR_THEME_DIPLODLG_MEETING_TEXT);
add_to_gui_list(ID_BUTTON, buf);
buf->size.w = MAX(buf->next->size.w, buf->size.w);
client/gui-sdl3/mapctrl.c
fc_snprintf(buf, sizeof(buf), "%s (%s)", _("Revolution"), "Ctrl+Shift+G");
pwidget->info_label = create_utf8_from_char_fonto(buf, FONTO_ATTENTION);
pwidget->action = revolution_callback;
pwidget->key = SDLK_g;
pwidget->key = SDLK_G;
pwidget->mod = SDL_KMOD_CTRL | SDL_KMOD_SHIFT;
add_to_gui_list(ID_REVOLUTION, pwidget);
......
pwidget->info_label = create_utf8_from_char_fonto(buf, FONTO_ATTENTION);
pwidget->info_label->style |= SF_CENTER;
pwidget->action = cities_action_callback;
pwidget->key = SDLK_f;
pwidget->key = SDLK_F;
pwidget->mod = SDL_KMOD_CTRL;
add_to_gui_list(ID_CITIES, pwidget);
......
movedir = DIR8_NORTHWEST;
break;
/* *** map view settings *** */
/* *** Map view settings *** */
/* show city outlines - Ctrl+y */
case SDLK_y:
/* Show city outlines - Ctrl+y */
case SDLK_Y:
if (LCTRL || RCTRL) {
key_city_outlines_toggle();
}
return FALSE;
/* Show map grid - Ctrl+g */
case SDLK_g:
case SDLK_G:
if (LCTRL || RCTRL) {
key_map_grid_toggle();
}
return FALSE;
/* show national borders - Ctrl+b */
case SDLK_b:
/* Show national borders - Ctrl+b */
case SDLK_B:
if (LCTRL || RCTRL) {
key_map_borders_toggle();
}
return FALSE;
case SDLK_n:
/* show native tiles - Ctrl+Shift+n */
case SDLK_N:
/* Show native tiles - Ctrl+Shift+n */
if ((LCTRL || RCTRL) && (LSHIFT || RSHIFT)) {
key_map_native_toggle();
} else if (LCTRL || RCTRL) {
......
}
return FALSE;
/* show city growth Ctrl+o */
/* show pollution - Ctrl+Shift+o */
case SDLK_o:
/* Show city growth Ctrl+o */
/* Show pollution - Ctrl+Shift+o */
case SDLK_O:
if (LCTRL || RCTRL) {
if (LSHIFT || RSHIFT) {
key_pollution_toggle();
......
}
return FALSE;
/* show bases - Ctrl+Shift+f */
case SDLK_f:
/* Show bases - Ctrl+Shift+f */
case SDLK_F:
if ((LCTRL || RCTRL) && (LSHIFT || RSHIFT)) {
request_toggle_bases();
}
return FALSE;
/* show city productions - Ctrl+p */
case SDLK_p:
/* Show city productions - Ctrl+p */
case SDLK_P:
if (LCTRL || RCTRL) {
key_city_productions_toggle();
}
return FALSE;
/* show city trade routes - Ctrl+d */
case SDLK_d:
/* Show city trade routes - Ctrl+d */
case SDLK_D:
if (LCTRL || RCTRL) {
key_city_trade_routes_toggle();
}
return FALSE;
/* *** some additional shortcuts that work in the SDL client only *** */
/* *** Some additional shortcuts that work in the SDL client only *** */
/* show terrain - Ctrl+Shift+t */
case SDLK_t:
/* Show terrain - Ctrl+Shift+t */
case SDLK_T:
if ((LCTRL || RCTRL) && (LSHIFT || RSHIFT)) {
key_terrain_toggle();
}
return FALSE;
/* (show coastline) */
/* (Show coastline) */
/* (show roads and rails) */
/* (Show roads and rails) */
/* show irrigation - Ctrl+i */
case SDLK_i:
/* Show irrigation - Ctrl+i */
case SDLK_I:
if (LCTRL || RCTRL) {
key_irrigation_toggle();
}
return FALSE;
/* show mines - Ctrl+m */
case SDLK_m:
/* Show mines - Ctrl+m */
case SDLK_M:
if (LCTRL || RCTRL) {
key_mines_toggle();
}
return FALSE;
/* show resources - Ctrl+s */
case SDLK_s:
/* Show resources - Ctrl+s */
case SDLK_S:
if (LCTRL || RCTRL) {
key_resources_toggle();
}
return FALSE;
/* show huts - Ctrl+h */
case SDLK_h:
/* Show huts - Ctrl+h */
case SDLK_H:
if (LCTRL || RCTRL) {
key_huts_toggle();
}
return FALSE;
/* show cities - Ctrl+c */
case SDLK_c:
/* Show cities - Ctrl+c */
case SDLK_C:
if (LCTRL || RCTRL) {
request_toggle_cities();
} else {
......
}
return FALSE;
/* show units - Ctrl+u */
case SDLK_u:
/* Show units - Ctrl+u */
case SDLK_U:
if (LCTRL || RCTRL) {
key_units_toggle();
}
return FALSE;
/* (show focus unit) */
/* (Show focus unit) */
/* Show city output - Ctrl+v */
case SDLK_v:
case SDLK_V:
key_city_output_toggle();
return FALSE;
/* Show fog of war - Ctrl+w */
case SDLK_w:
case SDLK_W:
if (LCTRL || RCTRL) {
key_fog_of_war_toggle();
}
client/gui-sdl3/menu.c
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_w;
buf->key = SDLK_W;
add_to_gui_list(ID_UNIT_ORDER_WAIT, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_n;
buf->key = SDLK_N;
buf->mod = SDL_KMOD_SHIFT;
add_to_gui_list(ID_UNIT_ORDER_NUKE, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_d;
buf->key = SDLK_D;
add_to_gui_list(ID_UNIT_ORDER_DIPLOMAT_DLG, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_d;
buf->key = SDLK_D;
buf->mod = SDL_KMOD_SHIFT;
add_to_gui_list(ID_UNIT_ORDER_DISBAND, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_u;
buf->key = SDLK_U;
buf->mod = SDL_KMOD_SHIFT;
add_to_gui_list(ID_UNIT_ORDER_UPGRADE, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_o;
buf->key = SDLK_O;
buf->mod = SDL_KMOD_SHIFT;
add_to_gui_list(ID_UNIT_ORDER_CONVERT, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_g;
buf->key = SDLK_G;
buf->mod = SDL_KMOD_SHIFT;
add_to_gui_list(ID_UNIT_ORDER_RETURN, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_t;
buf->key = SDLK_T;
add_to_gui_list(ID_UNIT_ORDER_GOTO_CITY, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_t;
buf->key = SDLK_T;
add_to_gui_list(ID_UNIT_ORDER_AIRLIFT, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_g;
buf->key = SDLK_G;
add_to_gui_list(ID_UNIT_ORDER_GOTO, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_q;
buf->key = SDLK_Q;
add_to_gui_list(ID_UNIT_ORDER_PATROL, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_i;
buf->key = SDLK_I;
buf->mod = SDL_KMOD_CTRL;
add_to_gui_list(ID_UNIT_ORDER_CONNECT_IRRIGATE, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_r;
buf->key = SDLK_R;
buf->mod = SDL_KMOD_CTRL;
add_to_gui_list(ID_UNIT_ORDER_CONNECT_ROAD, buf);
}
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_l;
buf->key = SDLK_L;
buf->mod = SDL_KMOD_CTRL;
add_to_gui_list(ID_UNIT_ORDER_CONNECT_RAILROAD, buf);
}
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_x;
buf->key = SDLK_X;
add_to_gui_list(ID_UNIT_ORDER_AUTO_EXPLORE, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_a;
buf->key = SDLK_A;
add_to_gui_list(ID_UNIT_ORDER_AUTO_SETTLER, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_s;
buf->key = SDLK_S;
buf->mod = SDL_KMOD_SHIFT;
add_to_gui_list(ID_UNIT_ORDER_WAKEUP_OTHERS, buf);
/* --------- */
......
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->mod = SDL_KMOD_SHIFT;
buf->key = SDLK_t;
buf->key = SDLK_T;
add_to_gui_list(ID_UNIT_ORDER_UNLOAD_TRANSPORTER, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_l;
buf->key = SDLK_L;
add_to_gui_list(ID_UNIT_ORDER_BOARD, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_u;
buf->key = SDLK_U;
add_to_gui_list(ID_UNIT_ORDER_DEBOARD, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_h;
buf->key = SDLK_H;
add_to_gui_list(ID_UNIT_ORDER_HOMECITY, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_p;
buf->key = SDLK_P;
buf->mod = SDL_KMOD_SHIFT;
add_to_gui_list(ID_UNIT_ORDER_PILLAGE, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_s;
buf->key = SDLK_S;
add_to_gui_list(ID_UNIT_ORDER_SENTRY, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_j;
buf->key = SDLK_J;
add_to_gui_list(ID_UNIT_ORDER_PARADROP, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_p;
buf->key = SDLK_P;
order_clean_button = buf;
add_to_gui_list(ID_UNIT_ORDER_CLEAN, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_e;
buf->key = SDLK_E;
buf->mod = SDL_KMOD_SHIFT;
order_airbase_button = buf;
add_to_gui_list(ID_UNIT_ORDER_AIRBASE, buf);
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_f;
buf->key = SDLK_F;
add_to_gui_list(ID_UNIT_ORDER_FORTIFY, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_f;
buf->key = SDLK_F;
buf->mod = SDL_KMOD_SHIFT;
order_fortress_button = buf;
add_to_gui_list(ID_UNIT_ORDER_FORTRESS, buf);
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_o;
buf->key = SDLK_O;
order_transform_button = buf;
add_to_gui_list(ID_UNIT_ORDER_TRANSFORM, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_m;
buf->key = SDLK_M;
add_to_gui_list(ID_UNIT_ORDER_MINE, buf);
order_mine_button = buf;
......
| WF_WIDGET_HAS_INFO_LABEL);
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->key = SDLK_i;
buf->key = SDLK_I;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
add_to_gui_list(ID_UNIT_ORDER_IRRIGATE, buf);
......
| WF_WIDGET_HAS_INFO_LABEL);
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->key = SDLK_i;
buf->key = SDLK_I;
buf->mod = SDL_KMOD_SHIFT;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
add_to_gui_list(ID_UNIT_ORDER_CULTIVATE, buf);
......
| WF_WIDGET_HAS_INFO_LABEL);
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->key = SDLK_m;
buf->key = SDLK_M;
buf->mod = SDL_KMOD_SHIFT;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
add_to_gui_list(ID_UNIT_ORDER_PLANT, buf);
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_r;
buf->key = SDLK_R;
add_to_gui_list(ID_UNIT_ORDER_TRADE_ROUTE, buf);
order_trade_button = buf;
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_r;
buf->key = SDLK_R;
add_to_gui_list(ID_UNIT_ORDER_ROAD, buf);
order_road_button = buf;
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_b;
buf->key = SDLK_B;
add_to_gui_list(ID_UNIT_ORDER_BUILD_WONDER, buf);
/* --------- */
......
set_wstate(buf, FC_WS_NORMAL);
buf->action = unit_order_callback;
buf->info_label = create_utf8_from_char_fonto(cbuf, FONTO_DEFAULT);
buf->key = SDLK_b;
buf->key = SDLK_B;
add_to_gui_list(ID_UNIT_ORDER_BUILD_CITY, buf);
order_build_add_to_city_button = buf;
client/gui-sdl3/optiondlg.c
_("Help Browser"),
FONTO_ATTENTION, 0);
widget->action = help_browser_callback;
widget->key = SDLK_h;
widget->key = SDLK_H;
if (client.conn.established) {
set_wstate(widget, FC_WS_NORMAL);
}
......
_("Leave Game"),
FONTO_ATTENTION, 0);
widget->action = disconnect_callback;
widget->key = SDLK_q;
widget->key = SDLK_Q;
if (client.conn.established) {
set_wstate(widget, FC_WS_NORMAL);
}
......
_("Quit"),
FONTO_ATTENTION, 0);
widget->action = exit_callback;
widget->key = SDLK_q;
widget->key = SDLK_Q;
set_wstate(widget, FC_WS_NORMAL);
widget_resize(widget, widget->size.w, widget->size.h + adj_size(4));
add_to_gui_list(ID_OPTIONS_EXIT_BUTTON, widget);
client/gui-sdl3/plrdlg.c
(sdl3_client_flags & CF_DRAW_PLAYERS_NEUTRAL_STATUS),
WF_RESTORE_BACKGROUND);
buf->action = toggle_draw_neutral_status_callback;
buf->key = SDLK_n;
buf->key = SDLK_N;
break;
case DS_WAR:
buf = create_checkbox(pwindow->dst,
(sdl3_client_flags & CF_DRAW_PLAYERS_WAR_STATUS),
WF_RESTORE_BACKGROUND);
buf->action = toggle_draw_war_status_callback;
buf->key = SDLK_w;
buf->key = SDLK_W;
break;
case DS_CEASEFIRE:
buf = create_checkbox(pwindow->dst,
(sdl3_client_flags & CF_DRAW_PLAYERS_CEASEFIRE_STATUS),
WF_RESTORE_BACKGROUND);
buf->action = toggle_draw_ceasefire_status_callback;
buf->key = SDLK_c;
buf->key = SDLK_C;
break;
case DS_PEACE:
buf = create_checkbox(pwindow->dst,
(sdl3_client_flags & CF_DRAW_PLAYERS_PEACE_STATUS),
WF_RESTORE_BACKGROUND);
buf->action = toggle_draw_peace_status_callback;
buf->key = SDLK_p;
buf->key = SDLK_P;
break;
case DS_ALLIANCE:
buf = create_checkbox(pwindow->dst,
(sdl3_client_flags & CF_DRAW_PLAYERS_ALLIANCE_STATUS),
WF_RESTORE_BACKGROUND);
buf->action = toggle_draw_alliance_status_callback;
buf->key = SDLK_a;
buf->key = SDLK_A;
break;
default:
/* no contact */
(2-2/2)