terminal: Accept utf-8 text drop

dev
Kristian Høgsberg 11 years ago
parent 938f102a97
commit 0749e3f470
  1. 34
      clients/terminal.c
  2. 10
      clients/window.c
  3. 3
      clients/window.h

@ -2128,6 +2128,37 @@ static const struct wl_data_source_listener data_source_listener = {
data_source_cancelled data_source_cancelled
}; };
static const char text_mime_type[] = "text/plain;charset=utf-8";
static void
data_handler(struct window *window,
struct input *input,
float x, float y, const char **types, void *data)
{
int i, has_text = 0;
if (!types)
return;
for (i = 0; types[i]; i++)
if (strcmp(types[i], text_mime_type) == 0)
has_text = 1;
if (!has_text) {
input_accept(input, NULL);
} else {
input_accept(input, text_mime_type);
}
}
static void
drop_handler(struct window *window, struct input *input,
int32_t x, int32_t y, void *data)
{
struct terminal *terminal = data;
input_receive_drag_data_to_fd(input, text_mime_type, terminal->master);
}
static void static void
fullscreen_handler(struct window *window, void *data) fullscreen_handler(struct window *window, void *data)
{ {
@ -2630,6 +2661,9 @@ terminal_create(struct display *display)
window_set_output_handler(terminal->window, output_handler); window_set_output_handler(terminal->window, output_handler);
window_set_close_handler(terminal->window, close_handler); window_set_close_handler(terminal->window, close_handler);
window_set_data_handler(terminal->window, data_handler);
window_set_drop_handler(terminal->window, drop_handler);
widget_set_redraw_handler(terminal->widget, redraw_handler); widget_set_redraw_handler(terminal->widget, redraw_handler);
widget_set_resize_handler(terminal->widget, resize_handler); widget_set_resize_handler(terminal->widget, resize_handler);
widget_set_button_handler(terminal->widget, button_handler); widget_set_button_handler(terminal->widget, button_handler);

@ -3796,6 +3796,16 @@ input_receive_drag_data(struct input *input, const char *mime_type,
input->drag_offer->y = input->sy; input->drag_offer->y = input->sy;
} }
int
input_receive_drag_data_to_fd(struct input *input,
const char *mime_type, int fd)
{
if (input->drag_offer)
wl_data_offer_receive(input->drag_offer->offer, mime_type, fd);
return 0;
}
int int
input_receive_selection_data(struct input *input, const char *mime_type, input_receive_selection_data(struct input *input, const char *mime_type,
data_func_t func, void *data) data_func_t func, void *data)

@ -555,6 +555,9 @@ input_accept(struct input *input, const char *type);
void void
input_receive_drag_data(struct input *input, const char *mime_type, input_receive_drag_data(struct input *input, const char *mime_type,
data_func_t func, void *user_data); data_func_t func, void *user_data);
int
input_receive_drag_data_to_fd(struct input *input,
const char *mime_type, int fd);
int int
input_receive_selection_data(struct input *input, const char *mime_type, input_receive_selection_data(struct input *input, const char *mime_type,

Loading…
Cancel
Save