KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Micro optimization

Browse Source
This commit is contained in:
Kovid Goyal
2022-03-23 14:51:22 +05:30
parent 1be1864657
commit 1837168b0b
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
kitty/parser.c
View File

@@ -1017,10 +1017,9 @@ dispatch_csi(Screen *screen, PyObject DUMP_UNUSED *dump_callback) {
// DCS mode {{{ // DCS mode {{{
static bool static bool
startswith(const uint32_t *string, size_t sz, const char *prefix) { startswith(const uint32_t *string, ssize_t sz, const char *prefix, ssize_t l) {
size_t l = strlen(prefix);
if (sz < l) return false; if (sz < l) return false;
for (size_t i = 0; i < l; i++) { for (ssize_t i = 0; i < l; i++) {
if (string[i] != (unsigned char)prefix[i]) return false; if (string[i] != (unsigned char)prefix[i]) return false;
} }
return true; return true;
@@ -1063,33 +1062,33 @@ dispatch_dcs(Screen *screen, PyObject DUMP_UNUSED *dump_callback) {
} }
break; break;
case '@': case '@':
#define CMD_PREFIX "kitty-cmd{" if (startswith(screen->parser_buf + 1, screen->parser_buf_pos - 2, "kitty-", sizeof("kitty-") - 1)) {
if (startswith(screen->parser_buf + 1, screen->parser_buf_pos - 2, CMD_PREFIX)) { if (startswith(screen->parser_buf + 7, screen->parser_buf_pos - 2, "cmd{", sizeof("cmd{") - 1)) {
PyObject *cmd = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, screen->parser_buf + 10, screen->parser_buf_pos - 10); PyObject *cmd = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, screen->parser_buf + 10, screen->parser_buf_pos - 10);
if (cmd != NULL) { if (cmd != NULL) {
REPORT_OSC2(screen_handle_cmd, (char)screen->parser_buf[0], cmd); REPORT_OSC2(screen_handle_cmd, (char)screen->parser_buf[0], cmd);
screen_handle_cmd(screen, cmd); screen_handle_cmd(screen, cmd);
Py_DECREF(cmd); Py_DECREF(cmd);
} else PyErr_Clear(); } else PyErr_Clear();
#undef CMD_PREFIX
#define IF_SIMPLE_PREFIX(prefix, func) \ #define IF_SIMPLE_PREFIX(prefix, func) \
if (startswith(screen->parser_buf + 1, screen->parser_buf_pos - 1, prefix)) { \ if (startswith(screen->parser_buf + 7, screen->parser_buf_pos - 1, prefix, sizeof(prefix) - 1)) { \
const size_t pp_size = sizeof(prefix); \ const size_t pp_size = sizeof("kitty") + sizeof(prefix); \
PyObject *msg = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, screen->parser_buf + pp_size, screen->parser_buf_pos - pp_size); \ PyObject *msg = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, screen->parser_buf + pp_size, screen->parser_buf_pos - pp_size); \
if (msg != NULL) { \ if (msg != NULL) { \
REPORT_OSC2(func, (char)screen->parser_buf[0], msg); \ REPORT_OSC2(func, (char)screen->parser_buf[0], msg); \
func(screen, msg); \ func(screen, msg); \
Py_DECREF(msg); \ Py_DECREF(msg); \
} else PyErr_Clear(); } else PyErr_Clear();
} else IF_SIMPLE_PREFIX("kitty-kitten-result|", screen_handle_kitten_result) } else IF_SIMPLE_PREFIX("kitten-result|", screen_handle_kitten_result)
} else IF_SIMPLE_PREFIX("kitty-print|", screen_handle_print) } else IF_SIMPLE_PREFIX("print|", screen_handle_print)
} else IF_SIMPLE_PREFIX("kitty-echo|", screen_handle_echo) } else IF_SIMPLE_PREFIX("echo|", screen_handle_echo)
} else IF_SIMPLE_PREFIX("kitty-ssh|", screen_handle_ssh) } else IF_SIMPLE_PREFIX("ssh|", screen_handle_ssh)
} else IF_SIMPLE_PREFIX("kitty-ask|", screen_handle_askpass) } else IF_SIMPLE_PREFIX("ask|", screen_handle_askpass)
#undef IF_SIMPLE_PREFIX #undef IF_SIMPLE_PREFIX
} else { } else {
REPORT_ERROR("Unrecognized DCS @ code: 0x%x", screen->parser_buf[1]); REPORT_ERROR("Unrecognized DCS @ code: 0x%x", screen->parser_buf[1]);
}
} }
break; break;
default: default: