xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display an info box on startup with recent breaking changes

Browse Source
This commit is contained in:
Maxime Coste 2017-02-19 13:59:44 +00:00
parent 9271f0a87d
commit 9fdbcf761d
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main.cc
View File

@ -36,6 +36,15 @@
namespace Kakoune namespace Kakoune
{ {
static const char* startup_info =
"Kakoune recent breaking changes:\n"
" * <a-'> (rotate selection contents) is now <a-\">,\n"
" <a-'> is rotate selections backwards.\n"
" * The `identifier` face has been replaced with `variable`,\n"
" `function` and `module`, update your custom colorschemes\n"
" * BufNew and BufOpen hooks have been renamed to BufNewFile\n"
" and BufOpenFile.\n";
struct startup_error : runtime_error struct startup_error : runtime_error
{ {
using runtime_error::runtime_error; using runtime_error::runtime_error;
@ -467,10 +476,11 @@ struct convert_to_client_mode
enum class ServerFlags enum class ServerFlags
{ {
None = 0, None = 0,
IgnoreKakrc = 1 << 0, IgnoreKakrc = 1 << 0,
Daemon = 1 << 1, Daemon = 1 << 1,
ReadOnly = 1 << 2, ReadOnly = 1 << 2,
StartupInfo = 1 << 3,
}; };
template<> struct WithBitOps<ServerFlags> : std::true_type {}; template<> struct WithBitOps<ServerFlags> : std::true_type {};
@ -570,14 +580,19 @@ int run_server(StringView session,
try try
{ {
if (not (flags & ServerFlags::Daemon)) if (not (flags & ServerFlags::Daemon))
{
local_client = client_manager.create_client( local_client = client_manager.create_client(
create_local_ui(ui_type), get_env_vars(), init_cmds, init_coord); create_local_ui(ui_type), get_env_vars(), init_cmds, init_coord);
if (local_client and startup_error) if (startup_error)
local_client->print_status({ local_client->print_status({
"error during startup, see *debug* buffer for details", "error during startup, see *debug* buffer for details",
get_face("Error") get_face("Error")
}); });
if (flags & ServerFlags::StartupInfo)
local_client->info_show("Welcome to Kakoune", startup_info, {}, InfoStyle::Prompt);
}
while (not terminate and (not client_manager.empty() or (flags & ServerFlags::Daemon))) while (not terminate and (not client_manager.empty() or (flags & ServerFlags::Daemon)))
{ {
@ -891,7 +906,8 @@ int main(int argc, char* argv[])
{ {
auto flags = (parser.get_switch("n") ? ServerFlags::IgnoreKakrc : ServerFlags::None) | auto flags = (parser.get_switch("n") ? ServerFlags::IgnoreKakrc : ServerFlags::None) |
(parser.get_switch("d") ? ServerFlags::Daemon : ServerFlags::None) | (parser.get_switch("d") ? ServerFlags::Daemon : ServerFlags::None) |
(parser.get_switch("ro") ? ServerFlags::ReadOnly : ServerFlags::None); (parser.get_switch("ro") ? ServerFlags::ReadOnly : ServerFlags::None) |
(argc == 1 ? ServerFlags::StartupInfo : ServerFlags::None);
return run_server(session, init_cmds, init_coord, flags, ui_type, files); return run_server(session, init_cmds, init_coord, flags, ui_type, files);
} }
catch (convert_to_client_mode& convert) catch (convert_to_client_mode& convert)