summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Eric Janouch <p@janouch.name>2021-04-10 05:11:46 +0200
committerPřemysl Eric Janouch <p@janouch.name>2021-04-10 05:11:46 +0200
commit8e8ffe2c73b55ee1beeca41d97bddb1a55b4602e (patch)
tree3daec054655dc159db4ccece46ab5278e4f31428
parentd05c85833d09e9b7da6c264c2ae66b30d0d6c882 (diff)
downloadxK-8e8ffe2c73b55ee1beeca41d97bddb1a55b4602e.tar.gz
xK-8e8ffe2c73b55ee1beeca41d97bddb1a55b4602e.tar.xz
xK-8e8ffe2c73b55ee1beeca41d97bddb1a55b4602e.zip
degesch: don't switch to channels while typing
We might just always set the highlighted bit on, it would be consistent with PMs.
-rw-r--r--LICENSE2
-rw-r--r--degesch.c11
2 files changed, 9 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index b60d4d9..9621647 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014 - 2020, Přemysl Eric Janouch <p@janouch.name>
+Copyright (c) 2014 - 2021, Přemysl Eric Janouch <p@janouch.name>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted.
diff --git a/degesch.c b/degesch.c
index 690e46a..15066c8 100644
--- a/degesch.c
+++ b/degesch.c
@@ -1,7 +1,7 @@
/*
* degesch.c: a terminal-based IRC client
*
- * Copyright (c) 2015 - 2020, Přemysl Eric Janouch <p@janouch.name>
+ * Copyright (c) 2015 - 2021, Přemysl Eric Janouch <p@janouch.name>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted.
@@ -6665,8 +6665,13 @@ irc_handle_join (struct server *s, const struct irc_message *msg)
str_map_set (&s->irc_buffer_map, channel->name, buffer);
buffer_add (s->ctx, buffer);
- // XXX: this is annoying, consider only doing it a while after /join
- buffer_activate (s->ctx, buffer);
+
+ char *input = CALL (s->ctx->input, get_line);
+ if (!*input)
+ buffer_activate (s->ctx, buffer);
+ else
+ buffer->highlighted = true;
+ free (input);
}
if (irc_is_this_us (s, msg->prefix))