#include <wayland-cursor.h>
#include <xkbcommon/xkbcommon.h>
#include "eloop.h"
-#include "log.h"
+#include "shl_array.h"
#include "shl_dlist.h"
#include "shl_hook.h"
+#include "shl_log.h"
#include "shl_misc.h"
#include "tsm_vte.h"
+#include "wlt_main.h"
#include "wlt_toolkit.h"
#define LOG_SUBSYSTEM "wlt_toolkit"
STATE_HUP,
};
+struct data_offer {
+ unsigned long ref;
+ struct wl_data_offer *w_offer;
+ struct wlt_display *disp;
+ struct shl_array *types;
+};
+
struct wlt_display {
unsigned long ref;
struct ev_eloop *eloop;
struct wl_global_listener *dp_listener;
struct shl_hook *listeners;
unsigned int state;
+ struct wl_registry *w_registry;
struct shl_dlist window_list;
struct wlt_window *keyboard_focus;
struct ev_timer *repeat_timer;
uint32_t repeat_sym;
+ uint32_t repeat_ascii;
+
+ struct wl_data_device_manager *w_manager;
+ struct wl_data_device *w_data_dev;
+ struct data_offer *drag_offer;
+ struct data_offer *selection_offer;
};
struct wlt_window {
bool buffer_attached;
bool skip_damage;
bool need_resize;
- bool need_redraw;
bool need_frame;
bool idle_pending;
unsigned int new_width;
wl_surface_attach(disp->w_cursor_surface, buffer, 0, 0);
wl_surface_damage(disp->w_cursor_surface, 0, 0,
image->width, image->height);
+ wl_surface_commit(disp->w_cursor_surface);
}
-static int dp_mask_update(uint32_t mask, void *data)
+static void dp_dispatch(struct wlt_display *disp, bool nonblock)
{
- struct wlt_display *disp = data;
int ret;
- int mode;
- if (!disp->dp_fd)
- return 0;
+ errno = 0;
+ if (nonblock)
+ ret = wl_display_dispatch_pending(disp->dp);
+ else
+ ret = wl_display_dispatch(disp->dp);
- mode = 0;
- if (mask & WL_DISPLAY_READABLE)
- mode |= EV_READABLE;
- if (mask & WL_DISPLAY_WRITABLE)
- mode |= EV_WRITEABLE;
+ if (ret == -1) {
+ log_error("error during wayland dispatch (%d): %m", errno);
+ return;
+ } else if (errno == EAGAIN) {
+ ret = ev_fd_update(disp->dp_fd, EV_READABLE | EV_WRITEABLE);
+ if (ret)
+ log_warning("cannot update wayland-fd event-polling modes (%d)",
+ ret);
+ } else {
+ ret = ev_fd_update(disp->dp_fd, EV_READABLE);
+ if (ret)
+ log_warning("cannot update wayland-fd event-polling modes (%d)",
+ ret);
+ }
+}
- ret = ev_fd_update(disp->dp_fd, mode);
- if (ret)
- log_warning("cannot update wayland-fd event-polling modes (%d)",
- ret);
+static void dp_pre_event(struct ev_eloop *eloop, void *unused, void *data)
+{
+ struct wlt_display *disp = data;
- return 0;
+ dp_dispatch(disp, true);
}
static void dp_event(struct ev_fd *fd, int mask, void *data)
{
struct wlt_display *disp = data;
- int mode;
if (mask & (EV_HUP | EV_ERR)) {
log_warning("HUP/ERR on wayland socket");
return;
}
- mode = 0;
if (mask & EV_READABLE)
- mode |= WL_DISPLAY_READABLE;
- if (mask & EV_WRITEABLE)
- mode |= WL_DISPLAY_WRITABLE;
-
- if (mode)
- wl_display_iterate(disp->dp, mode);
+ dp_dispatch(disp, false);
+ else
+ dp_dispatch(disp, true);
}
static void pointer_enter(void *data, struct wl_pointer *w_pointer,
return;
}
- disp->xkb_keymap = xkb_map_new_from_string(disp->xkb_ctx, map,
- XKB_KEYMAP_FORMAT_TEXT_V1,
- 0);
+ disp->xkb_keymap = xkb_keymap_new_from_string(disp->xkb_ctx, map,
+ XKB_KEYMAP_FORMAT_TEXT_V1,
+ 0);
munmap(map, size);
close(fd);
disp->xkb_state = xkb_state_new(disp->xkb_keymap);
if (!disp->xkb_state) {
log_error("cannot create XKB state object");
- xkb_map_unref(disp->xkb_keymap);
+ xkb_keymap_unref(disp->xkb_keymap);
disp->xkb_keymap = NULL;
return;
}
{
struct wlt_display *disp = data;
struct wlt_window *wnd = disp->keyboard_focus;
- uint32_t code, num_syms;
+ uint32_t code, num_syms, ascii;
unsigned int mask;
enum wl_keyboard_key_state state = state_w;
const xkb_keysym_t *syms;
return;
mask = shl_get_xkb_mods(disp->xkb_state);
- num_syms = xkb_key_get_syms(disp->xkb_state, code, &syms);
+ num_syms = xkb_state_key_get_syms(disp->xkb_state, code, &syms);
+ ascii = shl_get_ascii(disp->xkb_state, code, syms, num_syms);
sym = XKB_KEY_NoSymbol;
if (num_syms == 1)
sym = syms[0];
shl_dlist_for_each(iter, &wnd->widget_list) {
widget = shl_dlist_entry(iter, struct wlt_widget, list);
if (widget->keyboard_cb) {
- if (widget->keyboard_cb(widget, mask, sym, state,
+ if (widget->keyboard_cb(widget, mask, sym, ascii, state,
handled, widget->data))
handled = true;
}
}
- if (state == WL_KEYBOARD_KEY_STATE_RELEASED &&
- sym == disp->repeat_sym) {
+ if (state == WL_KEYBOARD_KEY_STATE_RELEASED) {
ev_timer_update(disp->repeat_timer, NULL);
} else if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
disp->repeat_sym = sym;
+ disp->repeat_ascii = ascii;
spec.it_interval.tv_sec = 0;
- spec.it_interval.tv_nsec = 25 * 1000000;
+ spec.it_interval.tv_nsec = wlt_conf.xkb_repeat_rate * 1000000;
spec.it_value.tv_sec = 0;
- spec.it_value.tv_nsec = 250 * 1000000;
+ spec.it_value.tv_nsec = wlt_conf.xkb_repeat_delay * 1000000;
ev_timer_update(disp->repeat_timer, &spec);
}
}
widget = shl_dlist_entry(iter, struct wlt_widget, list);
if (widget->keyboard_cb) {
if (widget->keyboard_cb(widget, mask, disp->repeat_sym,
+ disp->repeat_ascii,
WL_KEYBOARD_KEY_STATE_PRESSED,
handled, widget->data))
handled = true;
.modifiers = keyboard_modifiers,
};
+static void data_offer_unref(struct data_offer *offer)
+{
+ unsigned int i, len;
+
+ if (!offer || !offer->ref || --offer->ref)
+ return;
+
+ len = shl_array_get_length(offer->types);
+ for (i = 0; i < len; ++i)
+ free(*SHL_ARRAY_AT(offer->types, char*, i));
+ shl_array_free(offer->types);
+ wl_data_offer_destroy(offer->w_offer);
+ free(offer);
+}
+
+static void data_offer_offer(void *data, struct wl_data_offer *w_offer,
+ const char *type)
+{
+ char *tmp;
+ int ret;
+ struct data_offer *offer = wl_data_offer_get_user_data(w_offer);
+
+ tmp = strdup(type);
+ if (!tmp)
+ return;
+
+ ret = shl_array_push(offer->types, &tmp);
+ if (ret) {
+ free(tmp);
+ return;
+ }
+}
+
+static const struct wl_data_offer_listener data_offer_listener = {
+ .offer = data_offer_offer,
+};
+
+static void data_dev_data_offer(void *data, struct wl_data_device *w_dev,
+ struct wl_data_offer *w_offer)
+{
+ struct data_offer *offer;
+ struct wlt_display *disp = data;
+ int ret;
+
+ offer = malloc(sizeof(*offer));
+ if (!offer) {
+ wl_data_offer_destroy(w_offer);
+ return;
+ }
+ memset(offer, 0, sizeof(*offer));
+ offer->ref = 1;
+ offer->w_offer = w_offer;
+ offer->disp = disp;
+
+ ret = shl_array_new(&offer->types, sizeof(char*), 4);
+ if (ret) {
+ wl_data_offer_destroy(w_offer);
+ free(offer);
+ return;
+ }
+
+ wl_data_offer_add_listener(w_offer, &data_offer_listener, offer);
+ wl_data_offer_set_user_data(w_offer, offer);
+}
+
+static void data_dev_enter(void *data, struct wl_data_device *w_dev,
+ uint32_t serial, struct wl_surface *w_surface,
+ wl_fixed_t x, wl_fixed_t y,
+ struct wl_data_offer *w_offer)
+{
+ struct wlt_display *disp = data;
+
+ if (disp->drag_offer) {
+ data_offer_unref(disp->drag_offer);
+ disp->drag_offer = NULL;
+ }
+
+ if (!w_offer)
+ return;
+
+ disp->drag_offer = wl_data_offer_get_user_data(w_offer);
+}
+
+static void data_dev_leave(void *data, struct wl_data_device *w_dev)
+{
+ struct wlt_display *disp = data;
+
+ if (disp->drag_offer) {
+ data_offer_unref(disp->drag_offer);
+ disp->drag_offer = NULL;
+ }
+}
+
+static void data_dev_motion(void *data, struct wl_data_device *w_dev,
+ uint32_t time, wl_fixed_t x, wl_fixed_t y)
+{
+}
+
+static void data_dev_drop(void *data, struct wl_data_device *w_dev)
+{
+}
+
+static void data_dev_selection(void *data, struct wl_data_device *w_dev,
+ struct wl_data_offer *w_offer)
+{
+ struct wlt_display *disp = data;
+
+ if (disp->selection_offer) {
+ data_offer_unref(disp->selection_offer);
+ disp->selection_offer = NULL;
+ }
+
+ if (!w_offer)
+ return;
+
+ disp->selection_offer = wl_data_offer_get_user_data(w_offer);
+}
+
+int wlt_display_get_selection_to_fd(struct wlt_display *disp, const char *mime,
+ int output_fd)
+{
+ unsigned int i, num;
+ struct data_offer *offer;
+
+ if (!disp || !mime)
+ return -EINVAL;
+ if (!disp->selection_offer)
+ return -ENOENT;
+
+ offer = disp->selection_offer;
+ num = shl_array_get_length(offer->types);
+ for (i = 0; i < num; ++i) {
+ if (!strcmp(mime, *SHL_ARRAY_AT(offer->types, char*, i)))
+ break;
+ }
+
+ if (i == num)
+ return -EAGAIN;
+
+ wl_data_offer_receive(offer->w_offer, mime, output_fd);
+ return 0;
+}
+
+int wlt_display_get_selection_fd(struct wlt_display *disp, const char *mime)
+{
+ int p[2], ret;
+
+ if (pipe2(p, O_CLOEXEC | O_NONBLOCK))
+ return -EFAULT;
+
+ ret = wlt_display_get_selection_to_fd(disp, mime, p[1]);
+ close(p[1]);
+
+ if (ret) {
+ close(p[0]);
+ return ret;
+ }
+
+ return p[0];
+}
+
+int wlt_display_new_data_source(struct wlt_display *disp,
+ struct wl_data_source **out)
+{
+ struct wl_data_source *src;
+
+ if (!disp)
+ return -EINVAL;
+
+ src = wl_data_device_manager_create_data_source(disp->w_manager);
+ if (!src)
+ return -EFAULT;
+
+ *out = src;
+ return 0;
+}
+
+void wlt_display_set_selection(struct wlt_display *disp,
+ struct wl_data_source *selection)
+{
+ if (!disp)
+ return;
+
+ wl_data_device_set_selection(disp->w_data_dev, selection,
+ disp->last_serial);
+}
+
+static const struct wl_data_device_listener data_dev_listener = {
+ .data_offer = data_dev_data_offer,
+ .enter = data_dev_enter,
+ .leave = data_dev_leave,
+ .motion = data_dev_motion,
+ .drop = data_dev_drop,
+ .selection = data_dev_selection,
+};
+
static void check_ready(struct wlt_display *disp)
{
if (disp->state > STATE_INIT)
disp->w_shell &&
disp->w_shm &&
disp->w_pointer &&
- disp->w_keyboard) {
+ disp->w_keyboard &&
+ disp->w_manager) {
log_debug("wayland display initialized");
load_cursors(disp);
+ disp->w_data_dev = wl_data_device_manager_get_data_device(
+ disp->w_manager, disp->w_seat);
+ wl_data_device_add_listener(disp->w_data_dev,
+ &data_dev_listener,
+ disp);
+
disp->state = STATE_RUNNING;
shl_hook_call(disp->listeners, disp, (void*)WLT_DISPLAY_READY);
}
.capabilities = seat_capabilities,
};
-static void dp_global(struct wl_display *dp, uint32_t id, const char *iface,
- uint32_t version, void *data)
+static void dp_global(void *data, struct wl_registry *registry, uint32_t id,
+ const char *iface, uint32_t version)
{
struct wlt_display *disp = data;
log_error("global wl_compositor advertised twice");
return;
}
- disp->w_comp = wl_display_bind(disp->dp,
- id,
- &wl_compositor_interface);
+ disp->w_comp = wl_registry_bind(disp->w_registry,
+ id,
+ &wl_compositor_interface,
+ 1);
if (!disp->w_comp) {
log_error("cannot bind wl_compositor object");
return;
log_error("global wl_seat advertised twice");
return;
}
- disp->w_seat = wl_display_bind(disp->dp,
- id,
- &wl_seat_interface);
+ disp->w_seat = wl_registry_bind(disp->w_registry,
+ id,
+ &wl_seat_interface,
+ 1);
if (!disp->w_seat) {
log_error("cannot bind wl_seat object");
return;
log_error("global wl_shell advertised twice");
return;
}
- disp->w_shell = wl_display_bind(disp->dp,
- id,
- &wl_shell_interface);
+ disp->w_shell = wl_registry_bind(disp->w_registry,
+ id,
+ &wl_shell_interface,
+ 1);
if (!disp->w_shell) {
log_error("cannot bind wl_shell object");
return;
log_error("global wl_shm advertised twice");
return;
}
- disp->w_shm = wl_display_bind(disp->dp,
- id,
- &wl_shm_interface);
+ disp->w_shm = wl_registry_bind(disp->w_registry,
+ id,
+ &wl_shm_interface,
+ 1);
if (!disp->w_shm) {
log_error("cannot bind wl_shm object");
return;
}
+ } else if (!strcmp(iface, "wl_data_device_manager")) {
+ if (disp->w_manager) {
+ log_error("global wl_data_device_manager advertised twice");
+ return;
+ }
+ disp->w_manager = wl_registry_bind(disp->w_registry,
+ id,
+ &wl_data_device_manager_interface,
+ 1);
+ if (!disp->w_manager) {
+ log_error("cannot bind wl_data_device_manager_object");
+ return;
+ }
} else {
log_debug("ignoring new unknown global %s", iface);
return;
check_ready(disp);
}
+static const struct wl_registry_listener registry_listener = {
+ .global = dp_global,
+ /* TODO: handle .global_remove */
+};
+
int wlt_display_new(struct wlt_display **out,
struct ev_eloop *eloop)
{
struct wlt_display *disp;
- int ret;
+ int ret, fd;
if (!out || !eloop)
return -EINVAL;
goto err_listener;
}
+ fd = wl_display_get_fd(disp->dp);
+ if (fd < 0) {
+ log_error("cannot retrieve wayland FD");
+ ret = -EFAULT;
+ goto err_dp;
+ }
+
+ /* TODO: nonblocking wl_display doesn't work, yet. fix that upstream */
+ /*
+ int set;
+ set = fcntl(fd, F_GETFL);
+ if (set < 0) {
+ log_error("cannot retrieve file flags for wayland FD (%d): %m",
+ errno);
+ ret = -EFAULT;
+ goto err_dp;
+ }
+
+ set |= O_NONBLOCK;
+ ret = fcntl(fd, F_SETFL, set);
+ if (ret) {
+ log_error("cannot set file flags for wayland FD (%d): %m",
+ errno);
+ ret = -EFAULT;
+ goto err_dp;
+ }*/
+
ret = ev_eloop_new_fd(eloop,
&disp->dp_fd,
- wl_display_get_fd(disp->dp,
- dp_mask_update,
- disp),
+ fd,
EV_READABLE,
dp_event,
disp);
goto err_dp;
}
+ ret = ev_eloop_register_pre_cb(eloop, dp_pre_event, disp);
+ if (ret) {
+ log_error("cannot register pre-cb (%d)", ret);
+ goto err_dp_fd;
+ }
+
ret = ev_eloop_new_timer(eloop, &disp->repeat_timer, NULL,
repeat_event, disp);
if (ret) {
log_error("cannot create repeat-timer");
- goto err_dp_fd;
+ goto err_pre_cb;
}
- disp->dp_listener = wl_display_add_global_listener(disp->dp,
- dp_global,
- disp);
- if (!disp->dp_listener) {
- log_error("cannot add wayland global listener (%d)", errno);
+ disp->w_registry = wl_display_get_registry(disp->dp);
+ if (!disp->w_registry) {
+ log_error("cannot get wayland registry object");
goto err_timer;
}
+ wl_registry_add_listener(disp->w_registry, ®istry_listener, disp);
+
disp->xkb_ctx = xkb_context_new(0);
if (!disp->xkb_ctx) {
log_error("cannot create XKB context");
err_timer:
ev_eloop_rm_timer(disp->repeat_timer);
+err_pre_cb:
+ ev_eloop_unregister_pre_cb(disp->eloop, dp_pre_event, disp);
err_dp_fd:
ev_eloop_rm_fd(disp->dp_fd);
err_dp:
return;
unload_cursors(disp);
- wl_display_remove_global_listener(disp->dp, disp->dp_listener);
wl_display_flush(disp->dp);
wl_display_disconnect(disp->dp);
ev_eloop_rm_timer(disp->repeat_timer);
+ ev_eloop_unregister_pre_cb(disp->eloop, dp_pre_event, disp);
ev_eloop_rm_fd(disp->dp_fd);
xkb_context_unref(disp->xkb_ctx);
shl_hook_free(disp->listeners);
if (!disp)
return -EINVAL;
- return shl_hook_add_cast(disp->listeners, cb, data);
+ return shl_hook_add_cast(disp->listeners, cb, data, false);
}
void wlt_display_unregister_cb(struct wlt_display *disp,
wl_surface_damage(wnd->w_surface, 0, 0, wnd->buffer.width,
wnd->buffer.height);
+ wl_surface_commit(wnd->w_surface);
}
static int resize_window(struct wlt_window *wnd, unsigned int width,
- unsigned int height, bool force_redraw)
+ unsigned int height)
{
struct shl_dlist *iter;
struct wlt_widget *widget;
if (width == wnd->buffer.width &&
height == wnd->buffer.height) {
- if (force_redraw)
- wlt_window_do_redraw(wnd, width, height);
+ wlt_window_do_redraw(wnd, width, height);
return 0;
}
static void do_frame(struct wlt_window *wnd)
{
- bool force;
-
- wnd->idle_pending = false;
- ev_eloop_unregister_idle_cb(wnd->disp->eloop, idle_frame, wnd);
+ ev_eloop_unregister_idle_cb(wnd->disp->eloop, idle_frame, wnd,
+ EV_NORMAL);
if (wnd->need_resize) {
- force = wnd->need_redraw;
wnd->need_frame = true;
wnd->need_resize = false;
- wnd->need_redraw = false;
- resize_window(wnd, wnd->new_width, wnd->new_height, force);
- }
-
- if (wnd->need_redraw) {
+ wnd->w_frame = wl_surface_frame(wnd->w_surface);
+ wl_callback_add_listener(wnd->w_frame,
+ &frame_callback_listener, wnd);
+ resize_window(wnd, wnd->new_width, wnd->new_height);
+ } else {
wnd->need_frame = true;
- wnd->need_redraw = false;
- wlt_window_do_redraw(wnd, wnd->buffer.width,
- wnd->buffer.height);
- }
-
- if (wnd->need_frame) {
wnd->w_frame = wl_surface_frame(wnd->w_surface);
wl_callback_add_listener(wnd->w_frame,
&frame_callback_listener, wnd);
+ wlt_window_do_redraw(wnd, wnd->buffer.width,
+ wnd->buffer.height);
}
}
+static void schedule_frame(struct wlt_window *wnd);
+
static void frame_callback(void *data, struct wl_callback *w_callback,
uint32_t time)
{
wl_callback_destroy(w_callback);
wnd->w_frame = NULL;
- wnd->need_frame = false;
- do_frame(wnd);
+ wnd->idle_pending = false;
+ if (wnd->need_frame)
+ schedule_frame(wnd);
}
static void idle_frame(struct ev_eloop *eloop, void *unused, void *data)
{
int ret;
- if (!wnd || wnd->w_frame)
+ if (!wnd)
return;
- if (wnd->need_frame || wnd->idle_pending)
+ wnd->need_frame = true;
+
+ if (wnd->idle_pending)
return;
- ret = ev_eloop_register_idle_cb(wnd->disp->eloop, idle_frame, wnd);
+ ret = ev_eloop_register_idle_cb(wnd->disp->eloop, idle_frame, wnd,
+ EV_NORMAL);
if (ret)
log_error("cannot schedule idle callback: %d", ret);
else
{
struct wlt_window *wnd = data;
- ev_eloop_unregister_idle_cb(eloop, close_window, wnd);
+ ev_eloop_unregister_idle_cb(eloop, close_window, wnd, EV_NORMAL);
wnd->close_pending = false;
if (wnd->close_cb)
&shell_surface_listener, wnd);
wl_shell_surface_set_toplevel(wnd->w_shell_surface);
- ret = resize_window(wnd, width, height, true);
+ ret = resize_window(wnd, width, height);
if (ret)
goto err_shell_surface;
if (wnd->close_pending)
ev_eloop_unregister_idle_cb(wnd->disp->eloop, close_window,
- wnd);
+ wnd, EV_NORMAL);
if (wnd->idle_pending)
- ev_eloop_unregister_idle_cb(wnd->disp->eloop, idle_frame, wnd);
+ ev_eloop_unregister_idle_cb(wnd->disp->eloop, idle_frame, wnd,
+ EV_NORMAL);
shl_dlist_unlink(&wnd->list);
if (wnd->w_frame)
wl_callback_destroy(wnd->w_frame);
if (!wnd)
return;
- wnd->need_redraw = true;
schedule_frame(wnd);
}
wl_surface_damage(wnd->w_surface, damage->x, damage->y,
damage->width, damage->height);
+ wl_surface_commit(wnd->w_surface);
}
void wlt_window_get_buffer(struct wlt_window *wnd,
return;
wnd->close_pending = true;
- ev_eloop_register_idle_cb(wnd->disp->eloop, close_window, wnd);
+ ev_eloop_register_idle_cb(wnd->disp->eloop, close_window, wnd,
+ EV_NORMAL);
}
void wlt_window_toggle_maximize(struct wlt_window *wnd)
wnd->maximized = !wnd->maximized;
}
+bool wlt_window_is_maximized(struct wlt_window *wnd)
+{
+ return wnd && wnd->maximized;
+}
+
void wlt_window_toggle_fullscreen(struct wlt_window *wnd)
{
if (!wnd)
wnd->fullscreen = !wnd->fullscreen;
}
+bool wlt_window_is_fullscreen(struct wlt_window *wnd)
+{
+ return wnd && wnd->fullscreen;
+}
+
struct ev_eloop *wlt_window_get_eloop(struct wlt_window *wnd)
{
if (!wnd)
projects / platform / upstream / kmscon.git / blobdiff