summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-02-04 21:27:52 -0500
committerJune McEnroe <june@causal.agency>2020-02-04 21:27:52 -0500
commit0df8bd51aa70cfa66951e8f08a6a3dce3fd45dec (patch)
treefa1bb14d076d228242e97a807be3b8ddca62c391
parentModel keyCtrl like keyMeta (diff)
downloadcatgirl-0df8bd51aa70cfa66951e8f08a6a3dce3fd45dec.tar.gz
catgirl-0df8bd51aa70cfa66951e8f08a6a3dce3fd45dec.zip
Convert editHead and editTail from wchar_t
-rw-r--r--edit.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/edit.c b/edit.c
index 446e0e9..e142507 100644
--- a/edit.c
+++ b/edit.c
@@ -14,17 +14,31 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <err.h>
+#include <assert.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sysexits.h>
+#include <wchar.h>
 
 #include "chat.h"
 
+enum { Cap = 512 };
+static wchar_t buf[Cap] = L"foo\0033bar\3baz";
+static size_t len = 12;
+static size_t pos = 6;
+
 const char *editHead(void) {
-	return "foo\0033bar";
+	static char mbs[MB_LEN_MAX * Cap];
+	const wchar_t *ptr = buf;
+	size_t n = wcsnrtombs(mbs, &ptr, pos, sizeof(mbs), NULL);
+	assert(n != (size_t)-1);
+	return mbs;
 }
 
 const char *editTail(void) {
-	return "baz\3";
+	static char mbs[MB_LEN_MAX * Cap];
+	const wchar_t *ptr = &buf[pos];
+	size_t n = wcsnrtombs(mbs, &ptr, len - pos, sizeof(mbs), NULL);
+	assert(n != (size_t)-1);
+	return mbs;
 }
Remove Programming keyboard layoutJune McEnroe2017-06-10 * Add Code Tarmak 1 layoutJune McEnroe2017-06-09 * Remap keys in vim for Tarmak 1 more sensiblyJune McEnroe2017-06-09 * Add iTerm light profile and disable hotkeyJune McEnroe2017-06-07 * Remap C-w {n,e} in vim for Tarmak 1June McEnroe2017-06-07 * Rebind hnel in vim for Tarmak 1June McEnroe2017-06-06 * Use C-space as tmux prefixJune McEnroe2017-06-06 * Add Tarmak layoutsJune McEnroe2017-06-06 * Rename keyboard layout ProgrammingJune McEnroe2017-05-26 * Fix Library install conditionJune McEnroe2017-05-25 * Revert "Remove macOS keyboard layout"June McEnroe2017-05-25 * Fix copy mode bindings for tmux 2.4June McEnroe2017-05-08 * Remove option unnecessary in nvim 0.2June McEnroe2017-05-02 * Reorder lines in psqlrcJune McEnroe2017-05-01 * Clean up Karabiner configurationJune McEnroe2017-05-01 * Fix prune script loopJune McEnroe2017-05-01 * Fix prune scriptJune McEnroe2017-05-01 * Clean up SSH configJune McEnroe2017-05-01 * Rename colorscheme "trivial"