Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-02 07:26:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Wayland: slightly simpler code for IM support

Browse Source
This commit is contained in:
ManoloFLTK
2024-04-26 07:21:12 +02:00
parent 85315ee598
commit c82fde7292
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
+7 -11
View File
@@ -618,12 +618,9 @@ static char *pending_pre_edit = NULL;
static char *pending_commit = NULL; static char *pending_commit = NULL;
static void send_commit() { static void send_commit(struct zwp_text_input_v3 *zwp_text_input_v3) {
Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver(); zwp_text_input_v3_commit(zwp_text_input_v3);
if (scr_driver->seat->text_input) { commit_serial++;
zwp_text_input_v3_commit(scr_driver->seat->text_input);
commit_serial++;
}
} }
@@ -653,7 +650,7 @@ void Fl_Wayland_Screen_Driver::insertion_point_location(int x, int y, int height
zwp_text_input_v3_set_cursor_rectangle(scr_driver->seat->text_input, zwp_text_input_v3_set_cursor_rectangle(scr_driver->seat->text_input,
insertion_point_x, insertion_point_y, insertion_point_x, insertion_point_y,
insertion_point_width, insertion_point_height); insertion_point_width, insertion_point_height);
send_commit(); send_commit(scr_driver->seat->text_input);
} }
} }
} }
@@ -895,7 +892,7 @@ void text_input_enter(void *data, struct zwp_text_input_v3 *zwp_text_input_v3,
if (Fl_Wayland_Screen_Driver::insertion_point_location(&x, &y, &width, &height)) { if (Fl_Wayland_Screen_Driver::insertion_point_location(&x, &y, &width, &height)) {
zwp_text_input_v3_set_cursor_rectangle(zwp_text_input_v3, x, y, width, height); zwp_text_input_v3_set_cursor_rectangle(zwp_text_input_v3, x, y, width, height);
} }
send_commit(); send_commit(zwp_text_input_v3);
} }
@@ -904,7 +901,7 @@ void text_input_leave(void *data, struct zwp_text_input_v3 *zwp_text_input_v3,
//puts("text_input_leave"); //puts("text_input_leave");
zwp_text_input_v3_disable(zwp_text_input_v3); zwp_text_input_v3_disable(zwp_text_input_v3);
zwp_text_input_v3_set_user_data(zwp_text_input_v3, NULL); zwp_text_input_v3_set_user_data(zwp_text_input_v3, NULL);
send_commit(); send_commit(zwp_text_input_v3);
free(pending_pre_edit); pending_pre_edit = NULL; free(pending_pre_edit); pending_pre_edit = NULL;
free(current_pre_edit); current_pre_edit = NULL; free(current_pre_edit); current_pre_edit = NULL;
free(pending_commit); pending_commit = NULL; free(pending_commit); pending_commit = NULL;
@@ -920,6 +917,7 @@ static void send_text_to_fltk(const char *text, bool is_marked, struct wl_surfac
set_event_xy(win); set_event_xy(win);
Fl::e_is_click = 0; Fl::e_is_click = 0;
if (is_marked) { // goes to widget as marked text if (is_marked) { // goes to widget as marked text
Fl_Wayland_Screen_Driver::next_marked_length = Fl::e_length;
Fl::handle(FL_KEYDOWN, win); Fl::handle(FL_KEYDOWN, win);
} else if (text) { } else if (text) {
Fl_Wayland_Screen_Driver::next_marked_length = 0; Fl_Wayland_Screen_Driver::next_marked_length = 0;
@@ -937,7 +935,6 @@ void text_input_preedit_string(void *data, struct zwp_text_input_v3 *zwp_text_in
//printf("text_input_preedit_string %s cursor_begin=%d cursor_end=%d\n",text, cursor_begin, cursor_end); //printf("text_input_preedit_string %s cursor_begin=%d cursor_end=%d\n",text, cursor_begin, cursor_end);
free(pending_pre_edit); free(pending_pre_edit);
pending_pre_edit = text ? strdup(text) : NULL; pending_pre_edit = text ? strdup(text) : NULL;
Fl_Wayland_Screen_Driver::next_marked_length = text ? (int)strlen(text) : 0;
} }
@@ -946,7 +943,6 @@ void text_input_commit_string(void *data, struct zwp_text_input_v3 *zwp_text_inp
//printf("text_input_commit_string %s\n",text); //printf("text_input_commit_string %s\n",text);
free(pending_commit); free(pending_commit);
pending_commit = text ? strdup(text) : NULL; pending_commit = text ? strdup(text) : NULL;
Fl_Wayland_Screen_Driver::next_marked_length = 0;
} }