diff --git a/HOWTO/INSTALL-RASPBERRYPI3.md b/HOWTO/INSTALL-RASPBERRYPI3.md index 77fdc67f552c..1f4ac108bbf7 100644 --- a/HOWTO/INSTALL-RASPBERRYPI3.md +++ b/HOWTO/INSTALL-RASPBERRYPI3.md @@ -241,7 +241,7 @@ Uncheck option: $ cat > test.c $ int main() { printf("Hello, world!\n"); return 0; } - + $ armv8-rpi3-linux-gnueabihf-gcc -o test test.c diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c index 98138de07c1c..c49082fb43eb 100644 --- a/erts/emulator/beam/break.c +++ b/erts/emulator/beam/break.c @@ -608,7 +608,7 @@ do_break(void) case '*': /* * The asterisk is an read error on windows, * where sys_get_key isn't that great in console mode. - * The usual reason for a read error is Ctrl-C. Treat this as + * The usual reason for a read error is Ctrl+C. Treat this as * 'a' to avoid infinite loop. */ erts_exit(0, ""); diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index c0c19060c860..d8397d31db20 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -542,8 +542,8 @@ void erts_usage(void) ERTS_MAX_NO_OF_ASYNC_THREADS); erts_fprintf(stderr, "\n"); - erts_fprintf(stderr, "-B[c|d|i] set break (Ctrl-C) behavior; valid letters are:\n"); - erts_fprintf(stderr, " 'c' to have Ctrl-C interrupt the Erlang shell;\n"); + erts_fprintf(stderr, "-B[c|d|i] set break (Ctrl+C) behavior; valid letters are:\n"); + erts_fprintf(stderr, " 'c' to have Ctrl+C interrupt the Erlang shell;\n"); erts_fprintf(stderr, " 'd' (or no extra option) to disable the break handler;\n"); erts_fprintf(stderr, " 'i' to ignore break signals\n"); erts_fprintf(stderr, "\n"); diff --git a/erts/emulator/nifs/common/prim_tty_nif.c b/erts/emulator/nifs/common/prim_tty_nif.c index ee6924186246..1eee3dbccfcb 100644 --- a/erts/emulator/nifs/common/prim_tty_nif.c +++ b/erts/emulator/nifs/common/prim_tty_nif.c @@ -467,7 +467,7 @@ static ERL_NIF_TERM tty_read_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar * - Normal key presses * - Microsoft IME * - Pasting into console - * - Using ALT+ modifiers + * - Using Alt+ modifiers * * ### Normal key presses * @@ -493,11 +493,11 @@ static ERL_NIF_TERM tty_read_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar * a keydown event with UnicodeChar set to 0 and then immediately followed by a * keyup event with the non-ascii text. * - * ### Using ALT+ modifiers + * ### Using Alt+ modifiers * * A very old way of inputting Unicode characters on Windows is to press * the left alt key and then some numbers on the number pad. For instance - * you can type ALT+1 to write a ☺. When doing this first a keydown + * you can type Alt+1 to write a ☺. When doing this first a keydown * with 0 is sent and then some events later a keyup with the character * is sent. This behavior seems to only work on cmd.exe and powershell. * @@ -506,11 +506,11 @@ static ERL_NIF_TERM tty_read_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar * - Normal presses -- Always keydown and keyup events * - IME -- Always keydown, sometimes keyup * - Pasting -- Always keydown=0 directly followed by keyup=value - * - ALT+ -- Sometimes keydown=0 followed eventually by keyup=value + * - Alt+ -- Sometimes keydown=0 followed eventually by keyup=value * * So in order to read characters we should always read the keydown event, * except when it is 0, then we should read the adjacent keyup event. - * This covers all modes and consoles except ALT+. If we want ALT+ to work + * This covers all modes and consoles except Alt+. If we want Alt+ to work * we probably have to use PeekConsoleInput to make sure the correct events * are available and inspect the state of the key event somehow. **/ diff --git a/erts/emulator/sys/unix/erl_child_setup.c b/erts/emulator/sys/unix/erl_child_setup.c index 72a7f77b2e6c..a0f816a9397c 100644 --- a/erts/emulator/sys/unix/erl_child_setup.c +++ b/erts/emulator/sys/unix/erl_child_setup.c @@ -434,7 +434,7 @@ static int system_properties_fd(void) #endif /* __ANDROID__ */ /* - If beam is terminated using kill -9 or Ctrl-C when +B is set it may not + If beam is terminated using kill -9 or Ctrl+C when +B is set it may not cleanup the terminal properly. So to clean it up we save the initial state in erl_child_setup and then reset the terminal if we detect that beam terminated. diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index ba5ba255d495..9f83357fad42 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -759,12 +759,12 @@ void erts_set_ignore_break(void) { * typing certain key combinations at the * controlling terminal... */ - sys_signal(SIGINT, SIG_IGN); /* Ctrl-C */ - sys_signal(SIGQUIT, SIG_IGN); /* Ctrl-\ */ - sys_signal(SIGTSTP, SIG_IGN); /* Ctrl-Z */ + sys_signal(SIGINT, SIG_IGN); /* Ctrl+C */ + sys_signal(SIGQUIT, SIG_IGN); /* Ctrl+\ */ + sys_signal(SIGTSTP, SIG_IGN); /* Ctrl+Z */ } -/* Don't use ctrl-c for break handler but let it be +/* Don't use Ctrl+C for break handler but let it be used by the shell instead (see user_drv.erl) */ void erts_replace_intr(void) { struct termios mode; @@ -772,11 +772,11 @@ void erts_replace_intr(void) { if (isatty(0)) { tcgetattr(0, &mode); - /* here's an example of how to replace ctrl-c with ctrl-u */ + /* here's an example of how to replace Ctrl+C with Ctrl+U */ /* mode.c_cc[VKILL] = 0; mode.c_cc[VINTR] = CKILL; */ - mode.c_cc[VINTR] = 0; /* disable ctrl-c */ + mode.c_cc[VINTR] = 0; /* disable Ctrl+C */ tcsetattr(0, TCSANOW, &mode); replace_intr = 1; } diff --git a/erts/emulator/sys/win32/sys_interrupt.c b/erts/emulator/sys/win32/sys_interrupt.c index fc4f63d4bf05..c039da63c596 100644 --- a/erts/emulator/sys/win32/sys_interrupt.c +++ b/erts/emulator/sys/win32/sys_interrupt.c @@ -111,7 +111,7 @@ BOOL WINAPI ctrl_handler_replace_intr(DWORD dwCtrlType) } -/* Don't use ctrl-c for break handler but let it be +/* Don't use Ctrl+C for break handler but let it be used by the shell instead (see user_drv.erl) */ void erts_replace_intr(void) { HANDLE hIn = GetStdHandle(STD_INPUT_HANDLE); diff --git a/lib/debugger/test/dbg_ui_SUITE.erl b/lib/debugger/test/dbg_ui_SUITE.erl index ca66f49f0aa4..b4bee285f291 100644 --- a/lib/debugger/test/dbg_ui_SUITE.erl +++ b/lib/debugger/test/dbg_ui_SUITE.erl @@ -192,10 +192,10 @@ Interpret one module"). "Start the debugger and interpret the modules [test, lists1, ordsets1]. Close the Interpret dialog. Set Attach on First Call and Attach on Break."). ?MAN_CASE(all_step3, "Click Step through all evaluation", - "In the shell, call test:test1(). Use the Step button, the Process->Step menu item and the ctrl-s shortcut to step through the *entire* execution of the call. (Approx 36 steps). Then close the Attach window. The result printed in the shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}"). + "In the shell, call test:test1(). Use the Step button, the Process->Step menu item and the Ctrl+S shortcut to step through the *entire* execution of the call. (Approx 36 steps). Then close the Attach window. The result printed in the shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}"). ?MAN_CASE(all_next3,"Click Next through all evaluation", - "Again call test:test1() in the shell. This time Use the Next button, the Process->Next menu and the ctrl-n shortcut to quickly step over the execution of the four lines in the test1-function. The result printed in the shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}"). + "Again call test:test1() in the shell. This time Use the Next button, the Process->Next menu and the Ctrl+N shortcut to quickly step over the execution of the four lines in the test1-function. The result printed in the shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}"). ?MAN_CASE(save3, "Save the debugger state", "Use File->Save Settings to save the debugger state with the name 'three.state'"). @@ -256,7 +256,7 @@ Interpret one module"). ?MAN_CASE(all_step6, "Click Step through all evaluation", - "In the bar shell, call test:test1().This should open an attach window. Use the Step button, the Process->Step menu item and the ctrl-s shortcut to step through the *entire* execution of the call. (Approx 36 steps). Then close the Attach window. The result printed in the bar shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}"). + "In the bar shell, call test:test1().This should open an attach window. Use the Step button, the Process->Step menu item and the Ctrl+S shortcut to step through the *entire* execution of the call. (Approx 36 steps). Then close the Attach window. The result printed in the bar shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}"). ?MAN_CASE(all_next6,"Click Next through all evaluation", - "Again, in the bar shell, call test:test1(). This time Use the Next button, the Process->Next menu and the ctrl-n shortcut to quickly step over the execution of the four lines in the test1-function. The result printed in the shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}"). + "Again, in the bar shell, call test:test1(). This time Use the Next button, the Process->Next menu and the Ctrl+N shortcut to quickly step over the execution of the four lines in the test1-function. The result printed in the shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}"). diff --git a/lib/kernel/test/interactive_shell_SUITE_data/valid_keymap.config b/lib/kernel/test/interactive_shell_SUITE_data/valid_keymap.config index 62e4cf38b726..357f6f5dabea 100644 --- a/lib/kernel/test/interactive_shell_SUITE_data/valid_keymap.config +++ b/lib/kernel/test/interactive_shell_SUITE_data/valid_keymap.config @@ -6,14 +6,14 @@ %% Enter "\n" => new_line_finish, "\r" => new_line_finish, -%%% Alt-Enter or Esc + Enter +%%% Alt+Enter or Esc + Enter "\^[\n" => new_line, "\^[\r" => new_line, %% Tab ^I "\t" => tab_expand, -%% Ctrl-alpha keys 0-31 +%% Ctrl+alpha keys 0-31 "\^A" => beginning_of_line, "\^B" => history_up, %"\^C" => sig_term_menu, %% cannot be changed, yet @@ -53,7 +53,7 @@ "\^[[15~" => clear, "\^[[15;5~" => clear, -%% Alt-alpha_key or Esc + alpha_key, can distinguish case +%% Alt+alpha_key or Esc + alpha_key, can distinguish case %"\^[A "\^[B" => backward_word, "\^[b" => backward_word, @@ -154,4 +154,4 @@ default => search_quit}, tab_expand => #{ "\t" => tab_expand_full, -default => tab_expand_quit}}}]}]. \ No newline at end of file +default => tab_expand_quit}}}]}]. diff --git a/lib/observer/src/observer_port_wx.erl b/lib/observer/src/observer_port_wx.erl index d39687fbac9e..18028f1c9274 100644 --- a/lib/observer/src/observer_port_wx.erl +++ b/lib/observer/src/observer_port_wx.erl @@ -374,9 +374,9 @@ create_menus(Parent) -> MenuEntries = [{"View", [#create_menu{id = ?ID_PORT_INFO_SELECTED, - text = "Port info for selected ports\tCtrl-I"}, + text = "Port info for selected ports\tCtrl+I"}, separator, - #create_menu{id = ?ID_REFRESH, text = "Refresh\tCtrl-R"}, + #create_menu{id = ?ID_REFRESH, text = "Refresh\tCtrl+R"}, #create_menu{id = ?ID_REFRESH_INTERVAL, text = "Refresh Interval..."} ]}, {"Trace", diff --git a/lib/observer/src/observer_pro_wx.erl b/lib/observer/src/observer_pro_wx.erl index 23c082e0253f..72ff278ba74c 100644 --- a/lib/observer/src/observer_pro_wx.erl +++ b/lib/observer/src/observer_pro_wx.erl @@ -133,7 +133,7 @@ create_pro_menu(Parent, Holder) -> type=check, check=call(Holder, {get_accum, self()})}, separator, - #create_menu{id=?ID_REFRESH, text="Refresh\tCtrl-R"}, + #create_menu{id=?ID_REFRESH, text="Refresh\tCtrl+R"}, #create_menu{id=?ID_REFRESH_INTERVAL, text="Refresh Interval"}]}, {"Trace", [#create_menu{id=?ID_TRACE_PIDS, text="Trace processes"}, diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl index a558546f52fc..89cd8b1b2659 100644 --- a/lib/observer/src/observer_procinfo.erl +++ b/lib/observer/src/observer_procinfo.erl @@ -365,7 +365,7 @@ init_log_page(Parent, Pid, Table) -> create_menus(MenuBar) -> Menus = [{"File", [#create_menu{id=?wxID_CLOSE, text="Close"}]}, - {"View", [#create_menu{id=?REFRESH, text="Refresh\tCtrl-R"}]}], + {"View", [#create_menu{id=?REFRESH, text="Refresh\tCtrl+R"}]}], observer_lib:create_menus(Menus, MenuBar, new_window). process_info_fields(Pid, WSz) -> diff --git a/lib/observer/src/observer_sock_wx.erl b/lib/observer/src/observer_sock_wx.erl index 90591acac27e..031c1dd9f2d9 100644 --- a/lib/observer/src/observer_sock_wx.erl +++ b/lib/observer/src/observer_sock_wx.erl @@ -418,9 +418,9 @@ create_menus(Parent) -> MenuEntries = [{"View", [#create_menu{id = ?ID_SOCKET_INFO_SELECTED, - text = "Socket info for selected sockets\tCtrl-I"}, + text = "Socket info for selected sockets\tCtrl+I"}, separator, - #create_menu{id = ?ID_REFRESH, text = "Refresh\tCtrl-R"}, + #create_menu{id = ?ID_REFRESH, text = "Refresh\tCtrl+R"}, #create_menu{id = ?ID_REFRESH_INTERVAL, text = "Refresh Interval..."} ]}%% , %% {"Debug", diff --git a/lib/observer/src/observer_sys_wx.erl b/lib/observer/src/observer_sys_wx.erl index e6ec02f606d0..25152178b8c1 100644 --- a/lib/observer/src/observer_sys_wx.erl +++ b/lib/observer/src/observer_sys_wx.erl @@ -86,7 +86,7 @@ init([Notebook, Parent, Config]) -> create_sys_menu(Parent) -> - View = {"View", [#create_menu{id = ?ID_REFRESH, text = "Refresh\tCtrl-R"}, + View = {"View", [#create_menu{id = ?ID_REFRESH, text = "Refresh\tCtrl+R"}, #create_menu{id = ?ID_REFRESH_INTERVAL, text = "Refresh interval"}]}, observer_wx:create_menus(Parent, [View]). diff --git a/lib/observer/src/observer_trace_wx.erl b/lib/observer/src/observer_trace_wx.erl index 2b727d0a26f7..376f170a89cc 100644 --- a/lib/observer/src/observer_trace_wx.erl +++ b/lib/observer/src/observer_trace_wx.erl @@ -992,8 +992,8 @@ create_logwindow(Parent, true) -> LogWin = wxFrame:new(Parent, ?LOG_WIN, "Trace Log", [{size, {750*Scale, 800*Scale}}]), MB = wxMenuBar:new(), File = wxMenu:new(), - wxMenu:append(File, ?LOG_CLEAR, "Clear Log\tCtrl-C"), - wxMenu:append(File, ?LOG_SAVE, "Save Log\tCtrl-S"), + wxMenu:append(File, ?LOG_CLEAR, "Clear Log\tCtrl+C"), + wxMenu:append(File, ?LOG_SAVE, "Save Log\tCtrl+S"), wxMenu:append(File, ?wxID_CLOSE, "Close"), wxMenuBar:append(MB, File, "File"), wxFrame:setMenuBar(LogWin, MB), diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl index 669ee82e3f6e..1831e5c10f78 100644 --- a/lib/observer/src/observer_tv_table.erl +++ b/lib/observer/src/observer_tv_table.erl @@ -177,16 +177,16 @@ add_columns(Grid, Start, ColumnNames) -> create_menus(MB) -> File = wxMenu:new(), - wxMenu:append(File, ?ID_TABLE_INFO, "Table Information\tCtrl-I"), + wxMenu:append(File, ?ID_TABLE_INFO, "Table Information\tCtrl+I"), wxMenu:append(File, ?wxID_CLOSE, "Close"), wxMenuBar:append(MB, File, "File"), Edit = wxMenu:new(), wxMenu:append(Edit, ?ID_EDIT, "Edit Object"), - wxMenu:append(Edit, ?ID_DELETE, "Delete Object\tCtrl-D"), + wxMenu:append(Edit, ?ID_DELETE, "Delete Object\tCtrl+D"), wxMenu:appendSeparator(Edit), - wxMenu:append(Edit, ?ID_SEARCH, "Search\tCtrl-S"), + wxMenu:append(Edit, ?ID_SEARCH, "Search\tCtrl+S"), wxMenu:appendSeparator(Edit), - wxMenu:append(Edit, ?ID_REFRESH, "Refresh\tCtrl-R"), + wxMenu:append(Edit, ?ID_REFRESH, "Refresh\tCtrl+R"), wxMenu:append(Edit, ?ID_REFRESH_INTERVAL, "Refresh interval..."), wxMenuBar:append(MB, Edit, "Edit"), Help = wxMenu:new(), diff --git a/lib/observer/src/observer_tv_wx.erl b/lib/observer/src/observer_tv_wx.erl index 9f9636797cd7..5649a8986d33 100644 --- a/lib/observer/src/observer_tv_wx.erl +++ b/lib/observer/src/observer_tv_wx.erl @@ -291,7 +291,7 @@ code_change(_, _, State) -> create_menus(Parent, #opts{sys_hidden=Sys, unread_hidden=UnR, type=Type}) -> MenuEntries = [{"View", - [#create_menu{id = ?ID_TABLE_INFO, text = "Table information\tCtrl-I"}, + [#create_menu{id = ?ID_TABLE_INFO, text = "Table information\tCtrl+I"}, separator, #create_menu{id = ?ID_ETS, text = "&Ets Tables", type=radio, check=Type==ets}, @@ -303,7 +303,7 @@ create_menus(Parent, #opts{sys_hidden=Sys, unread_hidden=UnR, type=Type}) -> #create_menu{id = ?ID_SYSTEM_TABLES, text = "View &System Tables", type=check, check=not Sys}, separator, - #create_menu{id = ?ID_REFRESH, text = "Refresh\tCtrl-R"}, + #create_menu{id = ?ID_REFRESH, text = "Refresh\tCtrl+R"}, #create_menu{id = ?ID_REFRESH_INTERVAL, text = "Refresh Interval..."} ]}], observer_wx:create_menus(Parent, MenuEntries). diff --git a/lib/reltool/test/reltool_manual_gui_SUITE.erl b/lib/reltool/test/reltool_manual_gui_SUITE.erl index 3a4b012d2e2f..4e4fc742f569 100644 --- a/lib/reltool/test/reltool_manual_gui_SUITE.erl +++ b/lib/reltool/test/reltool_manual_gui_SUITE.erl @@ -172,7 +172,7 @@ config(Config) -> {ok,ServerPid} = reltool:get_server(SysPid), unlink(SysPid), break("the system window is still alive", - "terminate reltool by hitting 'Ctrl-q' (linux) or clicking the " + "terminate reltool by hitting 'Ctrl+Q' (linux) or clicking the " "close box on the top fram when system window is active"), false = erlang:is_process_alive(SysPid), false = erlang:is_process_alive(ServerPid), diff --git a/lib/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl index 3bd53d59126a..e9e924d128a0 100644 --- a/lib/ssh/src/ssh_connect.hrl +++ b/lib/ssh/src/ssh_connect.hrl @@ -180,8 +180,8 @@ -define(VEOL,6). %% End-of-line character in addition to carriage return %% or,and). linefeed. -define(VEOL2,7). %% Additional end-of-line character. --define(VSTART,8). %% Continues paused output (normally control-Q). --define(VSTOP,9). %% Pauses output (normally control-S). +-define(VSTART,8). %% Continues paused output (normally Ctrl+Q). +-define(VSTOP,9). %% Pauses output (normally Ctrl+S). -define(VSUSP,10). %% Suspends the current program. -define(VDSUSP,11). %% Another suspend character. -define(VREPRINT,12). %% Reprints the current input line. diff --git a/lib/ssl/test/dtls_api_SUITE.erl b/lib/ssl/test/dtls_api_SUITE.erl index 47ca3df3e0cc..4da1fcbbec6c 100644 --- a/lib/ssl/test/dtls_api_SUITE.erl +++ b/lib/ssl/test/dtls_api_SUITE.erl @@ -478,7 +478,7 @@ flush() -> client_restarts_multiple_acceptors(Config) -> %% Can also be tested with openssl by connecting a client and hit - %% Ctrl-C to kill openssl process, so that the connection is not + %% Ctrl+C to kill openssl process, so that the connection is not %% closed. %% Then do a new openssl connect with the same client port. diff --git a/lib/stdlib/doc/stdlib_app.md b/lib/stdlib/doc/stdlib_app.md index 5b7e2cc4d837..01184b36cbba 100644 --- a/lib/stdlib/doc/stdlib_app.md +++ b/lib/stdlib/doc/stdlib_app.md @@ -55,7 +55,7 @@ For more information about configuration parameters, see the - **`format_shell_func = {Mod, Func} | string() | default`{: #format_shell_func }** - Can be used to set the formatting of the Erlang shell output. This has an effect on commands that have been submitted and how it is saved in history - or if the formatting hotkey is pressed while editing an expression (Alt-f by + or if the formatting hotkey is pressed while editing an expression (Alt+F by default). You can specify a Mod:Func/1 that expects the whole expression as a string and returns a formatted expressions as a string. See `shell:format_shell_func/1` for how to set it from inside the shell. diff --git a/lib/stdlib/src/edlin_key.erl b/lib/stdlib/src/edlin_key.erl index eecf44ab2e93..fb3827fed81e 100644 --- a/lib/stdlib/src/edlin_key.erl +++ b/lib/stdlib/src/edlin_key.erl @@ -197,13 +197,13 @@ normal_map() -> %% Enter "\n" => new_line_finish, "\r" => new_line_finish, - %%% Alt-Enter or Esc + Enter + %%% Alt+Enter or Esc + Enter "\^[\n" => new_line, "\^[\r" => new_line, %% Tab ^I "\t" => tab_expand, - %% Ctrl-alpha_key, can not distinguish case + %% Ctrl+alpha_key, can not distinguish case "\^A" => beginning_of_line, "\^B" => backward_char, %%"\^C" => sig_term_menu, currently handled by user_drv.erl @@ -227,9 +227,9 @@ normal_map() -> %%"\^X" => , "\^Y" => yank, %%"\^Z" => sig_stop, currently not handled by edlin.erl - "\^]" => auto_blink, % ctrl+5 seems to do the same thing, + "\^]" => auto_blink, % Ctrl+5 seems to do the same thing, - %%# Alt-alpha_key or Esc + alpha_key, can distinguish case, + %%# Alt+alpha_key or Esc + alpha_key, can distinguish case, "\^[B" => backward_word, "\^[b" => backward_word, "\^[c" => clear_line, @@ -355,7 +355,7 @@ valid_functions() -> %% ^V %% ^@, ^\, ^], ^^, ^_ %% not straightforward how to type these %% -%% Alt-Shift-char, Alt-char or Esc + Shift-char, Esc + char +%% Alt+Shift+char, Alt+char or Esc + Shift+char, Esc + char %% ^[A, a %% ^[C %% ^[E, e diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl index 899785ae3d8a..313d89ee1103 100644 --- a/lib/stdlib/src/erl_scan.erl +++ b/lib/stdlib/src/erl_scan.erl @@ -1718,7 +1718,7 @@ scan_escape([$x,H1], _Col) when ?HEX(H1) -> more; scan_escape([$x|Cs], Col) -> {error,Cs,{illegal,character},incr_column(Col, 1)}; -%% \^X -> Control-X +%% \^X -> Ctrl+X scan_escape([$^=C0,C|Cs], Col) when ?CHAR(C) -> case caret_char_code(C) of error -> diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl index 2f859138cd2b..20bdce94bfe2 100644 --- a/lib/stdlib/src/shell.erl +++ b/lib/stdlib/src/shell.erl @@ -2024,7 +2024,7 @@ multiline_prompt_func(PromptFunc) -> Can be used to set the formatting of the Erlang shell output. This has an effect on commands that have been submitted, and how it is saved in history. -Or if the formatting hotkey is pressed while editing an expression (Alt-r by default). You +Or if the formatting hotkey is pressed while editing an expression (Alt+R by default). You can specify a `Mod:Func/1` that expects the whole expression as a string and returns a formatted expressions as a string. See [`stdlib app config`](stdlib_app.md#format_shell_func) for how to set it before diff --git a/lib/wx/examples/simple/menu.erl b/lib/wx/examples/simple/menu.erl index 558810ae28d8..ee4b92a00a24 100644 --- a/lib/wx/examples/simple/menu.erl +++ b/lib/wx/examples/simple/menu.erl @@ -161,14 +161,14 @@ create_file_menu() -> ])), ClearLogItem = wxMenuItem:new([ {id, ?menuID_FILE_CLEAR_LOG}, - {text, "Clear &log\tCtrl-L"} %% note mnemonic and accelerator + {text, "Clear &log\tCtrl+L"} %% note mnemonic and accelerator ]), wxMenu:append(FileMenu, ClearLogItem ), wxMenu:appendSeparator(FileMenu), wxMenu:append(FileMenu, wxMenuItem:new([ {id, ?menuID_FILE_QUIT} %, - %{text, "E&xit\tAlt-X"} + %{text, "E&xit\tAlt+X"} ])), FileMenu. @@ -179,47 +179,47 @@ create_menubar_menu() -> MenuBarMenu = wxMenu:new(), wxMenu:append(MenuBarMenu, wxMenuItem:new([ {id, ?menuID_MENUBAR_APPEND}, - {text, "&Append menu\tCtrl-A"}, + {text, "&Append menu\tCtrl+A"}, {help, "Append a menu to the menubar"} ])), wxMenu:append(MenuBarMenu, wxMenuItem:new([ {id, ?menuID_MENUBAR_INSERT}, - {text, "&Insert menu\tCtrl-I"}, + {text, "&Insert menu\tCtrl+I"}, {help, "Insert a menu into the menubar"} ])), wxMenu:append(MenuBarMenu, wxMenuItem:new([ {id, ?menuID_MENUBAR_DELETE}, - {text, "&Delete menu\tCtrl-D"}, + {text, "&Delete menu\tCtrl+D"}, {help, "Insert a menu into the menubar"} ])), wxMenu:append(MenuBarMenu, wxMenuItem:new([ {id, ?menuID_MENUBAR_TOGGLE}, - {text, "&Toggle menu\tCtrl-T"}, + {text, "&Toggle menu\tCtrl+T"}, {help, "Toggle the first menu in the menubar"}, {kind, ?wxITEM_CHECK} ])), wxMenu:appendSeparator(MenuBarMenu), %% -------------------------- wxMenu:append(MenuBarMenu, wxMenuItem:new([ {id, ?menuID_MENUBAR_ENABLE}, - {text, "&Enable menu\tCtrl-E"}, + {text, "&Enable menu\tCtrl+E"}, {help, "Enable or disable the last menu"}, {kind, ?wxITEM_CHECK} ])), wxMenu:appendSeparator(MenuBarMenu), %% -------------------------- wxMenu:append(MenuBarMenu, wxMenuItem:new([ {id, ?menuID_MENUBAR_GET_LABEL}, - {text, "&Get menu label\tCtrl-G"}, + {text, "&Get menu label\tCtrl+G"}, {help, "Get the label of the last menu"} ])), wxMenu:append(MenuBarMenu, wxMenuItem:new([ {id, ?menuID_MENUBAR_SET_LABEL}, - {text, "&Set menu label\tCtrl-S"}, + {text, "&Set menu label\tCtrl+S"}, {help, "Change the label of the last menu"} ])), wxMenu:appendSeparator(MenuBarMenu), %% -------------------------- wxMenu:append(MenuBarMenu, wxMenuItem:new([ {id, ?menuID_MENUBAR_FIND_MENU}, - {text, "&Find menu from label\tCtrl-F"}, + {text, "&Find menu from label\tCtrl+F"}, {help, "Find a menu by searching for its label"} ])), MenuBarMenu. @@ -232,46 +232,46 @@ create_menu_menu() -> MenuMenu = wxMenu:new(), wxMenu:append(MenuMenu, wxMenuItem:new([ {id, ?menuID_MENU_APPEND}, - {text, "&Append menu item\tAlt-A"}, + {text, "&Append menu item\tAlt+A"}, {help, "Append a menu item to the last menu"} ])), wxMenu:append(MenuMenu, wxMenuItem:new([ {id, ?menuID_MENU_APPEND_SUB}, - {text, "&Append sub menu\tAlt-S"}, + {text, "&Append sub menu\tAlt+S"}, {help, "Append a sub menu to the last menu"} ])), wxMenu:append(MenuMenu, wxMenuItem:new([ {id, ?menuID_MENU_INSERT}, - {text, "&Insert menu item\tAlt-I"}, + {text, "&Insert menu item\tAlt+I"}, {help, "Insert a menu item in head of the last menu"} ])), wxMenu:append(MenuMenu, wxMenuItem:new([ {id, ?menuID_MENU_DELETE}, - {text, "&Delete menu item\tAlt-D"}, + {text, "&Delete menu item\tAlt+D"}, {help, "Delete the last menu item from the last menu"} ])), wxMenu:appendSeparator(MenuMenu), %% -------------------------- wxMenu:append(MenuMenu, wxMenuItem:new([ {id, ?menuID_MENU_ENABLE}, - {text, "&Enable menu item\tAlt-E"}, + {text, "&Enable menu item\tAlt+E"}, {help, "Enable or disable the last menu item"}, {kind, ?wxITEM_CHECK} ])), wxMenu:append(MenuMenu, wxMenuItem:new([ {id, ?menuID_MENU_CHECK}, - {text, "&Check menu item\tAlt-C"}, + {text, "&Check menu item\tAlt+C"}, {help, "Check or uncheck the last menu item"}, {kind, ?wxITEM_CHECK} ])), wxMenu:appendSeparator(MenuMenu), %% -------------------------- wxMenu:append(MenuMenu, wxMenuItem:new([ {id, ?menuID_MENU_GET_INFO}, - {text, "Get menu item in&fo\tAlt-F"}, + {text, "Get menu item in&fo\tAlt+F"}, {help, "Show the state of the last menu item"} ])), wxMenu:append(MenuMenu, wxMenuItem:new([ {id, ?menuID_MENU_SET_LABEL}, - {text, "&Set menu label\tCtrl-S"}, + {text, "&Set menu label\tCtrl+S"}, {help, "Change the label of the last menu"} ])), wxMenu:appendSeparator(MenuMenu), %% -------------------------- @@ -378,9 +378,9 @@ create_stock_menu() -> create_dummy_menu() -> DummyMenu = wxMenu:new(), - wxMenu:append(DummyMenu, ?menuID_DUMMY_FIRST, "&First item\tCtrl-F1"), + wxMenu:append(DummyMenu, ?menuID_DUMMY_FIRST, "&First item\tCtrl+F1"), wxMenu:appendSeparator(DummyMenu), %% -------------------------- - wxMenu:append(DummyMenu, ?menuID_DUMMY_SECOND, "&Second item\tCtrl-F2"), + wxMenu:append(DummyMenu, ?menuID_DUMMY_SECOND, "&Second item\tCtrl+F2"), DummyMenu. loop(State) -> @@ -508,7 +508,7 @@ onMenuAction(#wx{id=?menuID_MENU_APPEND, obj=Frame}, #state{} = State) -> wxMenu:appendSeparator(Menu), wxMenu:append(Menu, wxMenuItem:new([ {id, ?menuID_DUMMY_THIRD}, - {text, "&Third dummy item\tCtrl-F3"}, + {text, "&Third dummy item\tCtrl+F3"}, {kind, ?wxITEM_CHECK} ])), diff --git a/lib/wx/src/gen/wxKeyEvent.erl b/lib/wx/src/gen/wxKeyEvent.erl index 958ed7758f33..ce437d36bbb4 100644 --- a/lib/wx/src/gen/wxKeyEvent.erl +++ b/lib/wx/src/gen/wxKeyEvent.erl @@ -74,9 +74,9 @@ might be impossible to enter on their keyboard. Another difference between key and char events is that another kind of translation is done for the latter ones when the Control key is pressed: char events for ASCII letters in this case carry codes corresponding to the ASCII -value of Ctrl-Latter, i.e. 1 for Ctrl-A, 2 for Ctrl-B and so on until 26 for -Ctrl-Z. This is convenient for terminal-like applications and can be completely -ignored by all the other ones (if you need to handle Ctrl-A it is probably a +value of Ctrl+Latter, i.e. 1 for Ctrl+A, 2 for Ctrl+B and so on until 26 for +Ctrl+Z. This is convenient for terminal-like applications and can be completely +ignored by all the other ones (if you need to handle Ctrl+A it is probably a better idea to use the key event rather than the char one). Notice that currently no translation is done for the presses of [, `\`, ], `^` and `_` keys which might be mapped to ASCII values from 27 to 31. Since version 2.9.2, the @@ -117,7 +117,7 @@ corresponding to each down one. Note: For Windows programmers: The key and char events in wxWidgets are similar to but slightly different from Windows `WM_KEYDOWN` and `WM_CHAR` events. In -particular, Alt-x combination will generate a char event in wxWidgets (unless it +particular, Alt+x combination will generate a char event in wxWidgets (unless it is used as an accelerator) and almost all keys, including ones without ASCII equivalents, generate char events too. diff --git a/lib/wx/src/gen/wxMenuBar.erl b/lib/wx/src/gen/wxMenuBar.erl index e90552268ac2..3969e0014010 100644 --- a/lib/wx/src/gen/wxMenuBar.erl +++ b/lib/wx/src/gen/wxMenuBar.erl @@ -30,7 +30,7 @@ frame that contains the menu bar. If you have a toolbar which uses the same identifiers as your EVT_MENU entries, events from the toolbar will also be processed by your EVT_MENU event handlers. -Tip: under Windows, if you discover that menu shortcuts (for example, Alt-F to +Tip: under Windows, if you discover that menu shortcuts (for example, Alt+F to show the file menu) are not working, check any EVT_CHAR events you are handling in child windows. If you are not calling event.Skip() for events that you don't process in these event handlers, menu shortcuts may cease to work. diff --git a/lib/wx/src/gen/wxNavigationKeyEvent.erl b/lib/wx/src/gen/wxNavigationKeyEvent.erl index 6f6295e50953..d621f1bb2639 100644 --- a/lib/wx/src/gen/wxNavigationKeyEvent.erl +++ b/lib/wx/src/gen/wxNavigationKeyEvent.erl @@ -81,7 +81,7 @@ setDirection(#wx_ref{type=ThisT}=This,Direction) %% @doc See external documentation. -doc """ Returns true if the navigation event represents a window change (for example, -from Ctrl-Page Down in a notebook). +from Ctrl+Page Down in a notebook). """. -spec isWindowChange(This) -> boolean() when This::wxNavigationKeyEvent().