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

Fix #761

Browse Source
This commit is contained in:
Kovid Goyal 2018-07-29 12:15:21 +05:30
parent 9bd9cf8052
commit 1ca49b9380
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glfw/ibus_glfw.c vendored
View File

@ -51,20 +51,6 @@ enum Capabilities {
IBUS_CAP_SURROUNDING_TEXT = 1 << 5 IBUS_CAP_SURROUNDING_TEXT = 1 << 5
}; };
// implement strdup ourselves because the various unix/libc flavors all
// require different sets of macros to make it available, and I cannot be
// bothered
static inline char*
strdup(const char *src) {
size_t len = strlen(src);
char *ans = malloc(len + 1);
if (ans) {
memcpy(ans, src, len);
ans[len] = 0;
}
return ans;
}
static inline GLFWbool static inline GLFWbool
test_env_var(const char *name, const char *val) { test_env_var(const char *name, const char *val) {
@ -173,7 +159,7 @@ get_ibus_address_file_name(void) {
const char *de = getenv("DISPLAY"); const char *de = getenv("DISPLAY");
if (!de || !de[0]) de = ":0.0"; if (!de || !de[0]) de = ":0.0";
char *display = strdup(de); char *display = _glfw_strdup(de);
const char *host = display; const char *host = display;
char *disp_num = strrchr(display, ':'); char *disp_num = strrchr(display, ':');
char *screen_num = strrchr(display, '.'); char *screen_num = strrchr(display, '.');
@ -237,7 +223,7 @@ read_ibus_address(_GLFWIBUSData *ibus) {
ibus->address_file_mtime = s.st_mtime; ibus->address_file_mtime = s.st_mtime;
if (found) { if (found) {
free((void*)ibus->address); free((void*)ibus->address);
ibus->address = strdup(buf + sizeof("IBUS_ADDRESS=") - 1); ibus->address = _glfw_strdup(buf + sizeof("IBUS_ADDRESS=") - 1);
return GLFW_TRUE; return GLFW_TRUE;
} }
_glfwInputError(GLFW_PLATFORM_ERROR, "Could not find IBUS_ADDRESS in %s", ibus->address_file_name); _glfwInputError(GLFW_PLATFORM_ERROR, "Could not find IBUS_ADDRESS in %s", ibus->address_file_name);
@ -254,7 +240,7 @@ input_context_created(DBusMessage *msg, const char* errmsg, void *data) {
if (!glfw_dbus_get_args(msg, "Failed to get IBUS context path from reply", DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) return; if (!glfw_dbus_get_args(msg, "Failed to get IBUS context path from reply", DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) return;
_GLFWIBUSData *ibus = (_GLFWIBUSData*)data; _GLFWIBUSData *ibus = (_GLFWIBUSData*)data;
free((void*)ibus->input_ctx_path); free((void*)ibus->input_ctx_path);
ibus->input_ctx_path = strdup(path); ibus->input_ctx_path = _glfw_strdup(path);
if (!ibus->input_ctx_path) return; if (!ibus->input_ctx_path) return;
dbus_bus_add_match(ibus->conn, "type='signal',interface='org.freedesktop.IBus.InputContext'", NULL); dbus_bus_add_match(ibus->conn, "type='signal',interface='org.freedesktop.IBus.InputContext'", NULL);
DBusObjectPathVTable ibus_vtable = {.message_function = message_handler}; DBusObjectPathVTable ibus_vtable = {.message_function = message_handler};
@ -274,7 +260,7 @@ setup_connection(_GLFWIBUSData *ibus) {
ibus->ok = GLFW_FALSE; ibus->ok = GLFW_FALSE;
if (!address_file_name) return GLFW_FALSE; if (!address_file_name) return GLFW_FALSE;
free((void*)ibus->address_file_name); free((void*)ibus->address_file_name);
ibus->address_file_name = strdup(address_file_name); ibus->address_file_name = _glfw_strdup(address_file_name);
if (!read_ibus_address(ibus)) return GLFW_FALSE; if (!read_ibus_address(ibus)) return GLFW_FALSE;
if (ibus->conn) { if (ibus->conn) {
glfw_dbus_close_connection(ibus->conn); glfw_dbus_close_connection(ibus->conn);