2019-06-19 10:04:47 +02:00
|
|
|
#include "input.h"
|
|
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <signal.h>
|
|
|
|
|
#include <threads.h>
|
2019-07-09 10:00:54 +02:00
|
|
|
#include <locale.h>
|
2020-07-15 13:34:32 +02:00
|
|
|
#include <errno.h>
|
2019-06-19 10:04:47 +02:00
|
|
|
#include <sys/mman.h>
|
2019-07-17 21:30:57 +02:00
|
|
|
#include <sys/time.h>
|
2019-08-05 19:33:01 +02:00
|
|
|
#include <sys/timerfd.h>
|
2020-02-29 12:52:55 +01:00
|
|
|
#include <sys/epoll.h>
|
2020-07-15 13:34:32 +02:00
|
|
|
#include <fcntl.h>
|
2019-06-19 10:04:47 +02:00
|
|
|
|
2019-07-10 14:17:44 +02:00
|
|
|
#include <linux/input-event-codes.h>
|
|
|
|
|
|
2019-06-19 10:04:47 +02:00
|
|
|
#include <xkbcommon/xkbcommon.h>
|
|
|
|
|
#include <xkbcommon/xkbcommon-keysyms.h>
|
2019-07-09 10:00:54 +02:00
|
|
|
#include <xkbcommon/xkbcommon-compose.h>
|
2019-06-19 10:04:47 +02:00
|
|
|
|
2020-02-25 20:31:13 +01:00
|
|
|
#include <xdg-shell.h>
|
|
|
|
|
|
2019-06-19 10:04:47 +02:00
|
|
|
#define LOG_MODULE "input"
|
2019-07-03 20:21:03 +02:00
|
|
|
#define LOG_ENABLE_DBG 0
|
2019-06-19 10:04:47 +02:00
|
|
|
#include "log.h"
|
2020-03-02 18:42:49 +01:00
|
|
|
#include "config.h"
|
2019-07-09 16:26:36 +02:00
|
|
|
#include "commands.h"
|
2019-08-27 17:23:28 +02:00
|
|
|
#include "keymap.h"
|
2020-08-07 20:42:34 +01:00
|
|
|
#include "macros.h"
|
2020-03-02 20:29:28 +01:00
|
|
|
#include "quirks.h"
|
2019-08-27 17:23:28 +02:00
|
|
|
#include "render.h"
|
|
|
|
|
#include "search.h"
|
2019-07-11 09:51:51 +02:00
|
|
|
#include "selection.h"
|
2020-07-15 13:34:32 +02:00
|
|
|
#include "spawn.h"
|
2019-08-27 17:23:28 +02:00
|
|
|
#include "terminal.h"
|
2020-07-15 13:34:32 +02:00
|
|
|
#include "tokenize.h"
|
2020-05-01 11:46:24 +02:00
|
|
|
#include "util.h"
|
2019-07-15 15:42:21 +02:00
|
|
|
#include "vt.h"
|
2020-08-08 20:34:30 +01:00
|
|
|
#include "xmalloc.h"
|
2019-06-19 10:04:47 +02:00
|
|
|
|
2020-07-15 13:34:32 +02:00
|
|
|
struct pipe_context {
|
|
|
|
|
char *text;
|
|
|
|
|
size_t idx;
|
|
|
|
|
size_t left;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
fdm_write_pipe(struct fdm *fdm, int fd, int events, void *data)
|
|
|
|
|
{
|
|
|
|
|
struct pipe_context *ctx = data;
|
|
|
|
|
|
|
|
|
|
if (events & EPOLLHUP)
|
|
|
|
|
goto pipe_closed;
|
|
|
|
|
|
|
|
|
|
assert(events & EPOLLOUT);
|
|
|
|
|
ssize_t written = write(fd, &ctx->text[ctx->idx], ctx->left);
|
|
|
|
|
|
|
|
|
|
if (written < 0) {
|
|
|
|
|
LOG_WARN("failed to write to pipe: %s", strerror(errno));
|
|
|
|
|
goto pipe_closed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert(written <= ctx->left);
|
|
|
|
|
ctx->idx += written;
|
|
|
|
|
ctx->left -= written;
|
|
|
|
|
|
|
|
|
|
if (ctx->left == 0)
|
|
|
|
|
goto pipe_closed;
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
pipe_closed:
|
|
|
|
|
free(ctx->text);
|
|
|
|
|
free(ctx);
|
|
|
|
|
fdm_del(fdm, fd);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-22 13:35:36 +02:00
|
|
|
static bool
|
2020-07-08 18:41:09 +02:00
|
|
|
execute_binding(struct seat *seat, struct terminal *term,
|
2020-07-30 18:53:51 +02:00
|
|
|
enum bind_action_normal action, char *const *pipe_argv,
|
2020-07-15 13:34:32 +02:00
|
|
|
uint32_t serial)
|
2020-03-08 12:08:46 +01:00
|
|
|
{
|
2020-08-11 10:53:21 +02:00
|
|
|
const bool cursor_is_on_grid = seat->mouse.col >= 0 && seat->mouse.row >= 0;
|
|
|
|
|
|
2020-03-08 12:08:46 +01:00
|
|
|
switch (action) {
|
2020-03-12 10:46:27 +01:00
|
|
|
case BIND_ACTION_NONE:
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-12 10:46:27 +01:00
|
|
|
|
2020-03-08 15:17:29 +01:00
|
|
|
case BIND_ACTION_SCROLLBACK_UP:
|
2020-09-10 18:17:47 +02:00
|
|
|
case BIND_ACTION_SCROLLBACK_UP_PAGE:
|
2020-03-08 15:17:29 +01:00
|
|
|
cmd_scrollback_up(term, term->rows);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-08 15:17:29 +01:00
|
|
|
|
2020-09-10 18:17:47 +02:00
|
|
|
case BIND_ACTION_SCROLLBACK_UP_HALF_PAGE:
|
2020-09-09 19:40:48 +02:00
|
|
|
cmd_scrollback_up(term, max(term->rows / 2, 1));
|
|
|
|
|
return true;
|
|
|
|
|
|
2020-09-10 18:17:47 +02:00
|
|
|
case BIND_ACTION_SCROLLBACK_UP_LINE:
|
|
|
|
|
cmd_scrollback_up(term, 1);
|
|
|
|
|
return true;
|
|
|
|
|
|
2020-03-08 15:17:29 +01:00
|
|
|
case BIND_ACTION_SCROLLBACK_DOWN:
|
2020-09-10 18:17:47 +02:00
|
|
|
case BIND_ACTION_SCROLLBACK_DOWN_PAGE:
|
2020-03-08 15:17:29 +01:00
|
|
|
cmd_scrollback_down(term, term->rows);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-08 15:17:29 +01:00
|
|
|
|
2020-09-10 18:17:47 +02:00
|
|
|
case BIND_ACTION_SCROLLBACK_DOWN_HALF_PAGE:
|
2020-09-09 19:40:48 +02:00
|
|
|
cmd_scrollback_down(term, max(term->rows / 2, 1));
|
|
|
|
|
return true;
|
|
|
|
|
|
2020-09-10 18:17:47 +02:00
|
|
|
case BIND_ACTION_SCROLLBACK_DOWN_LINE:
|
|
|
|
|
cmd_scrollback_down(term, 1);
|
|
|
|
|
return true;
|
|
|
|
|
|
2020-03-08 12:08:46 +01:00
|
|
|
case BIND_ACTION_CLIPBOARD_COPY:
|
2020-07-08 18:41:09 +02:00
|
|
|
selection_to_clipboard(seat, term, serial);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-08 12:08:46 +01:00
|
|
|
|
|
|
|
|
case BIND_ACTION_CLIPBOARD_PASTE:
|
2020-07-08 18:41:09 +02:00
|
|
|
selection_from_clipboard(seat, term, serial);
|
2020-03-08 12:08:46 +01:00
|
|
|
term_reset_view(term);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-08 12:08:46 +01:00
|
|
|
|
|
|
|
|
case BIND_ACTION_PRIMARY_PASTE:
|
2020-07-08 18:41:09 +02:00
|
|
|
selection_from_primary(seat, term);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-08 12:08:46 +01:00
|
|
|
|
|
|
|
|
case BIND_ACTION_SEARCH_START:
|
|
|
|
|
search_begin(term);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-08 12:08:46 +01:00
|
|
|
|
2020-03-08 15:17:29 +01:00
|
|
|
case BIND_ACTION_FONT_SIZE_UP:
|
|
|
|
|
term_font_size_increase(term);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-08 15:17:29 +01:00
|
|
|
|
|
|
|
|
case BIND_ACTION_FONT_SIZE_DOWN:
|
|
|
|
|
term_font_size_decrease(term);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-08 15:17:29 +01:00
|
|
|
|
|
|
|
|
case BIND_ACTION_FONT_SIZE_RESET:
|
|
|
|
|
term_font_size_reset(term);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-08 15:17:29 +01:00
|
|
|
|
|
|
|
|
case BIND_ACTION_SPAWN_TERMINAL:
|
|
|
|
|
term_spawn_new(term);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-08 15:17:29 +01:00
|
|
|
|
2020-03-12 09:34:09 +01:00
|
|
|
case BIND_ACTION_MINIMIZE:
|
|
|
|
|
xdg_toplevel_set_minimized(term->window->xdg_toplevel);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-12 09:34:09 +01:00
|
|
|
|
|
|
|
|
case BIND_ACTION_MAXIMIZE:
|
2020-03-12 17:47:53 +01:00
|
|
|
if (term->window->is_fullscreen)
|
|
|
|
|
xdg_toplevel_unset_fullscreen(term->window->xdg_toplevel);
|
2020-03-12 09:34:09 +01:00
|
|
|
if (term->window->is_maximized)
|
|
|
|
|
xdg_toplevel_unset_maximized(term->window->xdg_toplevel);
|
|
|
|
|
else
|
|
|
|
|
xdg_toplevel_set_maximized(term->window->xdg_toplevel);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-12 09:34:09 +01:00
|
|
|
|
|
|
|
|
case BIND_ACTION_FULLSCREEN:
|
|
|
|
|
if (term->window->is_fullscreen)
|
|
|
|
|
xdg_toplevel_unset_fullscreen(term->window->xdg_toplevel);
|
|
|
|
|
else
|
|
|
|
|
xdg_toplevel_set_fullscreen(term->window->xdg_toplevel, NULL);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-03-12 09:34:09 +01:00
|
|
|
|
2020-07-15 09:46:13 +02:00
|
|
|
case BIND_ACTION_PIPE_SCROLLBACK:
|
2020-07-31 17:02:53 +02:00
|
|
|
case BIND_ACTION_PIPE_VIEW:
|
|
|
|
|
case BIND_ACTION_PIPE_SELECTED: {
|
2020-07-30 18:53:51 +02:00
|
|
|
if (pipe_argv == NULL)
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-07-15 13:34:32 +02:00
|
|
|
|
|
|
|
|
struct pipe_context *ctx = NULL;
|
|
|
|
|
|
2020-07-22 19:34:07 +02:00
|
|
|
int pipe_fd[2] = {-1, -1};
|
|
|
|
|
int stdout_fd = -1;
|
|
|
|
|
int stderr_fd = -1;
|
|
|
|
|
|
|
|
|
|
char *text = NULL;
|
|
|
|
|
size_t len = 0;
|
|
|
|
|
|
2020-07-15 13:34:32 +02:00
|
|
|
if (pipe(pipe_fd) < 0) {
|
|
|
|
|
LOG_ERRNO("failed to create pipe");
|
|
|
|
|
goto pipe_err;
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-22 19:34:07 +02:00
|
|
|
stdout_fd = open("/dev/null", O_WRONLY);
|
|
|
|
|
stderr_fd = open("/dev/null", O_WRONLY);
|
2020-07-15 18:17:28 +02:00
|
|
|
|
|
|
|
|
if (stdout_fd < 0 || stderr_fd < 0) {
|
|
|
|
|
LOG_ERRNO("failed to open /dev/null");
|
|
|
|
|
goto pipe_err;
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-31 17:02:53 +02:00
|
|
|
bool success;
|
|
|
|
|
switch (action) {
|
|
|
|
|
case BIND_ACTION_PIPE_SCROLLBACK:
|
|
|
|
|
success = term_scrollback_to_text(term, &text, &len);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BIND_ACTION_PIPE_VIEW:
|
|
|
|
|
success = term_view_to_text(term, &text, &len);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BIND_ACTION_PIPE_SELECTED:
|
|
|
|
|
text = selection_to_text(term);
|
|
|
|
|
success = text != NULL;
|
|
|
|
|
len = text != NULL ? strlen(text) : 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
assert(false);
|
|
|
|
|
success = false;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2020-07-15 13:34:32 +02:00
|
|
|
|
|
|
|
|
if (!success)
|
|
|
|
|
goto pipe_err;
|
|
|
|
|
|
|
|
|
|
/* Make write-end non-blocking; required by the FDM */
|
|
|
|
|
{
|
|
|
|
|
int flags = fcntl(pipe_fd[1], F_GETFL);
|
|
|
|
|
if (flags < 0 ||
|
|
|
|
|
fcntl(pipe_fd[1], F_SETFL, flags | O_NONBLOCK) < 0)
|
|
|
|
|
{
|
|
|
|
|
LOG_ERRNO("failed to make write-end of pipe non-blocking");
|
|
|
|
|
goto pipe_err;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-15 16:47:01 +02:00
|
|
|
/* Make sure write-end is closed on exec() - or the spawned
|
|
|
|
|
* program may not terminate*/
|
2020-07-15 13:34:32 +02:00
|
|
|
{
|
|
|
|
|
int flags = fcntl(pipe_fd[1], F_GETFD);
|
|
|
|
|
if (flags < 0 ||
|
|
|
|
|
fcntl(pipe_fd[1], F_SETFD, flags | FD_CLOEXEC) < 0)
|
|
|
|
|
{
|
|
|
|
|
LOG_ERRNO("failed to set FD_CLOEXEC on writeend of pipe");
|
|
|
|
|
goto pipe_err;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-30 18:53:51 +02:00
|
|
|
if (!spawn(term->reaper, NULL, pipe_argv, pipe_fd[0], stdout_fd, stderr_fd))
|
2020-07-15 13:34:32 +02:00
|
|
|
goto pipe_err;
|
|
|
|
|
|
|
|
|
|
/* Close read end */
|
|
|
|
|
close(pipe_fd[0]);
|
|
|
|
|
|
2020-08-08 20:34:30 +01:00
|
|
|
ctx = xmalloc(sizeof(*ctx));
|
2020-07-15 13:34:32 +02:00
|
|
|
*ctx = (struct pipe_context){
|
|
|
|
|
.text = text,
|
|
|
|
|
.left = len,
|
|
|
|
|
};
|
|
|
|
|
|
2020-07-15 16:47:01 +02:00
|
|
|
/* Asynchronously write the output to the pipe */
|
2020-07-15 13:34:32 +02:00
|
|
|
if (!fdm_add(term->fdm, pipe_fd[1], EPOLLOUT, &fdm_write_pipe, ctx))
|
|
|
|
|
goto pipe_err;
|
|
|
|
|
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-07-15 09:46:13 +02:00
|
|
|
|
2020-08-22 13:35:36 +02:00
|
|
|
pipe_err:
|
2020-07-15 18:17:28 +02:00
|
|
|
if (stdout_fd >= 0)
|
|
|
|
|
close(stdout_fd);
|
|
|
|
|
if (stderr_fd >= 0)
|
|
|
|
|
close(stderr_fd);
|
2020-07-15 13:34:32 +02:00
|
|
|
if (pipe_fd[0] >= 0)
|
|
|
|
|
close(pipe_fd[0]);
|
|
|
|
|
if (pipe_fd[1] >= 0)
|
|
|
|
|
close(pipe_fd[1]);
|
|
|
|
|
free(text);
|
|
|
|
|
free(ctx);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-07-15 13:34:32 +02:00
|
|
|
}
|
|
|
|
|
|
2020-08-11 10:53:21 +02:00
|
|
|
case BIND_ACTION_SELECT_BEGIN:
|
2020-08-11 10:42:23 +02:00
|
|
|
if (selection_enabled(term, seat) && cursor_is_on_grid) {
|
|
|
|
|
selection_start(
|
|
|
|
|
term, seat->mouse.col, seat->mouse.row, SELECTION_NORMAL);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-08-11 10:42:23 +02:00
|
|
|
}
|
2020-08-22 13:35:36 +02:00
|
|
|
return false;
|
2020-08-11 09:55:33 +02:00
|
|
|
|
2020-08-11 10:53:21 +02:00
|
|
|
case BIND_ACTION_SELECT_BEGIN_BLOCK:
|
2020-08-11 10:42:23 +02:00
|
|
|
if (selection_enabled(term, seat) && cursor_is_on_grid) {
|
|
|
|
|
selection_start(
|
|
|
|
|
term, seat->mouse.col, seat->mouse.row, SELECTION_BLOCK);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-08-11 10:42:23 +02:00
|
|
|
}
|
2020-08-22 13:35:36 +02:00
|
|
|
return false;
|
2020-08-11 10:17:19 +02:00
|
|
|
|
2020-08-11 10:53:21 +02:00
|
|
|
case BIND_ACTION_SELECT_EXTEND:
|
2020-08-11 10:17:19 +02:00
|
|
|
if (selection_enabled(term, seat) && cursor_is_on_grid) {
|
|
|
|
|
selection_extend(
|
|
|
|
|
seat, term, seat->mouse.col, seat->mouse.row, serial);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-08-11 10:17:19 +02:00
|
|
|
}
|
2020-08-22 13:35:36 +02:00
|
|
|
return false;
|
2020-08-11 10:17:19 +02:00
|
|
|
|
2020-08-11 10:53:21 +02:00
|
|
|
case BIND_ACTION_SELECT_WORD:
|
2020-08-11 10:42:23 +02:00
|
|
|
if (selection_enabled(term, seat) && cursor_is_on_grid) {
|
|
|
|
|
selection_mark_word(
|
|
|
|
|
seat, term, seat->mouse.col, seat->mouse.row, false, serial);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-08-11 10:42:23 +02:00
|
|
|
}
|
2020-08-22 13:35:36 +02:00
|
|
|
return false;
|
2020-08-11 09:55:33 +02:00
|
|
|
|
2020-08-11 10:53:21 +02:00
|
|
|
case BIND_ACTION_SELECT_WORD_WS:
|
2020-08-11 10:42:23 +02:00
|
|
|
if (selection_enabled(term, seat) && cursor_is_on_grid) {
|
|
|
|
|
selection_mark_word(
|
|
|
|
|
seat, term, seat->mouse.col, seat->mouse.row, true, serial);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
2020-08-11 10:42:23 +02:00
|
|
|
}
|
2020-08-22 13:35:36 +02:00
|
|
|
return false;
|
2020-08-11 09:55:33 +02:00
|
|
|
|
2020-08-11 10:53:21 +02:00
|
|
|
case BIND_ACTION_SELECT_ROW:
|
2020-08-22 13:35:36 +02:00
|
|
|
if (selection_enabled(term, seat) && cursor_is_on_grid) {
|
2020-08-11 10:42:23 +02:00
|
|
|
selection_mark_row(seat, term, seat->mouse.row, serial);
|
2020-08-22 13:35:36 +02:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
2020-08-11 09:55:33 +02:00
|
|
|
|
2020-03-08 12:08:46 +01:00
|
|
|
case BIND_ACTION_COUNT:
|
|
|
|
|
assert(false);
|
2020-08-22 13:35:36 +02:00
|
|
|
return false;
|
2020-03-08 12:08:46 +01:00
|
|
|
}
|
2020-08-22 13:35:36 +02:00
|
|
|
|
|
|
|
|
return false;
|
2020-03-08 12:08:46 +01:00
|
|
|
}
|
|
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
static xkb_mod_mask_t
|
|
|
|
|
conf_modifiers_to_mask(const struct seat *seat,
|
|
|
|
|
const struct config_key_modifiers *modifiers)
|
2020-03-08 15:17:29 +01:00
|
|
|
{
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
xkb_mod_mask_t mods = 0;
|
|
|
|
|
mods |= modifiers->shift << seat->kbd.mod_shift;
|
|
|
|
|
mods |= modifiers->ctrl << seat->kbd.mod_ctrl;
|
|
|
|
|
mods |= modifiers->alt << seat->kbd.mod_alt;
|
|
|
|
|
mods |= modifiers->meta << seat->kbd.mod_meta;
|
|
|
|
|
return mods;
|
|
|
|
|
}
|
2020-03-08 15:17:29 +01:00
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
static xkb_keycode_list_t
|
|
|
|
|
key_codes_for_xkb_sym(struct xkb_keymap *keymap, xkb_keysym_t sym)
|
|
|
|
|
{
|
|
|
|
|
xkb_keycode_list_t key_codes = tll_init();
|
2020-03-08 15:17:29 +01:00
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
/*
|
|
|
|
|
* Find all key codes that map to the lower case
|
|
|
|
|
* version of the symbol.
|
|
|
|
|
*
|
|
|
|
|
* This allows us to match bindings in other layouts
|
|
|
|
|
* too.
|
|
|
|
|
*/
|
|
|
|
|
xkb_keysym_t lower_sym = xkb_keysym_to_lower(sym);
|
|
|
|
|
struct xkb_state *state = xkb_state_new(keymap);
|
2020-03-08 15:17:29 +01:00
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
for (xkb_keycode_t code = xkb_keymap_min_keycode(keymap);
|
|
|
|
|
code <= xkb_keymap_max_keycode(keymap);
|
|
|
|
|
code++)
|
2020-03-08 15:17:29 +01:00
|
|
|
{
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
if (xkb_state_key_get_one_sym(state, code) == lower_sym)
|
|
|
|
|
tll_push_back(key_codes, code);
|
2020-03-08 15:17:29 +01:00
|
|
|
}
|
2020-03-18 14:29:34 +01:00
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
xkb_state_unref(state);
|
|
|
|
|
return key_codes;
|
2020-03-08 15:17:29 +01:00
|
|
|
}
|
2020-03-18 14:29:34 +01:00
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
static void
|
|
|
|
|
convert_key_binding(struct seat *seat,
|
|
|
|
|
const struct config_key_binding_normal *conf_binding)
|
2020-08-09 22:40:53 +02:00
|
|
|
{
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
struct key_binding_normal binding = {
|
|
|
|
|
.action = conf_binding->action,
|
|
|
|
|
.bind = {
|
|
|
|
|
.mods = conf_modifiers_to_mask(seat, &conf_binding->modifiers),
|
|
|
|
|
.sym = conf_binding->sym,
|
|
|
|
|
.key_codes = key_codes_for_xkb_sym(
|
|
|
|
|
seat->kbd.xkb_keymap, conf_binding->sym),
|
|
|
|
|
},
|
|
|
|
|
.pipe_argv = conf_binding->pipe.argv,
|
|
|
|
|
};
|
|
|
|
|
tll_push_back(seat->kbd.bindings.key, binding);
|
|
|
|
|
}
|
2020-03-08 15:17:29 +01:00
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
static void
|
|
|
|
|
convert_key_bindings(const struct config *conf, struct seat *seat)
|
|
|
|
|
{
|
|
|
|
|
tll_foreach(conf->bindings.key, it)
|
|
|
|
|
convert_key_binding(seat, &it->item);
|
|
|
|
|
}
|
2020-03-08 15:17:29 +01:00
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
static void
|
|
|
|
|
convert_search_binding(struct seat *seat,
|
|
|
|
|
const struct config_key_binding_search *conf_binding)
|
|
|
|
|
{
|
|
|
|
|
struct key_binding_search binding = {
|
|
|
|
|
.action = conf_binding->action,
|
|
|
|
|
.bind = {
|
|
|
|
|
.mods = conf_modifiers_to_mask(seat, &conf_binding->modifiers),
|
|
|
|
|
.sym = conf_binding->sym,
|
|
|
|
|
.key_codes = key_codes_for_xkb_sym(
|
|
|
|
|
seat->kbd.xkb_keymap, conf_binding->sym),
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
tll_push_back(seat->kbd.bindings.search, binding);
|
|
|
|
|
}
|
2020-03-18 10:48:42 +01:00
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
static void
|
|
|
|
|
convert_search_bindings(const struct config *conf, struct seat *seat)
|
|
|
|
|
{
|
|
|
|
|
tll_foreach(conf->bindings.search, it)
|
|
|
|
|
convert_search_binding(seat, &it->item);
|
|
|
|
|
}
|
2020-03-08 15:17:29 +01:00
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
static void
|
|
|
|
|
convert_mouse_binding(struct seat *seat,
|
|
|
|
|
const struct config_mouse_binding *conf_binding)
|
|
|
|
|
{
|
|
|
|
|
struct mouse_binding binding = {
|
|
|
|
|
.action = conf_binding->action,
|
|
|
|
|
.mods = conf_modifiers_to_mask(seat, &conf_binding->modifiers),
|
|
|
|
|
.button = conf_binding->button,
|
|
|
|
|
.count = conf_binding->count,
|
|
|
|
|
};
|
|
|
|
|
tll_push_back(seat->mouse.bindings, binding);
|
|
|
|
|
}
|
2020-03-08 15:17:29 +01:00
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
static void
|
|
|
|
|
convert_mouse_bindings(const struct config *conf, struct seat *seat)
|
|
|
|
|
{
|
|
|
|
|
tll_foreach(conf->bindings.mouse, it)
|
|
|
|
|
convert_mouse_binding(seat, &it->item);
|
2020-03-08 15:17:29 +01:00
|
|
|
}
|
|
|
|
|
|
2019-06-19 10:04:47 +02:00
|
|
|
static void
|
|
|
|
|
keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
|
|
|
|
|
uint32_t format, int32_t fd, uint32_t size)
|
|
|
|
|
{
|
2020-03-14 11:51:47 +01:00
|
|
|
LOG_DBG("keyboard_keymap: keyboard=%p (format=%u, size=%u)",
|
2020-08-23 07:50:27 +02:00
|
|
|
(void *)wl_keyboard, format, size);
|
2020-03-14 11:51:47 +01:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
|
|
|
|
struct wayland *wayl = seat->wayl;
|
2019-06-19 10:04:47 +02:00
|
|
|
|
|
|
|
|
char *map_str = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
|
2020-07-14 08:52:11 +02:00
|
|
|
if (map_str == MAP_FAILED) {
|
|
|
|
|
LOG_ERRNO("failed to mmap keyboard keymap");
|
2020-07-14 08:55:20 +02:00
|
|
|
close(fd);
|
2020-07-14 08:52:11 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-14 08:52:42 +02:00
|
|
|
while (map_str[size - 1] == '\0')
|
|
|
|
|
size--;
|
2019-06-19 10:04:47 +02:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
if (seat->kbd.xkb_compose_state != NULL) {
|
|
|
|
|
xkb_compose_state_unref(seat->kbd.xkb_compose_state);
|
|
|
|
|
seat->kbd.xkb_compose_state = NULL;
|
2019-08-12 21:32:53 +02:00
|
|
|
}
|
2020-07-08 16:45:26 +02:00
|
|
|
if (seat->kbd.xkb_compose_table != NULL) {
|
|
|
|
|
xkb_compose_table_unref(seat->kbd.xkb_compose_table);
|
|
|
|
|
seat->kbd.xkb_compose_table = NULL;
|
2019-08-12 21:32:53 +02:00
|
|
|
}
|
2020-07-08 16:45:26 +02:00
|
|
|
if (seat->kbd.xkb_keymap != NULL) {
|
|
|
|
|
xkb_keymap_unref(seat->kbd.xkb_keymap);
|
|
|
|
|
seat->kbd.xkb_keymap = NULL;
|
2019-08-12 21:32:53 +02:00
|
|
|
}
|
2020-07-08 16:45:26 +02:00
|
|
|
if (seat->kbd.xkb_state != NULL) {
|
|
|
|
|
xkb_state_unref(seat->kbd.xkb_state);
|
|
|
|
|
seat->kbd.xkb_state = NULL;
|
2019-08-12 21:32:53 +02:00
|
|
|
}
|
2020-07-08 16:45:26 +02:00
|
|
|
if (seat->kbd.xkb != NULL) {
|
|
|
|
|
xkb_context_unref(seat->kbd.xkb);
|
|
|
|
|
seat->kbd.xkb = NULL;
|
2019-08-12 21:32:53 +02:00
|
|
|
}
|
2020-03-18 14:29:34 +01:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
tll_foreach(seat->kbd.bindings.key, it)
|
2020-03-18 15:30:14 +01:00
|
|
|
tll_free(it->item.bind.key_codes);
|
2020-07-08 16:45:26 +02:00
|
|
|
tll_free(seat->kbd.bindings.key);
|
2019-06-19 10:04:47 +02:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
tll_foreach(seat->kbd.bindings.search, it)
|
2020-03-18 15:30:14 +01:00
|
|
|
tll_free(it->item.bind.key_codes);
|
2020-07-08 16:45:26 +02:00
|
|
|
tll_free(seat->kbd.bindings.search);
|
2020-03-18 14:29:34 +01:00
|
|
|
|
2020-08-09 22:40:53 +02:00
|
|
|
tll_free(seat->mouse.bindings);
|
|
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.xkb = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
2020-07-14 08:52:42 +02:00
|
|
|
seat->kbd.xkb_keymap = xkb_keymap_new_from_buffer(
|
|
|
|
|
seat->kbd.xkb, map_str, size, XKB_KEYMAP_FORMAT_TEXT_V1,
|
2019-06-19 10:04:47 +02:00
|
|
|
XKB_KEYMAP_COMPILE_NO_FLAGS);
|
|
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.xkb_state = xkb_state_new(seat->kbd.xkb_keymap);
|
2019-06-19 10:04:47 +02:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.mod_shift = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, "Shift");
|
|
|
|
|
seat->kbd.mod_alt = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, "Mod1") ;
|
|
|
|
|
seat->kbd.mod_ctrl = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, "Control");
|
|
|
|
|
seat->kbd.mod_meta = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, "Mod4");
|
2019-07-05 15:13:06 +02:00
|
|
|
|
2019-07-09 10:00:54 +02:00
|
|
|
/* Compose (dead keys) */
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.xkb_compose_table = xkb_compose_table_new_from_locale(
|
|
|
|
|
seat->kbd.xkb, setlocale(LC_CTYPE, NULL), XKB_COMPOSE_COMPILE_NO_FLAGS);
|
|
|
|
|
seat->kbd.xkb_compose_state = xkb_compose_state_new(
|
|
|
|
|
seat->kbd.xkb_compose_table, XKB_COMPOSE_STATE_NO_FLAGS);
|
2019-07-09 10:00:54 +02:00
|
|
|
|
2019-06-19 10:04:47 +02:00
|
|
|
munmap(map_str, size);
|
|
|
|
|
close(fd);
|
2020-03-08 12:08:46 +01:00
|
|
|
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
convert_key_bindings(wayl->conf, seat);
|
|
|
|
|
convert_search_bindings(wayl->conf, seat);
|
|
|
|
|
convert_mouse_bindings(wayl->conf, seat);
|
2019-06-19 10:04:47 +02:00
|
|
|
}
|
|
|
|
|
|
2020-01-14 19:28:37 +01:00
|
|
|
static void
|
2019-06-19 10:04:47 +02:00
|
|
|
keyboard_enter(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
|
|
|
|
|
struct wl_surface *surface, struct wl_array *keys)
|
|
|
|
|
{
|
2019-11-28 19:46:27 +01:00
|
|
|
assert(surface != NULL);
|
|
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
2020-02-29 12:13:58 +01:00
|
|
|
struct wl_window *win = wl_surface_get_user_data(surface);
|
|
|
|
|
struct terminal *term = win->term;
|
|
|
|
|
|
2020-07-11 11:13:45 +02:00
|
|
|
LOG_DBG("%s: keyboard_enter: keyboard=%p, serial=%u, surface=%p",
|
2020-08-23 07:50:27 +02:00
|
|
|
seat->name, (void *)wl_keyboard, serial, (void *)surface);
|
2020-03-14 11:51:47 +01:00
|
|
|
|
2020-07-14 08:52:11 +02:00
|
|
|
if (seat->kbd.xkb == NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
2020-07-09 09:16:54 +02:00
|
|
|
term_kbd_focus_in(term);
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd_focus = term;
|
2020-07-09 11:20:46 +02:00
|
|
|
seat->kbd.serial = serial;
|
2019-06-19 10:04:47 +02:00
|
|
|
}
|
|
|
|
|
|
2019-08-05 19:33:01 +02:00
|
|
|
static bool
|
2020-07-08 16:45:26 +02:00
|
|
|
start_repeater(struct seat *seat, uint32_t key)
|
2019-06-19 10:04:47 +02:00
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
if (seat->kbd.repeat.dont_re_repeat)
|
2019-08-05 19:33:01 +02:00
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
struct itimerspec t = {
|
2020-07-08 16:45:26 +02:00
|
|
|
.it_value = {.tv_sec = 0, .tv_nsec = seat->kbd.repeat.delay * 1000000},
|
|
|
|
|
.it_interval = {.tv_sec = 0, .tv_nsec = 1000000000 / seat->kbd.repeat.rate},
|
2019-08-05 19:33:01 +02:00
|
|
|
};
|
2019-06-21 18:40:53 +02:00
|
|
|
|
2019-08-05 19:33:01 +02:00
|
|
|
if (t.it_value.tv_nsec >= 1000000000) {
|
|
|
|
|
t.it_value.tv_sec += t.it_value.tv_nsec / 1000000000;
|
|
|
|
|
t.it_value.tv_nsec %= 1000000000;
|
|
|
|
|
}
|
|
|
|
|
if (t.it_interval.tv_nsec >= 1000000000) {
|
|
|
|
|
t.it_interval.tv_sec += t.it_interval.tv_nsec / 1000000000;
|
|
|
|
|
t.it_interval.tv_nsec %= 1000000000;
|
|
|
|
|
}
|
2020-07-08 16:45:26 +02:00
|
|
|
if (timerfd_settime(seat->kbd.repeat.fd, 0, &t, NULL) < 0) {
|
|
|
|
|
LOG_ERRNO("%s: failed to arm keyboard repeat timer", seat->name);
|
2019-08-05 19:33:01 +02:00
|
|
|
return false;
|
2019-06-21 18:40:53 +02:00
|
|
|
}
|
2019-08-02 18:19:07 +02:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.repeat.key = key;
|
2019-08-05 19:33:01 +02:00
|
|
|
return true;
|
2019-08-02 18:19:07 +02:00
|
|
|
}
|
|
|
|
|
|
2019-08-05 19:33:01 +02:00
|
|
|
static bool
|
2020-07-08 16:45:26 +02:00
|
|
|
stop_repeater(struct seat *seat, uint32_t key)
|
2019-08-02 18:19:07 +02:00
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
if (key != -1 && key != seat->kbd.repeat.key)
|
2019-08-05 19:33:01 +02:00
|
|
|
return true;
|
|
|
|
|
|
2020-08-23 07:42:20 +02:00
|
|
|
if (timerfd_settime(seat->kbd.repeat.fd, 0, &(struct itimerspec){{0}}, NULL) < 0) {
|
2020-07-08 16:45:26 +02:00
|
|
|
LOG_ERRNO("%s: failed to disarm keyboard repeat timer", seat->name);
|
2019-08-05 19:33:01 +02:00
|
|
|
return false;
|
2019-08-02 18:19:07 +02:00
|
|
|
}
|
2019-08-05 19:33:01 +02:00
|
|
|
|
|
|
|
|
return true;
|
2019-08-02 18:19:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2019-08-05 19:33:01 +02:00
|
|
|
keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
|
|
|
|
|
struct wl_surface *surface)
|
2019-08-02 18:19:07 +02:00
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
2019-08-05 19:33:01 +02:00
|
|
|
|
2020-03-14 11:51:47 +01:00
|
|
|
LOG_DBG("keyboard_leave: keyboard=%p, serial=%u, surface=%p",
|
2020-08-23 07:50:27 +02:00
|
|
|
(void *)wl_keyboard, serial, (void *)surface);
|
2020-03-14 11:51:47 +01:00
|
|
|
|
2020-07-14 08:52:11 +02:00
|
|
|
if (seat->kbd.xkb == NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
2019-11-28 19:24:16 +01:00
|
|
|
assert(
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd_focus == NULL ||
|
2019-11-28 19:24:16 +01:00
|
|
|
surface == NULL || /* Seen on Sway 1.2 */
|
2020-07-08 16:45:26 +02:00
|
|
|
((const struct wl_window *)wl_surface_get_user_data(surface))->term == seat->kbd_focus
|
2020-02-29 12:13:58 +01:00
|
|
|
);
|
2019-11-21 18:17:02 +01:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
struct terminal *old_focused = seat->kbd_focus;
|
|
|
|
|
seat->kbd_focus = NULL;
|
2019-11-29 22:11:41 +01:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
stop_repeater(seat, -1);
|
2020-07-09 08:46:25 +02:00
|
|
|
seat->kbd.shift = false;
|
|
|
|
|
seat->kbd.alt = false;
|
|
|
|
|
seat->kbd.ctrl = false;
|
|
|
|
|
seat->kbd.meta = false;
|
2020-07-08 16:45:26 +02:00
|
|
|
xkb_compose_state_reset(seat->kbd.xkb_compose_state);
|
2020-01-13 19:58:57 +01:00
|
|
|
|
2020-07-31 17:09:06 +02:00
|
|
|
if (old_focused != NULL) {
|
|
|
|
|
seat->pointer.hidden = false;
|
|
|
|
|
term_xcursor_update_for_seat(old_focused, seat);
|
2020-01-02 19:30:34 +01:00
|
|
|
term_kbd_focus_out(old_focused);
|
2020-07-31 17:09:06 +02:00
|
|
|
} else {
|
2019-11-24 00:06:50 +01:00
|
|
|
/*
|
|
|
|
|
* Sway bug - under certain conditions we get a
|
|
|
|
|
* keyboard_leave() (and keyboard_key()) without first having
|
|
|
|
|
* received a keyboard_enter()
|
|
|
|
|
*/
|
2019-11-28 19:47:00 +01:00
|
|
|
LOG_WARN(
|
|
|
|
|
"compositor sent keyboard_leave event without a keyboard_enter "
|
2020-08-23 07:50:27 +02:00
|
|
|
"event: surface=%p", (void *)surface);
|
2019-11-24 00:06:50 +01:00
|
|
|
}
|
2019-06-19 10:04:47 +02:00
|
|
|
}
|
|
|
|
|
|
2020-01-11 18:18:31 +01:00
|
|
|
static const struct key_data *
|
2020-01-11 18:40:27 +01:00
|
|
|
keymap_data_for_sym(xkb_keysym_t sym, size_t *count)
|
2020-01-11 18:18:31 +01:00
|
|
|
{
|
|
|
|
|
switch (sym) {
|
|
|
|
|
case XKB_KEY_Escape: *count = ALEN(key_escape); return key_escape;
|
|
|
|
|
case XKB_KEY_Return: *count = ALEN(key_return); return key_return;
|
|
|
|
|
case XKB_KEY_Tab: *count = ALEN(key_tab); return key_tab;
|
|
|
|
|
case XKB_KEY_ISO_Left_Tab: *count = ALEN(key_backtab); return key_backtab;
|
|
|
|
|
case XKB_KEY_BackSpace: *count = ALEN(key_backspace); return key_backspace;
|
|
|
|
|
case XKB_KEY_Up: *count = ALEN(key_up); return key_up;
|
|
|
|
|
case XKB_KEY_Down: *count = ALEN(key_down); return key_down;
|
|
|
|
|
case XKB_KEY_Right: *count = ALEN(key_right); return key_right;
|
|
|
|
|
case XKB_KEY_Left: *count = ALEN(key_left); return key_left;
|
|
|
|
|
case XKB_KEY_Home: *count = ALEN(key_home); return key_home;
|
|
|
|
|
case XKB_KEY_End: *count = ALEN(key_end); return key_end;
|
|
|
|
|
case XKB_KEY_Insert: *count = ALEN(key_insert); return key_insert;
|
|
|
|
|
case XKB_KEY_Delete: *count = ALEN(key_delete); return key_delete;
|
|
|
|
|
case XKB_KEY_Page_Up: *count = ALEN(key_pageup); return key_pageup;
|
|
|
|
|
case XKB_KEY_Page_Down: *count = ALEN(key_pagedown); return key_pagedown;
|
|
|
|
|
case XKB_KEY_F1: *count = ALEN(key_f1); return key_f1;
|
|
|
|
|
case XKB_KEY_F2: *count = ALEN(key_f2); return key_f2;
|
|
|
|
|
case XKB_KEY_F3: *count = ALEN(key_f3); return key_f3;
|
|
|
|
|
case XKB_KEY_F4: *count = ALEN(key_f4); return key_f4;
|
|
|
|
|
case XKB_KEY_F5: *count = ALEN(key_f5); return key_f5;
|
|
|
|
|
case XKB_KEY_F6: *count = ALEN(key_f6); return key_f6;
|
|
|
|
|
case XKB_KEY_F7: *count = ALEN(key_f7); return key_f7;
|
|
|
|
|
case XKB_KEY_F8: *count = ALEN(key_f8); return key_f8;
|
|
|
|
|
case XKB_KEY_F9: *count = ALEN(key_f9); return key_f9;
|
|
|
|
|
case XKB_KEY_F10: *count = ALEN(key_f10); return key_f10;
|
|
|
|
|
case XKB_KEY_F11: *count = ALEN(key_f11); return key_f11;
|
|
|
|
|
case XKB_KEY_F12: *count = ALEN(key_f12); return key_f12;
|
|
|
|
|
case XKB_KEY_F13: *count = ALEN(key_f13); return key_f13;
|
|
|
|
|
case XKB_KEY_F14: *count = ALEN(key_f14); return key_f14;
|
|
|
|
|
case XKB_KEY_F15: *count = ALEN(key_f15); return key_f15;
|
|
|
|
|
case XKB_KEY_F16: *count = ALEN(key_f16); return key_f16;
|
|
|
|
|
case XKB_KEY_F17: *count = ALEN(key_f17); return key_f17;
|
|
|
|
|
case XKB_KEY_F18: *count = ALEN(key_f18); return key_f18;
|
|
|
|
|
case XKB_KEY_F19: *count = ALEN(key_f19); return key_f19;
|
|
|
|
|
case XKB_KEY_F20: *count = ALEN(key_f20); return key_f20;
|
|
|
|
|
case XKB_KEY_F21: *count = ALEN(key_f21); return key_f21;
|
|
|
|
|
case XKB_KEY_F22: *count = ALEN(key_f22); return key_f22;
|
|
|
|
|
case XKB_KEY_F23: *count = ALEN(key_f23); return key_f23;
|
|
|
|
|
case XKB_KEY_F24: *count = ALEN(key_f24); return key_f24;
|
|
|
|
|
case XKB_KEY_F25: *count = ALEN(key_f25); return key_f25;
|
|
|
|
|
case XKB_KEY_F26: *count = ALEN(key_f26); return key_f26;
|
|
|
|
|
case XKB_KEY_F27: *count = ALEN(key_f27); return key_f27;
|
|
|
|
|
case XKB_KEY_F28: *count = ALEN(key_f28); return key_f28;
|
|
|
|
|
case XKB_KEY_F29: *count = ALEN(key_f29); return key_f29;
|
|
|
|
|
case XKB_KEY_F30: *count = ALEN(key_f30); return key_f30;
|
|
|
|
|
case XKB_KEY_F31: *count = ALEN(key_f31); return key_f31;
|
|
|
|
|
case XKB_KEY_F32: *count = ALEN(key_f32); return key_f32;
|
|
|
|
|
case XKB_KEY_F33: *count = ALEN(key_f33); return key_f33;
|
|
|
|
|
case XKB_KEY_F34: *count = ALEN(key_f34); return key_f34;
|
|
|
|
|
case XKB_KEY_F35: *count = ALEN(key_f35); return key_f35;
|
|
|
|
|
case XKB_KEY_KP_Up: *count = ALEN(key_kp_up); return key_kp_up;
|
|
|
|
|
case XKB_KEY_KP_Down: *count = ALEN(key_kp_down); return key_kp_down;
|
|
|
|
|
case XKB_KEY_KP_Right: *count = ALEN(key_kp_right); return key_kp_right;
|
|
|
|
|
case XKB_KEY_KP_Left: *count = ALEN(key_kp_left); return key_kp_left;
|
|
|
|
|
case XKB_KEY_KP_Begin: *count = ALEN(key_kp_begin); return key_kp_begin;
|
|
|
|
|
case XKB_KEY_KP_Home: *count = ALEN(key_kp_home); return key_kp_home;
|
|
|
|
|
case XKB_KEY_KP_End: *count = ALEN(key_kp_end); return key_kp_end;
|
|
|
|
|
case XKB_KEY_KP_Insert: *count = ALEN(key_kp_insert); return key_kp_insert;
|
|
|
|
|
case XKB_KEY_KP_Delete: *count = ALEN(key_kp_delete); return key_kp_delete;
|
|
|
|
|
case XKB_KEY_KP_Page_Up: *count = ALEN(key_kp_pageup); return key_kp_pageup;
|
|
|
|
|
case XKB_KEY_KP_Page_Down: *count = ALEN(key_kp_pagedown); return key_kp_pagedown;
|
|
|
|
|
case XKB_KEY_KP_Enter: *count = ALEN(key_kp_enter); return key_kp_enter;
|
|
|
|
|
case XKB_KEY_KP_Divide: *count = ALEN(key_kp_divide); return key_kp_divide;
|
|
|
|
|
case XKB_KEY_KP_Multiply: *count = ALEN(key_kp_multiply); return key_kp_multiply;
|
|
|
|
|
case XKB_KEY_KP_Subtract: *count = ALEN(key_kp_subtract); return key_kp_subtract;
|
|
|
|
|
case XKB_KEY_KP_Add: *count = ALEN(key_kp_add); return key_kp_add;
|
|
|
|
|
case XKB_KEY_KP_Separator: *count = ALEN(key_kp_separator); return key_kp_separator;
|
2020-06-27 20:03:41 +02:00
|
|
|
case XKB_KEY_KP_Decimal: *count = ALEN(key_kp_decimal); return key_kp_decimal;
|
2020-01-11 18:18:31 +01:00
|
|
|
case XKB_KEY_KP_0: *count = ALEN(key_kp_0); return key_kp_0;
|
|
|
|
|
case XKB_KEY_KP_1: *count = ALEN(key_kp_1); return key_kp_1;
|
|
|
|
|
case XKB_KEY_KP_2: *count = ALEN(key_kp_2); return key_kp_2;
|
|
|
|
|
case XKB_KEY_KP_3: *count = ALEN(key_kp_3); return key_kp_3;
|
|
|
|
|
case XKB_KEY_KP_4: *count = ALEN(key_kp_4); return key_kp_4;
|
|
|
|
|
case XKB_KEY_KP_5: *count = ALEN(key_kp_5); return key_kp_5;
|
|
|
|
|
case XKB_KEY_KP_6: *count = ALEN(key_kp_6); return key_kp_6;
|
|
|
|
|
case XKB_KEY_KP_7: *count = ALEN(key_kp_7); return key_kp_7;
|
|
|
|
|
case XKB_KEY_KP_8: *count = ALEN(key_kp_8); return key_kp_8;
|
|
|
|
|
case XKB_KEY_KP_9: *count = ALEN(key_kp_9); return key_kp_9;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2020-01-11 17:55:45 +01:00
|
|
|
|
2020-01-11 18:40:27 +01:00
|
|
|
static const struct key_data *
|
2020-01-11 17:55:45 +01:00
|
|
|
keymap_lookup(struct terminal *term, xkb_keysym_t sym, enum modifier mods)
|
|
|
|
|
{
|
2020-01-11 18:18:31 +01:00
|
|
|
size_t count;
|
2020-01-11 18:40:27 +01:00
|
|
|
const struct key_data *info = keymap_data_for_sym(sym, &count);
|
2020-01-11 17:55:45 +01:00
|
|
|
|
2020-01-11 18:18:31 +01:00
|
|
|
if (info == NULL)
|
2020-01-11 18:40:27 +01:00
|
|
|
return NULL;
|
2020-01-11 17:55:45 +01:00
|
|
|
|
2020-01-11 18:18:31 +01:00
|
|
|
for (size_t j = 0; j < count; j++) {
|
|
|
|
|
if (info[j].modifiers != MOD_ANY && info[j].modifiers != mods)
|
|
|
|
|
continue;
|
2020-01-11 17:55:45 +01:00
|
|
|
|
2020-01-11 18:18:31 +01:00
|
|
|
if (info[j].cursor_keys_mode != CURSOR_KEYS_DONTCARE &&
|
|
|
|
|
info[j].cursor_keys_mode != term->cursor_keys_mode)
|
|
|
|
|
continue;
|
2020-01-11 17:55:45 +01:00
|
|
|
|
2020-01-11 18:18:31 +01:00
|
|
|
if (info[j].keypad_keys_mode != KEYPAD_DONTCARE &&
|
|
|
|
|
info[j].keypad_keys_mode != term->keypad_keys_mode)
|
|
|
|
|
continue;
|
2020-01-11 17:55:45 +01:00
|
|
|
|
2020-01-11 18:40:27 +01:00
|
|
|
return &info[j];
|
2020-01-11 17:55:45 +01:00
|
|
|
}
|
|
|
|
|
|
2020-01-11 18:40:27 +01:00
|
|
|
return NULL;
|
2020-01-11 17:55:45 +01:00
|
|
|
}
|
|
|
|
|
|
2019-06-19 10:04:47 +02:00
|
|
|
static void
|
|
|
|
|
keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
|
|
|
|
|
uint32_t time, uint32_t key, uint32_t state)
|
|
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
|
|
|
|
struct terminal *term = seat->kbd_focus;
|
2019-11-22 21:49:50 +01:00
|
|
|
|
2020-07-14 08:52:11 +02:00
|
|
|
if (seat->kbd.xkb == NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
2019-10-27 18:43:07 +01:00
|
|
|
assert(term != NULL);
|
2019-06-19 10:04:47 +02:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
const xkb_mod_mask_t ctrl = 1 << seat->kbd.mod_ctrl;
|
|
|
|
|
const xkb_mod_mask_t alt = 1 << seat->kbd.mod_alt;
|
|
|
|
|
const xkb_mod_mask_t shift = 1 << seat->kbd.mod_shift;
|
|
|
|
|
const xkb_mod_mask_t meta = 1 << seat->kbd.mod_meta;
|
2019-06-19 10:04:47 +02:00
|
|
|
|
|
|
|
|
if (state == XKB_KEY_UP) {
|
2020-07-08 16:45:26 +02:00
|
|
|
stop_repeater(seat, key);
|
2019-06-19 10:04:47 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
key += 8;
|
2020-07-08 16:45:26 +02:00
|
|
|
bool should_repeat = xkb_keymap_key_repeats(seat->kbd.xkb_keymap, key);
|
|
|
|
|
xkb_keysym_t sym = xkb_state_key_get_one_sym(seat->kbd.xkb_state, key);
|
2019-06-19 10:04:47 +02:00
|
|
|
|
2020-08-04 07:33:15 +02:00
|
|
|
if (state == XKB_KEY_DOWN && term->conf->mouse.hide_when_typing &&
|
2020-08-15 19:39:00 +01:00
|
|
|
/* TODO: better way to detect modifiers */
|
2020-08-03 18:19:43 +02:00
|
|
|
sym != XKB_KEY_Shift_L && sym != XKB_KEY_Shift_R &&
|
|
|
|
|
sym != XKB_KEY_Control_L && sym != XKB_KEY_Control_R &&
|
|
|
|
|
sym != XKB_KEY_Alt_L && sym != XKB_KEY_Alt_R &&
|
2020-08-04 07:38:21 +02:00
|
|
|
sym != XKB_KEY_ISO_Level3_Shift &&
|
2020-08-03 18:19:43 +02:00
|
|
|
sym != XKB_KEY_Super_L && sym != XKB_KEY_Super_R &&
|
|
|
|
|
sym != XKB_KEY_Meta_L && sym != XKB_KEY_Meta_R &&
|
|
|
|
|
sym != XKB_KEY_Menu)
|
2020-08-01 15:39:25 +02:00
|
|
|
{
|
|
|
|
|
seat->pointer.hidden = true;
|
|
|
|
|
term_xcursor_update_for_seat(term, seat);
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-04 18:07:41 +02:00
|
|
|
#if 0
|
2019-07-09 14:27:26 +02:00
|
|
|
char foo[100];
|
|
|
|
|
xkb_keysym_get_name(sym, foo, sizeof(foo));
|
2019-08-19 21:16:47 +02:00
|
|
|
LOG_INFO("%s", foo);
|
2019-07-09 14:27:26 +02:00
|
|
|
#endif
|
|
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
xkb_compose_state_feed(seat->kbd.xkb_compose_state, sym);
|
2019-07-09 10:00:54 +02:00
|
|
|
enum xkb_compose_status compose_status = xkb_compose_state_get_status(
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.xkb_compose_state);
|
2019-07-09 10:00:54 +02:00
|
|
|
|
2019-11-22 22:19:00 +01:00
|
|
|
if (compose_status == XKB_COMPOSE_COMPOSING) {
|
|
|
|
|
/* TODO: goto maybe_repeat? */
|
2019-07-09 10:00:54 +02:00
|
|
|
return;
|
2019-11-22 22:19:00 +01:00
|
|
|
}
|
2019-07-09 10:00:54 +02:00
|
|
|
|
2019-06-19 10:04:47 +02:00
|
|
|
xkb_mod_mask_t mods = xkb_state_serialize_mods(
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.xkb_state, XKB_STATE_MODS_DEPRESSED);
|
|
|
|
|
//xkb_mod_mask_t consumed = xkb_state_key_get_consumed_mods(seat->kbd.xkb_state, key);
|
2019-06-22 20:31:53 +02:00
|
|
|
xkb_mod_mask_t consumed = 0x0;
|
2019-08-15 19:38:28 +02:00
|
|
|
xkb_mod_mask_t significant = ctrl | alt | shift | meta;
|
2019-06-19 10:04:47 +02:00
|
|
|
xkb_mod_mask_t effective_mods = mods & ~consumed & significant;
|
|
|
|
|
|
2019-08-27 17:23:28 +02:00
|
|
|
if (term->is_searching) {
|
2019-11-22 22:19:00 +01:00
|
|
|
if (should_repeat)
|
2020-07-08 16:45:26 +02:00
|
|
|
start_repeater(seat, key - 8);
|
2020-07-08 18:20:34 +02:00
|
|
|
search_input(seat, term, key, sym, effective_mods, serial);
|
2019-08-27 17:23:28 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-19 10:04:47 +02:00
|
|
|
#if 0
|
|
|
|
|
for (size_t i = 0; i < 32; i++) {
|
|
|
|
|
if (mods & (1 << i)) {
|
2020-07-08 16:45:26 +02:00
|
|
|
LOG_INFO("%s", xkb_keymap_mod_get_name(seat->kbd.xkb_keymap, i));
|
2019-06-19 10:04:47 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2020-03-14 11:51:47 +01:00
|
|
|
LOG_DBG("keyboard_key: keyboard=%p, serial=%u, "
|
|
|
|
|
"sym=%u, mod=0x%08x, consumed=0x%08x, significant=0x%08x, "
|
2019-11-22 22:19:00 +01:00
|
|
|
"effective=0x%08x, repeats=%d",
|
2020-08-23 07:50:27 +02:00
|
|
|
(void *)wl_keyboard, serial,
|
2019-11-22 22:19:00 +01:00
|
|
|
sym, mods, consumed, significant, effective_mods, should_repeat);
|
2019-07-09 14:27:26 +02:00
|
|
|
|
2020-01-11 18:59:46 +01:00
|
|
|
/*
|
2020-03-08 15:17:29 +01:00
|
|
|
* User configurable bindings
|
2020-01-11 18:59:46 +01:00
|
|
|
*/
|
2020-07-08 16:45:26 +02:00
|
|
|
tll_foreach(seat->kbd.bindings.key, it) {
|
2020-03-18 15:30:14 +01:00
|
|
|
if (it->item.bind.mods != effective_mods)
|
2020-03-18 14:52:39 +01:00
|
|
|
continue;
|
|
|
|
|
|
2020-03-18 14:29:34 +01:00
|
|
|
/* Match symbol */
|
2020-03-18 15:30:14 +01:00
|
|
|
if (it->item.bind.sym == sym) {
|
2020-08-22 13:35:36 +02:00
|
|
|
if (execute_binding(seat, term, it->item.action, it->item.pipe_argv, serial))
|
|
|
|
|
goto maybe_repeat;
|
2019-08-27 17:23:28 +02:00
|
|
|
}
|
2020-03-18 14:29:34 +01:00
|
|
|
|
|
|
|
|
/* Match raw key code */
|
2020-03-18 15:30:14 +01:00
|
|
|
tll_foreach(it->item.bind.key_codes, code) {
|
2020-03-18 14:29:34 +01:00
|
|
|
if (code->item == key) {
|
2020-08-22 13:35:36 +02:00
|
|
|
if (execute_binding(seat, term, it->item.action, it->item.pipe_argv, serial))
|
|
|
|
|
goto maybe_repeat;
|
2020-03-18 14:29:34 +01:00
|
|
|
}
|
|
|
|
|
}
|
2019-07-11 12:16:50 +02:00
|
|
|
}
|
|
|
|
|
|
2020-01-11 18:59:46 +01:00
|
|
|
/*
|
|
|
|
|
* Keys generating escape sequences
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
enum modifier keymap_mods = MOD_NONE;
|
2020-07-08 16:45:26 +02:00
|
|
|
keymap_mods |= seat->kbd.shift ? MOD_SHIFT : MOD_NONE;
|
|
|
|
|
keymap_mods |= seat->kbd.alt ? MOD_ALT : MOD_NONE;
|
|
|
|
|
keymap_mods |= seat->kbd.ctrl ? MOD_CTRL : MOD_NONE;
|
|
|
|
|
keymap_mods |= seat->kbd.meta ? MOD_META : MOD_NONE;
|
2020-01-11 18:59:46 +01:00
|
|
|
|
2020-01-11 18:40:27 +01:00
|
|
|
const struct key_data *keymap = keymap_lookup(term, sym, keymap_mods);
|
|
|
|
|
if (keymap != NULL) {
|
|
|
|
|
term_to_slave(term, keymap->seq, strlen(keymap->seq));
|
2019-11-22 22:02:50 +01:00
|
|
|
|
2020-01-11 18:40:27 +01:00
|
|
|
term_reset_view(term);
|
|
|
|
|
selection_cancel(term);
|
2020-01-11 17:55:45 +01:00
|
|
|
goto maybe_repeat;
|
2020-01-11 18:40:27 +01:00
|
|
|
}
|
2019-06-22 20:40:28 +02:00
|
|
|
|
2020-01-11 18:59:46 +01:00
|
|
|
/*
|
|
|
|
|
* Compose, and maybe emit "normal" character
|
|
|
|
|
*/
|
|
|
|
|
|
2020-08-23 07:42:20 +02:00
|
|
|
uint8_t buf[64] = {0};
|
2019-11-22 22:02:50 +01:00
|
|
|
int count = 0;
|
|
|
|
|
|
|
|
|
|
if (compose_status == XKB_COMPOSE_COMPOSED) {
|
|
|
|
|
count = xkb_compose_state_get_utf8(
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.xkb_compose_state, (char *)buf, sizeof(buf));
|
|
|
|
|
xkb_compose_state_reset(seat->kbd.xkb_compose_state);
|
2019-12-02 21:32:09 +01:00
|
|
|
} else if (compose_status == XKB_COMPOSE_CANCELLED) {
|
|
|
|
|
goto maybe_repeat;
|
2019-11-22 22:02:50 +01:00
|
|
|
} else {
|
|
|
|
|
count = xkb_state_key_get_utf8(
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.xkb_state, key, (char *)buf, sizeof(buf));
|
2019-11-22 22:02:50 +01:00
|
|
|
}
|
2019-06-19 10:04:47 +02:00
|
|
|
|
2020-01-11 18:59:46 +01:00
|
|
|
if (count == 0)
|
|
|
|
|
goto maybe_repeat;
|
2019-06-19 10:04:47 +02:00
|
|
|
|
2019-07-26 18:49:09 +02:00
|
|
|
#define is_control_key(x) ((x) >= 0x40 && (x) <= 0x7f)
|
|
|
|
|
#define IS_CTRL(x) ((x) < 0x20 || ((x) >= 0x7f && (x) <= 0x9f))
|
|
|
|
|
|
2020-01-20 18:38:50 +01:00
|
|
|
if ((keymap_mods & MOD_CTRL) &&
|
|
|
|
|
!is_control_key(sym) &&
|
|
|
|
|
(count == 1 && !IS_CTRL(buf[0])) &&
|
|
|
|
|
sym < 256)
|
|
|
|
|
{
|
|
|
|
|
static const int mod_param_map[32] = {
|
|
|
|
|
[MOD_SHIFT] = 2,
|
|
|
|
|
[MOD_ALT] = 3,
|
|
|
|
|
[MOD_SHIFT | MOD_ALT] = 4,
|
|
|
|
|
[MOD_CTRL] = 5,
|
|
|
|
|
[MOD_SHIFT | MOD_CTRL] = 6,
|
|
|
|
|
[MOD_ALT | MOD_CTRL] = 7,
|
|
|
|
|
[MOD_SHIFT | MOD_ALT | MOD_CTRL] = 8,
|
|
|
|
|
[MOD_META] = 9,
|
|
|
|
|
[MOD_META | MOD_SHIFT] = 10,
|
|
|
|
|
[MOD_META | MOD_ALT] = 11,
|
|
|
|
|
[MOD_META | MOD_SHIFT | MOD_ALT] = 12,
|
|
|
|
|
[MOD_META | MOD_CTRL] = 13,
|
|
|
|
|
[MOD_META | MOD_SHIFT | MOD_CTRL] = 14,
|
|
|
|
|
[MOD_META | MOD_ALT | MOD_CTRL] = 15,
|
|
|
|
|
[MOD_META | MOD_SHIFT | MOD_ALT | MOD_CTRL] = 16,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
assert(keymap_mods < sizeof(mod_param_map) / sizeof(mod_param_map[0]));
|
|
|
|
|
int modify_param = mod_param_map[keymap_mods];
|
|
|
|
|
assert(modify_param != 0);
|
|
|
|
|
|
|
|
|
|
char reply[1024];
|
|
|
|
|
snprintf(reply, sizeof(reply), "\x1b[27;%d;%d~", modify_param, sym);
|
|
|
|
|
term_to_slave(term, reply, strlen(reply));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
if (effective_mods & alt) {
|
|
|
|
|
/*
|
|
|
|
|
* When the alt modifier is pressed, we do one out of three things:
|
|
|
|
|
*
|
|
|
|
|
* 1. we prefix the output bytes with ESC
|
|
|
|
|
* 2. we set the 8:th bit in the output byte
|
|
|
|
|
* 3. we ignore the alt modifier
|
|
|
|
|
*
|
|
|
|
|
* #1 is configured with \E[?1036, and is on by default
|
|
|
|
|
*
|
|
|
|
|
* If #1 has been disabled, we use #2, *if* it's a single
|
|
|
|
|
* byte we're emitting. Since this is an UTF-8 terminal,
|
|
|
|
|
* we then UTF8-encode the 8-bit character. #2 is
|
|
|
|
|
* configured with \E[?1034, and is on by default.
|
|
|
|
|
*
|
|
|
|
|
* Lastly, if both #1 and #2 have been disabled, the alt
|
|
|
|
|
* modifier is ignored.
|
|
|
|
|
*/
|
|
|
|
|
if (term->meta.esc_prefix) {
|
|
|
|
|
term_to_slave(term, "\x1b", 1);
|
|
|
|
|
term_to_slave(term, buf, count);
|
2020-01-11 18:59:46 +01:00
|
|
|
}
|
|
|
|
|
|
2020-01-20 18:38:50 +01:00
|
|
|
else if (term->meta.eight_bit && count == 1) {
|
|
|
|
|
const wchar_t wc = 0x80 | buf[0];
|
|
|
|
|
|
|
|
|
|
char utf8[8];
|
2020-08-23 07:42:20 +02:00
|
|
|
mbstate_t ps = {0};
|
2020-01-20 18:38:50 +01:00
|
|
|
size_t chars = wcrtomb(utf8, wc, &ps);
|
2020-01-11 18:59:46 +01:00
|
|
|
|
2020-01-20 18:38:50 +01:00
|
|
|
if (chars != (size_t)-1)
|
|
|
|
|
term_to_slave(term, utf8, chars);
|
|
|
|
|
else
|
|
|
|
|
term_to_slave(term, buf, count);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
/* Alt ignored */
|
2020-01-11 18:59:46 +01:00
|
|
|
term_to_slave(term, buf, count);
|
|
|
|
|
}
|
2020-01-20 18:38:50 +01:00
|
|
|
} else
|
|
|
|
|
term_to_slave(term, buf, count);
|
|
|
|
|
}
|
2020-01-11 18:59:46 +01:00
|
|
|
|
|
|
|
|
term_reset_view(term);
|
|
|
|
|
selection_cancel(term);
|
2019-11-22 22:19:00 +01:00
|
|
|
|
|
|
|
|
maybe_repeat:
|
2020-01-21 18:51:04 +01:00
|
|
|
clock_gettime(
|
|
|
|
|
term->wl->presentation_clock_id, &term->render.input_time);
|
|
|
|
|
|
2019-11-22 22:19:00 +01:00
|
|
|
if (should_repeat)
|
2020-07-08 16:45:26 +02:00
|
|
|
start_repeater(seat, key - 8);
|
2019-11-22 22:19:00 +01:00
|
|
|
|
2019-06-19 10:04:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
|
|
|
|
|
uint32_t mods_depressed, uint32_t mods_latched,
|
|
|
|
|
uint32_t mods_locked, uint32_t group)
|
|
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
2019-06-19 10:04:47 +02:00
|
|
|
|
|
|
|
|
LOG_DBG("modifiers: depressed=0x%x, latched=0x%x, locked=0x%x, group=%u",
|
|
|
|
|
mods_depressed, mods_latched, mods_locked, group);
|
|
|
|
|
|
2020-07-14 08:52:11 +02:00
|
|
|
if (seat->kbd.xkb == NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
2019-06-19 10:04:47 +02:00
|
|
|
xkb_state_update_mask(
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.xkb_state, mods_depressed, mods_latched, mods_locked, 0, 0, group);
|
2019-07-05 15:13:06 +02:00
|
|
|
|
2020-08-15 19:39:00 +01:00
|
|
|
/* Update state of modifiers we're interested in for e.g mouse events */
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.shift = xkb_state_mod_index_is_active(
|
|
|
|
|
seat->kbd.xkb_state, seat->kbd.mod_shift, XKB_STATE_MODS_DEPRESSED);
|
|
|
|
|
seat->kbd.alt = xkb_state_mod_index_is_active(
|
|
|
|
|
seat->kbd.xkb_state, seat->kbd.mod_alt, XKB_STATE_MODS_DEPRESSED);
|
|
|
|
|
seat->kbd.ctrl = xkb_state_mod_index_is_active(
|
|
|
|
|
seat->kbd.xkb_state, seat->kbd.mod_ctrl, XKB_STATE_MODS_DEPRESSED);
|
|
|
|
|
seat->kbd.meta = xkb_state_mod_index_is_active(
|
|
|
|
|
seat->kbd.xkb_state, seat->kbd.mod_meta, XKB_STATE_MODS_DEPRESSED);
|
|
|
|
|
|
|
|
|
|
if (seat->kbd_focus && seat->kbd_focus->active_surface == TERM_SURF_GRID)
|
2020-07-31 17:09:06 +02:00
|
|
|
term_xcursor_update_for_seat(seat->kbd_focus, seat);
|
2019-06-19 10:04:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
keyboard_repeat_info(void *data, struct wl_keyboard *wl_keyboard,
|
|
|
|
|
int32_t rate, int32_t delay)
|
|
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
2019-06-19 10:04:47 +02:00
|
|
|
LOG_DBG("keyboard repeat: rate=%d, delay=%d", rate, delay);
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->kbd.repeat.rate = rate;
|
|
|
|
|
seat->kbd.repeat.delay = delay;
|
2019-06-19 10:04:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const struct wl_keyboard_listener keyboard_listener = {
|
|
|
|
|
.keymap = &keyboard_keymap,
|
|
|
|
|
.enter = &keyboard_enter,
|
|
|
|
|
.leave = &keyboard_leave,
|
|
|
|
|
.key = &keyboard_key,
|
|
|
|
|
.modifiers = &keyboard_modifiers,
|
|
|
|
|
.repeat_info = &keyboard_repeat_info,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void
|
2020-07-08 16:45:26 +02:00
|
|
|
input_repeat(struct seat *seat, uint32_t key)
|
2019-06-19 10:04:47 +02:00
|
|
|
{
|
2020-07-09 11:20:46 +02:00
|
|
|
keyboard_key(seat, NULL, seat->kbd.serial, 0, key, XKB_KEY_DOWN);
|
2019-06-19 10:04:47 +02:00
|
|
|
}
|
2019-07-05 10:44:57 +02:00
|
|
|
|
2020-02-29 09:32:22 +01:00
|
|
|
static bool
|
|
|
|
|
is_top_left(const struct terminal *term, int x, int y)
|
|
|
|
|
{
|
2020-03-02 18:42:49 +01:00
|
|
|
int csd_border_size = term->conf->csd.border_width;
|
2020-02-29 09:32:22 +01:00
|
|
|
return (
|
|
|
|
|
(term->active_surface == TERM_SURF_BORDER_LEFT && y < 10 * term->scale) ||
|
|
|
|
|
(term->active_surface == TERM_SURF_BORDER_TOP && x < (10 + csd_border_size) * term->scale));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
is_top_right(const struct terminal *term, int x, int y)
|
|
|
|
|
{
|
2020-03-02 18:42:49 +01:00
|
|
|
int csd_border_size = term->conf->csd.border_width;
|
2020-02-29 09:32:22 +01:00
|
|
|
return (
|
|
|
|
|
(term->active_surface == TERM_SURF_BORDER_RIGHT && y < 10 * term->scale) ||
|
|
|
|
|
(term->active_surface == TERM_SURF_BORDER_TOP && x > term->width + 1 * csd_border_size * term->scale - 10 * term->scale));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
is_bottom_left(const struct terminal *term, int x, int y)
|
|
|
|
|
{
|
2020-03-02 18:42:49 +01:00
|
|
|
int csd_title_size = term->conf->csd.title_height;
|
|
|
|
|
int csd_border_size = term->conf->csd.border_width;
|
2020-02-29 09:32:22 +01:00
|
|
|
return (
|
|
|
|
|
(term->active_surface == TERM_SURF_BORDER_LEFT && y > csd_title_size * term->scale + term->height) ||
|
|
|
|
|
(term->active_surface == TERM_SURF_BORDER_BOTTOM && x < (10 + csd_border_size) * term->scale));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
is_bottom_right(const struct terminal *term, int x, int y)
|
|
|
|
|
{
|
2020-03-02 18:42:49 +01:00
|
|
|
int csd_title_size = term->conf->csd.title_height;
|
|
|
|
|
int csd_border_size = term->conf->csd.border_width;
|
2020-02-29 09:32:22 +01:00
|
|
|
return (
|
|
|
|
|
(term->active_surface == TERM_SURF_BORDER_RIGHT && y > csd_title_size * term->scale + term->height) ||
|
|
|
|
|
(term->active_surface == TERM_SURF_BORDER_BOTTOM && x > term->width + 1 * csd_border_size * term->scale - 10 * term->scale));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
|
xcursor_for_csd_border(struct terminal *term, int x, int y)
|
|
|
|
|
{
|
2020-07-09 09:52:11 +02:00
|
|
|
if (is_top_left(term, x, y)) return XCURSOR_TOP_LEFT_CORNER;
|
|
|
|
|
else if (is_top_right(term, x, y)) return XCURSOR_TOP_RIGHT_CORNER;
|
|
|
|
|
else if (is_bottom_left(term, x, y)) return XCURSOR_BOTTOM_LEFT_CORNER;
|
|
|
|
|
else if (is_bottom_right(term, x, y)) return XCURSOR_BOTTOM_RIGHT_CORNER;
|
|
|
|
|
else if (term->active_surface == TERM_SURF_BORDER_LEFT) return XCURSOR_LEFT_SIDE;
|
|
|
|
|
else if (term->active_surface == TERM_SURF_BORDER_RIGHT) return XCURSOR_RIGHT_SIDE;
|
|
|
|
|
else if (term->active_surface == TERM_SURF_BORDER_TOP) return XCURSOR_TOP_SIDE;
|
|
|
|
|
else if (term->active_surface == TERM_SURF_BORDER_BOTTOM) return XCURSOR_BOTTOM_SIDE;
|
2020-02-29 09:32:22 +01:00
|
|
|
else {
|
|
|
|
|
assert(false);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-07-05 10:44:57 +02:00
|
|
|
static void
|
|
|
|
|
wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
|
|
|
|
|
uint32_t serial, struct wl_surface *surface,
|
|
|
|
|
wl_fixed_t surface_x, wl_fixed_t surface_y)
|
|
|
|
|
{
|
2019-11-28 19:46:27 +01:00
|
|
|
assert(surface != NULL);
|
|
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
2020-02-29 12:09:28 +01:00
|
|
|
struct wl_window *win = wl_surface_get_user_data(surface);
|
|
|
|
|
struct terminal *term = win->term;
|
2019-10-27 18:43:07 +01:00
|
|
|
|
2020-07-09 11:20:46 +02:00
|
|
|
seat->pointer.serial = serial;
|
2020-07-31 17:09:06 +02:00
|
|
|
seat->pointer.hidden = false;
|
2020-07-09 11:20:46 +02:00
|
|
|
|
2020-03-14 11:51:47 +01:00
|
|
|
LOG_DBG("pointer-enter: pointer=%p, serial=%u, surface = %p, new-moused = %p",
|
2020-08-23 07:50:27 +02:00
|
|
|
(void *)wl_pointer, serial, (void *)surface, (void *)term);
|
2019-11-29 22:12:54 +01:00
|
|
|
|
2020-07-08 19:52:17 +02:00
|
|
|
/* Scale may have changed */
|
|
|
|
|
wayl_reload_xcursor_theme(seat, term->scale);
|
|
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->mouse_focus = term;
|
2019-07-05 15:13:06 +02:00
|
|
|
|
2019-09-26 18:41:26 +02:00
|
|
|
int x = wl_fixed_to_int(surface_x) * term->scale;
|
|
|
|
|
int y = wl_fixed_to_int(surface_y) * term->scale;
|
2019-07-05 15:13:06 +02:00
|
|
|
|
2020-02-24 22:40:24 +01:00
|
|
|
switch ((term->active_surface = term_surface_kind(term, surface))) {
|
2020-07-26 12:31:13 +02:00
|
|
|
case TERM_SURF_GRID: {
|
2020-08-08 10:07:25 +02:00
|
|
|
/*
|
|
|
|
|
* Translate x,y pixel coordinate to a cell coordinate, or -1
|
|
|
|
|
* if the cursor is outside the grid. I.e. if it is inside the
|
|
|
|
|
* margins.
|
|
|
|
|
*/
|
|
|
|
|
|
2020-08-07 22:04:37 +02:00
|
|
|
if (x < term->margins.left || x >= term->width - term->margins.right)
|
|
|
|
|
seat->mouse.col = -1;
|
|
|
|
|
else
|
|
|
|
|
seat->mouse.col = (x - term->margins.left) / term->cell_width;
|
2020-07-26 12:31:13 +02:00
|
|
|
|
2020-08-07 22:04:37 +02:00
|
|
|
if (y < term->margins.top || y >= term->height - term->margins.bottom)
|
|
|
|
|
seat->mouse.row = -1;
|
|
|
|
|
else
|
|
|
|
|
seat->mouse.row = (y - term->margins.top) / term->cell_height;
|
2020-07-26 12:31:13 +02:00
|
|
|
|
2020-07-31 17:09:06 +02:00
|
|
|
term_xcursor_update_for_seat(term, seat);
|
2020-02-24 22:40:24 +01:00
|
|
|
break;
|
2020-07-26 12:31:13 +02:00
|
|
|
}
|
2020-02-24 22:40:24 +01:00
|
|
|
|
|
|
|
|
case TERM_SURF_SEARCH:
|
2020-07-26 12:37:35 +02:00
|
|
|
case TERM_SURF_SCROLLBACK_INDICATOR:
|
2020-08-14 07:35:01 +02:00
|
|
|
case TERM_SURF_RENDER_TIMER:
|
2020-02-29 15:29:00 +01:00
|
|
|
case TERM_SURF_TITLE:
|
2020-07-09 09:52:11 +02:00
|
|
|
render_xcursor_set(seat, term, XCURSOR_LEFT_PTR);
|
2020-02-24 22:40:24 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TERM_SURF_BORDER_LEFT:
|
|
|
|
|
case TERM_SURF_BORDER_RIGHT:
|
|
|
|
|
case TERM_SURF_BORDER_TOP:
|
2020-02-29 09:32:22 +01:00
|
|
|
case TERM_SURF_BORDER_BOTTOM:
|
2020-07-09 09:52:11 +02:00
|
|
|
render_xcursor_set(seat, term, xcursor_for_csd_border(term, x, y));
|
2020-02-25 20:31:13 +01:00
|
|
|
break;
|
|
|
|
|
|
2020-03-02 20:29:28 +01:00
|
|
|
case TERM_SURF_BUTTON_MINIMIZE:
|
|
|
|
|
case TERM_SURF_BUTTON_MAXIMIZE:
|
2020-03-03 18:22:32 +01:00
|
|
|
case TERM_SURF_BUTTON_CLOSE:
|
2020-07-09 09:52:11 +02:00
|
|
|
render_xcursor_set(seat, term, XCURSOR_LEFT_PTR);
|
2020-03-06 19:16:54 +01:00
|
|
|
render_refresh_csd(term);
|
2020-03-02 20:29:28 +01:00
|
|
|
break;
|
|
|
|
|
|
2020-02-29 15:29:00 +01:00
|
|
|
case TERM_SURF_NONE:
|
|
|
|
|
assert(false);
|
2020-02-24 22:40:24 +01:00
|
|
|
break;
|
|
|
|
|
}
|
2019-07-05 10:44:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
|
|
|
|
|
uint32_t serial, struct wl_surface *surface)
|
|
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
|
|
|
|
struct terminal *old_moused = seat->mouse_focus;
|
2019-11-29 22:13:19 +01:00
|
|
|
|
2020-03-14 11:51:47 +01:00
|
|
|
LOG_DBG(
|
2020-07-11 11:13:45 +02:00
|
|
|
"%s: pointer-leave: pointer=%p, serial=%u, surface = %p, old-moused = %p",
|
2020-08-23 07:50:27 +02:00
|
|
|
seat->name, (void *)wl_pointer, serial, (void *)surface,
|
|
|
|
|
(void *)old_moused);
|
2019-11-29 22:13:19 +01:00
|
|
|
|
2020-07-31 17:09:06 +02:00
|
|
|
seat->pointer.hidden = false;
|
|
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
if (seat->pointer.xcursor_callback != NULL) {
|
2020-02-15 19:02:43 +01:00
|
|
|
/* A cursor frame callback may never be called if the pointer leaves our surface */
|
2020-07-08 16:45:26 +02:00
|
|
|
wl_callback_destroy(seat->pointer.xcursor_callback);
|
|
|
|
|
seat->pointer.xcursor_callback = NULL;
|
2020-07-09 09:52:11 +02:00
|
|
|
seat->pointer.xcursor_pending = false;
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->pointer.xcursor = NULL;
|
2020-02-15 19:02:43 +01:00
|
|
|
}
|
|
|
|
|
|
2020-02-29 12:08:59 +01:00
|
|
|
/* Reset mouse state */
|
2020-08-10 18:59:03 +02:00
|
|
|
seat->mouse.x = seat->mouse.y = 0;
|
|
|
|
|
seat->mouse.col = seat->mouse.row = 0;
|
|
|
|
|
seat->mouse.button = seat->mouse.last_button = seat->mouse.count = 0;
|
2020-08-22 13:35:36 +02:00
|
|
|
seat->mouse.consumed = false;
|
2020-08-10 18:59:03 +02:00
|
|
|
memset(&seat->mouse.last_time, 0, sizeof(seat->mouse.last_time));
|
|
|
|
|
seat->mouse.axis_aggregated = 0.0;
|
|
|
|
|
seat->mouse.have_discrete = false;
|
2020-02-29 12:08:59 +01:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->mouse_focus = NULL;
|
2019-11-29 22:13:19 +01:00
|
|
|
if (old_moused == NULL) {
|
2019-11-28 19:47:00 +01:00
|
|
|
LOG_WARN(
|
|
|
|
|
"compositor sent pointer_leave event without a pointer_enter "
|
2020-08-23 07:50:27 +02:00
|
|
|
"event: surface=%p", (void *)surface);
|
2020-02-24 22:41:46 +01:00
|
|
|
} else {
|
2020-02-29 12:09:28 +01:00
|
|
|
if (surface != NULL) {
|
|
|
|
|
/* Sway 1.4 sends this event with a NULL surface when we destroy the window */
|
2020-08-07 20:42:34 +01:00
|
|
|
const struct wl_window UNUSED *win = wl_surface_get_user_data(surface);
|
2020-02-29 12:09:28 +01:00
|
|
|
assert(old_moused == win->term);
|
|
|
|
|
}
|
2020-03-02 20:29:28 +01:00
|
|
|
|
|
|
|
|
enum term_surface active_surface = old_moused->active_surface;
|
|
|
|
|
|
2020-02-24 22:41:46 +01:00
|
|
|
old_moused->active_surface = TERM_SURF_NONE;
|
2020-07-31 17:09:06 +02:00
|
|
|
term_xcursor_update_for_seat(old_moused, seat);
|
2020-03-02 20:29:28 +01:00
|
|
|
|
|
|
|
|
switch (active_surface) {
|
|
|
|
|
case TERM_SURF_BUTTON_MINIMIZE:
|
|
|
|
|
case TERM_SURF_BUTTON_MAXIMIZE:
|
2020-03-03 18:22:32 +01:00
|
|
|
case TERM_SURF_BUTTON_CLOSE:
|
|
|
|
|
if (old_moused->is_shutting_down)
|
|
|
|
|
break;
|
|
|
|
|
|
2020-03-06 19:16:54 +01:00
|
|
|
render_refresh_csd(old_moused);
|
2020-03-02 20:29:28 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TERM_SURF_NONE:
|
|
|
|
|
case TERM_SURF_GRID:
|
|
|
|
|
case TERM_SURF_SEARCH:
|
2020-07-26 12:37:35 +02:00
|
|
|
case TERM_SURF_SCROLLBACK_INDICATOR:
|
2020-08-14 07:35:01 +02:00
|
|
|
case TERM_SURF_RENDER_TIMER:
|
2020-03-02 20:29:28 +01:00
|
|
|
case TERM_SURF_TITLE:
|
|
|
|
|
case TERM_SURF_BORDER_LEFT:
|
|
|
|
|
case TERM_SURF_BORDER_RIGHT:
|
|
|
|
|
case TERM_SURF_BORDER_TOP:
|
|
|
|
|
case TERM_SURF_BORDER_BOTTOM:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2020-02-24 22:41:46 +01:00
|
|
|
}
|
2019-07-05 10:44:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
|
|
|
|
|
uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y)
|
|
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
|
|
|
|
struct wayland *wayl = seat->wayl;
|
|
|
|
|
struct terminal *term = seat->mouse_focus;
|
2020-02-29 15:38:04 +01:00
|
|
|
struct wl_window *win = term->window;
|
2019-11-22 21:49:50 +01:00
|
|
|
|
2020-08-23 07:50:27 +02:00
|
|
|
LOG_DBG("pointer_motion: pointer=%p, x=%d, y=%d", (void *)wl_pointer,
|
2020-03-14 11:51:47 +01:00
|
|
|
wl_fixed_to_int(surface_x), wl_fixed_to_int(surface_y));
|
|
|
|
|
|
2019-10-27 18:43:07 +01:00
|
|
|
assert(term != NULL);
|
2019-07-05 15:13:06 +02:00
|
|
|
|
2019-09-26 18:39:49 +02:00
|
|
|
int x = wl_fixed_to_int(surface_x) * term->scale;
|
|
|
|
|
int y = wl_fixed_to_int(surface_y) * term->scale;
|
2019-07-05 15:13:06 +02:00
|
|
|
|
2020-07-31 17:09:06 +02:00
|
|
|
seat->pointer.hidden = false;
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->mouse.x = x;
|
|
|
|
|
seat->mouse.y = y;
|
2020-02-29 09:32:22 +01:00
|
|
|
|
2020-02-25 20:31:13 +01:00
|
|
|
switch (term->active_surface) {
|
|
|
|
|
case TERM_SURF_NONE:
|
|
|
|
|
case TERM_SURF_SEARCH:
|
2020-07-26 12:37:35 +02:00
|
|
|
case TERM_SURF_SCROLLBACK_INDICATOR:
|
2020-08-14 07:35:01 +02:00
|
|
|
case TERM_SURF_RENDER_TIMER:
|
2020-03-02 20:29:28 +01:00
|
|
|
case TERM_SURF_BUTTON_MINIMIZE:
|
|
|
|
|
case TERM_SURF_BUTTON_MAXIMIZE:
|
|
|
|
|
case TERM_SURF_BUTTON_CLOSE:
|
2020-02-29 15:38:04 +01:00
|
|
|
break;
|
|
|
|
|
|
2020-02-25 20:31:13 +01:00
|
|
|
case TERM_SURF_TITLE:
|
2020-02-29 15:38:04 +01:00
|
|
|
/* We've started a 'move' timer, but user started dragging
|
|
|
|
|
* right away - abort the timer and initiate the actual move
|
|
|
|
|
* right away */
|
2020-07-08 16:45:26 +02:00
|
|
|
if (seat->mouse.button == BTN_LEFT && win->csd.move_timeout_fd != -1) {
|
2020-02-29 15:38:04 +01:00
|
|
|
fdm_del(wayl->fdm, win->csd.move_timeout_fd);
|
|
|
|
|
win->csd.move_timeout_fd = -1;
|
2020-07-08 16:45:26 +02:00
|
|
|
xdg_toplevel_move(win->xdg_toplevel, seat->wl_seat, win->csd.serial);
|
2020-02-29 15:38:04 +01:00
|
|
|
}
|
2020-02-25 20:31:13 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TERM_SURF_BORDER_LEFT:
|
|
|
|
|
case TERM_SURF_BORDER_RIGHT:
|
|
|
|
|
case TERM_SURF_BORDER_TOP:
|
|
|
|
|
case TERM_SURF_BORDER_BOTTOM:
|
2020-07-09 09:52:11 +02:00
|
|
|
render_xcursor_set(seat, term, xcursor_for_csd_border(term, x, y));
|
2020-02-25 20:31:13 +01:00
|
|
|
break;
|
|
|
|
|
|
2020-02-29 15:29:00 +01:00
|
|
|
case TERM_SURF_GRID: {
|
2020-07-26 12:31:13 +02:00
|
|
|
int old_col = seat->mouse.col;
|
|
|
|
|
int old_row = seat->mouse.row;
|
|
|
|
|
|
2020-08-07 22:04:37 +02:00
|
|
|
/*
|
|
|
|
|
* While the seat's mouse coordinates must always be on the
|
|
|
|
|
* grid, or -1, we allow updating the selection even when the
|
|
|
|
|
* mouse is outside the grid (could also be outside the
|
|
|
|
|
* terminal window).
|
|
|
|
|
*/
|
|
|
|
|
int selection_col;
|
|
|
|
|
int selection_row;
|
|
|
|
|
|
|
|
|
|
if (x < term->margins.left) {
|
|
|
|
|
seat->mouse.col = -1;
|
|
|
|
|
selection_col = 0;
|
|
|
|
|
} else if (x >= term->width - term->margins.right) {
|
|
|
|
|
seat->mouse.col = -1;
|
|
|
|
|
selection_col = term->cols - 1;
|
|
|
|
|
} else {
|
|
|
|
|
seat->mouse.col = (x - term->margins.left) / term->cell_width;
|
|
|
|
|
selection_col = seat->mouse.col;
|
|
|
|
|
}
|
2020-07-26 12:31:13 +02:00
|
|
|
|
2020-08-07 22:04:37 +02:00
|
|
|
if (y < term->margins.top) {
|
|
|
|
|
seat->mouse.row = -1;
|
|
|
|
|
selection_row = 0;
|
|
|
|
|
} else if (y >= term->height - term->margins.bottom) {
|
|
|
|
|
seat->mouse.row = -1;
|
|
|
|
|
selection_row = term->rows - 1;
|
|
|
|
|
} else {
|
|
|
|
|
seat->mouse.row = (y - term->margins.top) / term->cell_height;
|
|
|
|
|
selection_row = seat->mouse.row;
|
|
|
|
|
}
|
2019-07-05 15:13:06 +02:00
|
|
|
|
2020-08-07 22:04:37 +02:00
|
|
|
assert(seat->mouse.col == -1 || (seat->mouse.col >= 0 && seat->mouse.col < term->cols));
|
|
|
|
|
assert(seat->mouse.row == -1 || (seat->mouse.row >= 0 && seat->mouse.row < term->rows));
|
2019-07-11 11:09:34 +02:00
|
|
|
|
2020-08-07 22:04:37 +02:00
|
|
|
term_xcursor_update_for_seat(term, seat);
|
2019-07-11 09:51:51 +02:00
|
|
|
|
2020-08-07 22:04:37 +02:00
|
|
|
/* Cursor has moved to a different cell since last time */
|
|
|
|
|
bool cursor_is_on_new_cell
|
|
|
|
|
= old_col != seat->mouse.col || old_row != seat->mouse.row;
|
2019-07-11 09:51:51 +02:00
|
|
|
|
2020-08-08 10:08:47 +02:00
|
|
|
/* Cursor is inside the grid, i.e. *not* in the margins */
|
2020-08-08 10:00:18 +02:00
|
|
|
bool cursor_is_on_grid = seat->mouse.col >= 0 && seat->mouse.row >= 0;
|
|
|
|
|
|
2020-08-07 22:04:37 +02:00
|
|
|
/* Update selection */
|
2020-08-11 16:36:42 +02:00
|
|
|
if (!term->is_searching) {
|
|
|
|
|
if (cursor_is_on_new_cell || term->selection.end.row < 0)
|
|
|
|
|
selection_update(term, selection_col, selection_row);
|
|
|
|
|
}
|
2019-07-11 09:51:51 +02:00
|
|
|
|
2020-08-07 22:04:37 +02:00
|
|
|
/* Send mouse event to client application */
|
2020-08-22 13:35:36 +02:00
|
|
|
if (!seat->mouse.consumed &&
|
|
|
|
|
!term_mouse_grabbed(term, seat) &&
|
2020-08-08 10:00:18 +02:00
|
|
|
cursor_is_on_new_cell && cursor_is_on_grid)
|
2020-08-07 19:55:02 +02:00
|
|
|
{
|
|
|
|
|
assert(seat->mouse.col < term->cols);
|
|
|
|
|
assert(seat->mouse.row < term->rows);
|
2019-07-05 15:13:06 +02:00
|
|
|
|
2020-07-09 09:52:11 +02:00
|
|
|
term_mouse_motion(
|
|
|
|
|
term, seat->mouse.button, seat->mouse.row, seat->mouse.col,
|
|
|
|
|
seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl);
|
|
|
|
|
}
|
2020-02-29 15:29:00 +01:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-07-05 10:44:57 +02:00
|
|
|
}
|
|
|
|
|
|
2020-02-29 12:52:55 +01:00
|
|
|
static bool
|
|
|
|
|
fdm_csd_move(struct fdm *fdm, int fd, int events, void *data)
|
|
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
2020-02-29 12:52:55 +01:00
|
|
|
fdm_del(fdm, fd);
|
|
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
if (seat->mouse_focus == NULL) {
|
|
|
|
|
LOG_WARN(
|
|
|
|
|
"%s: CSD move timeout triggered, but seat's has no mouse focused terminal",
|
|
|
|
|
seat->name);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct wl_window *win = seat->mouse_focus->window;
|
|
|
|
|
|
|
|
|
|
win->csd.move_timeout_fd = -1;
|
|
|
|
|
xdg_toplevel_move(win->xdg_toplevel, seat->wl_seat, win->csd.serial);
|
2020-02-29 12:52:55 +01:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2019-07-05 10:44:57 +02:00
|
|
|
static void
|
|
|
|
|
wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
|
|
|
|
|
uint32_t serial, uint32_t time, uint32_t button, uint32_t state)
|
|
|
|
|
{
|
2020-03-14 11:51:47 +01:00
|
|
|
LOG_DBG("BUTTON: pointer=%p, serial=%u, button=%x, state=%u",
|
2020-08-23 07:50:27 +02:00
|
|
|
(void *)wl_pointer, serial, button, state);
|
2019-07-05 14:24:51 +02:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
|
|
|
|
struct wayland *wayl = seat->wayl;
|
|
|
|
|
struct terminal *term = seat->mouse_focus;
|
2019-07-05 14:24:51 +02:00
|
|
|
|
2020-07-31 17:09:06 +02:00
|
|
|
seat->pointer.hidden = false;
|
|
|
|
|
|
2019-11-28 19:26:52 +01:00
|
|
|
assert(term != NULL);
|
2020-02-24 22:42:04 +01:00
|
|
|
|
2020-02-29 11:55:43 +01:00
|
|
|
/* Update double/triple click state */
|
|
|
|
|
if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
|
|
|
|
|
/* Time since last click */
|
|
|
|
|
struct timeval now, since_last;
|
|
|
|
|
gettimeofday(&now, NULL);
|
2020-07-08 16:45:26 +02:00
|
|
|
timersub(&now, &seat->mouse.last_time, &since_last);
|
2020-02-29 11:55:43 +01:00
|
|
|
|
|
|
|
|
/* Double- or triple click? */
|
2020-07-08 16:45:26 +02:00
|
|
|
if (button == seat->mouse.last_button &&
|
2020-02-29 11:55:43 +01:00
|
|
|
since_last.tv_sec == 0 &&
|
|
|
|
|
since_last.tv_usec <= 300 * 1000)
|
|
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->mouse.count++;
|
2020-02-29 11:55:43 +01:00
|
|
|
} else
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->mouse.count = 1;
|
2020-02-29 11:55:43 +01:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->mouse.button = button; /* For motion events */
|
|
|
|
|
seat->mouse.last_button = button;
|
|
|
|
|
seat->mouse.last_time = now;
|
2020-02-29 11:55:43 +01:00
|
|
|
} else
|
2020-07-08 16:45:26 +02:00
|
|
|
seat->mouse.button = 0; /* For motion events */
|
2020-02-29 11:55:43 +01:00
|
|
|
|
2020-02-25 20:31:13 +01:00
|
|
|
switch (term->active_surface) {
|
|
|
|
|
case TERM_SURF_TITLE:
|
2020-02-29 11:56:16 +01:00
|
|
|
if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
|
|
|
|
|
|
2020-02-29 12:52:55 +01:00
|
|
|
struct wl_window *win = term->window;
|
|
|
|
|
|
2020-02-29 11:56:16 +01:00
|
|
|
/* Toggle maximized state on double-click */
|
2020-07-08 16:45:26 +02:00
|
|
|
if (button == BTN_LEFT && seat->mouse.count == 2) {
|
2020-02-29 12:52:55 +01:00
|
|
|
if (win->is_maximized)
|
|
|
|
|
xdg_toplevel_unset_maximized(win->xdg_toplevel);
|
2020-02-29 11:56:16 +01:00
|
|
|
else
|
2020-02-29 12:52:55 +01:00
|
|
|
xdg_toplevel_set_maximized(win->xdg_toplevel);
|
2020-02-26 13:23:11 +01:00
|
|
|
}
|
2020-02-29 11:56:16 +01:00
|
|
|
|
2020-02-29 12:52:55 +01:00
|
|
|
else if (button == BTN_LEFT && win->csd.move_timeout_fd == -1) {
|
|
|
|
|
const struct itimerspec timeout = {
|
2020-03-01 13:20:07 +01:00
|
|
|
.it_value = {.tv_nsec = 200000000},
|
2020-02-29 12:52:55 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
int fd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK);
|
|
|
|
|
if (fd >= 0 &&
|
|
|
|
|
timerfd_settime(fd, 0, &timeout, NULL) == 0 &&
|
2020-07-08 16:45:26 +02:00
|
|
|
fdm_add(wayl->fdm, fd, EPOLLIN, &fdm_csd_move, seat))
|
2020-02-29 12:52:55 +01:00
|
|
|
{
|
|
|
|
|
win->csd.move_timeout_fd = fd;
|
|
|
|
|
win->csd.serial = serial;
|
|
|
|
|
} else {
|
|
|
|
|
LOG_ERRNO("failed to configure XDG toplevel move timer FD");
|
|
|
|
|
close(fd);
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-02-26 13:23:11 +01:00
|
|
|
}
|
2020-02-29 15:38:04 +01:00
|
|
|
|
|
|
|
|
else if (state == WL_POINTER_BUTTON_STATE_RELEASED) {
|
|
|
|
|
struct wl_window *win = term->window;
|
|
|
|
|
if (win->csd.move_timeout_fd != -1) {
|
|
|
|
|
fdm_del(wayl->fdm, win->csd.move_timeout_fd);
|
|
|
|
|
win->csd.move_timeout_fd = -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-02-25 20:31:13 +01:00
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
case TERM_SURF_BORDER_LEFT:
|
|
|
|
|
case TERM_SURF_BORDER_RIGHT:
|
|
|
|
|
case TERM_SURF_BORDER_TOP:
|
|
|
|
|
case TERM_SURF_BORDER_BOTTOM: {
|
2020-03-01 11:43:58 +01:00
|
|
|
static const enum xdg_toplevel_resize_edge map[] = {
|
2020-02-25 20:31:13 +01:00
|
|
|
[TERM_SURF_BORDER_LEFT] = XDG_TOPLEVEL_RESIZE_EDGE_LEFT,
|
|
|
|
|
[TERM_SURF_BORDER_RIGHT] = XDG_TOPLEVEL_RESIZE_EDGE_RIGHT,
|
|
|
|
|
[TERM_SURF_BORDER_TOP] = XDG_TOPLEVEL_RESIZE_EDGE_TOP,
|
|
|
|
|
[TERM_SURF_BORDER_BOTTOM] = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM,
|
|
|
|
|
};
|
2020-02-29 09:32:22 +01:00
|
|
|
|
|
|
|
|
if (button == BTN_LEFT && state == WL_POINTER_BUTTON_STATE_PRESSED) {
|
2020-03-01 11:43:58 +01:00
|
|
|
enum xdg_toplevel_resize_edge resize_type;
|
2020-02-29 09:32:22 +01:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
int x = seat->mouse.x;
|
|
|
|
|
int y = seat->mouse.y;
|
2020-02-29 09:32:22 +01:00
|
|
|
|
|
|
|
|
if (is_top_left(term, x, y))
|
|
|
|
|
resize_type = XDG_TOPLEVEL_RESIZE_EDGE_TOP_LEFT;
|
|
|
|
|
else if (is_top_right(term, x, y))
|
|
|
|
|
resize_type = XDG_TOPLEVEL_RESIZE_EDGE_TOP_RIGHT;
|
|
|
|
|
else if (is_bottom_left(term, x, y))
|
|
|
|
|
resize_type = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_LEFT;
|
|
|
|
|
else if (is_bottom_right(term, x, y))
|
|
|
|
|
resize_type = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_RIGHT;
|
|
|
|
|
else
|
|
|
|
|
resize_type = map[term->active_surface];
|
|
|
|
|
|
|
|
|
|
xdg_toplevel_resize(
|
2020-07-08 16:45:26 +02:00
|
|
|
term->window->xdg_toplevel, seat->wl_seat, serial, resize_type);
|
2020-02-29 09:32:22 +01:00
|
|
|
}
|
2020-02-25 20:31:13 +01:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-02 20:29:28 +01:00
|
|
|
case TERM_SURF_BUTTON_MINIMIZE:
|
|
|
|
|
if (button == BTN_LEFT && state == WL_POINTER_BUTTON_STATE_PRESSED)
|
|
|
|
|
xdg_toplevel_set_minimized(term->window->xdg_toplevel);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TERM_SURF_BUTTON_MAXIMIZE:
|
|
|
|
|
if (button == BTN_LEFT && state == WL_POINTER_BUTTON_STATE_PRESSED) {
|
|
|
|
|
if (term->window->is_maximized)
|
|
|
|
|
xdg_toplevel_unset_maximized(term->window->xdg_toplevel);
|
|
|
|
|
else
|
|
|
|
|
xdg_toplevel_set_maximized(term->window->xdg_toplevel);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TERM_SURF_BUTTON_CLOSE:
|
|
|
|
|
if (button == BTN_LEFT && state == WL_POINTER_BUTTON_STATE_PRESSED)
|
|
|
|
|
term_shutdown(term);
|
|
|
|
|
break;
|
|
|
|
|
|
2020-02-25 20:31:13 +01:00
|
|
|
case TERM_SURF_SEARCH:
|
2020-07-26 12:37:35 +02:00
|
|
|
case TERM_SURF_SCROLLBACK_INDICATOR:
|
2020-08-14 07:35:01 +02:00
|
|
|
case TERM_SURF_RENDER_TIMER:
|
2020-02-25 20:31:13 +01:00
|
|
|
break;
|
2020-02-24 22:42:04 +01:00
|
|
|
|
2020-02-29 15:29:00 +01:00
|
|
|
case TERM_SURF_GRID: {
|
|
|
|
|
search_cancel(term);
|
|
|
|
|
|
2020-08-07 19:59:03 +02:00
|
|
|
bool cursor_is_on_grid = seat->mouse.col >= 0 && seat->mouse.row >= 0;
|
|
|
|
|
|
2020-02-29 15:29:00 +01:00
|
|
|
switch (state) {
|
|
|
|
|
case WL_POINTER_BUTTON_STATE_PRESSED: {
|
2020-09-07 19:35:25 +02:00
|
|
|
if (!seat->mouse.consumed) {
|
|
|
|
|
if (seat->wl_keyboard != NULL) {
|
|
|
|
|
/* Seat has keyboard - use mouse bindings *with* modifiers */
|
|
|
|
|
|
|
|
|
|
xkb_mod_mask_t mods = xkb_state_serialize_mods(
|
|
|
|
|
seat->kbd.xkb_state, XKB_STATE_MODS_DEPRESSED);
|
|
|
|
|
|
|
|
|
|
/* Ignore Shift when matching modifiers, since it is
|
|
|
|
|
* used to enable selection in mouse grabbing client
|
|
|
|
|
* applications */
|
|
|
|
|
mods &= ~(1 << seat->kbd.mod_shift);
|
|
|
|
|
|
|
|
|
|
tll_foreach(seat->mouse.bindings, it) {
|
|
|
|
|
const struct mouse_binding *binding = &it->item;
|
|
|
|
|
|
|
|
|
|
if (binding->button != button) {
|
|
|
|
|
/* Wrong button */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (binding->mods != mods) {
|
|
|
|
|
/* Modifier mismatch */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (binding->count != seat->mouse.count) {
|
|
|
|
|
/* Not correct click count */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
seat->mouse.consumed = execute_binding(
|
|
|
|
|
seat, term, binding->action, NULL, serial);
|
|
|
|
|
break;
|
2020-08-09 22:40:53 +02:00
|
|
|
}
|
2020-02-29 15:29:00 +01:00
|
|
|
}
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
|
2020-09-07 19:35:25 +02:00
|
|
|
else {
|
|
|
|
|
/* Seat does NOT have a keyboard - use mouse bindings *without* modifiers */
|
|
|
|
|
tll_foreach(seat->wayl->conf->bindings.mouse, it) {
|
|
|
|
|
const struct config_mouse_binding *binding = &it->item;
|
|
|
|
|
|
|
|
|
|
if (binding->button != button) {
|
|
|
|
|
/* Wrong button */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (binding->count != seat->mouse.count) {
|
|
|
|
|
/* Incorrect click count */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const struct config_key_modifiers no_mods = {0};
|
|
|
|
|
if (memcmp(&binding->modifiers, &no_mods, sizeof(no_mods)) != 0) {
|
|
|
|
|
/* Binding has modifiers */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
seat->mouse.consumed = execute_binding(
|
|
|
|
|
seat, term, binding->action, NULL, serial);
|
|
|
|
|
break;
|
config: key/mouse bindings: refactor: less parsing in keyboard_enter()
This simplifies the handling of mouse and keyboard bindings.
Before, the bindings where parsed *both* when loading the
configuration, and then on every keyboard enter event. This was done
since keys require a keymap to be decoded. Something we don't have at
configuration time. The idea was that at config time, we used a
default keymap just to verify the key combo strings were valid.
The following has changed:
* The bindings in the config struct is now *one* key combo per
entry. Previously, it was one *action* per entry, and each entry
had one or more key combos.
Doing it this way makes it easier when converting the binding in the
keyboard enter event (which previously had to expand the combos
anyway).
* The bindings in the config struct no longer contains any unparsed
strings.
A key binding contains a decoded 'modifier' struct (which specifies
whether e.g. ctrl, or shift, or ctrl+shift must be pressed for the
binding to be used).
It also contains a decoded XKB keysym.
* A mouse binding in the config struct is similar to a key binding,
except it contains the button, and click count instead of the XKB
key sym.
* The modifiers in the user-specified key combo is decoded at config
time, by using the pre-defined XKB constants
XKB_MOD_NAME_<modifier>.
The result is stored in a 'modifiers' struct, which is just a
collection of booleans; one for each supported modifier.
The supported modifiers are: shift, ctrl, alt and meta/super.
* The key sym is decoded at config time using
xkb_keysym_from_name(). This call does *not* depend on a keymap.
* The mouse button is decoded at config time using a hardcoded mapping
table (just like before).
* The click count is currently hard-coded to 1.
* In the keyboard enter event, all we need to do is pre-compute the
xkb_mod_mask_t variable for each key/mouse binding, and find all the
*key codes* that map to the (already decoded) symbol.
For mouse bindings, the modifiers are the *only* reason we convert
the mouse bindings at all.
In fact, on button events, we check if the seat has a keyboard. If
not, we use the mouse bindings from the configuration directly, and
simply filter out those with a non-empty set of modifiers.
2020-08-10 19:00:03 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-07 19:35:25 +02:00
|
|
|
if (!term_mouse_grabbed(term, seat) &&
|
|
|
|
|
cursor_is_on_grid)
|
|
|
|
|
{
|
|
|
|
|
term_mouse_down(
|
|
|
|
|
term, button, seat->mouse.row, seat->mouse.col,
|
|
|
|
|
seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl);
|
|
|
|
|
}
|
2020-07-09 09:52:11 +02:00
|
|
|
}
|
2020-02-29 15:29:00 +01:00
|
|
|
break;
|
|
|
|
|
}
|
2019-08-06 19:32:06 +02:00
|
|
|
|
2020-02-29 15:29:00 +01:00
|
|
|
case WL_POINTER_BUTTON_STATE_RELEASED:
|
2020-08-11 09:55:33 +02:00
|
|
|
selection_finalize(seat, term, serial);
|
2019-08-06 19:32:06 +02:00
|
|
|
|
2020-08-22 13:35:36 +02:00
|
|
|
if (!seat->mouse.consumed &&
|
|
|
|
|
!term_mouse_grabbed(term, seat) &&
|
|
|
|
|
cursor_is_on_grid)
|
|
|
|
|
{
|
2020-07-09 09:52:11 +02:00
|
|
|
term_mouse_up(
|
|
|
|
|
term, button, seat->mouse.row, seat->mouse.col,
|
|
|
|
|
seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl);
|
|
|
|
|
}
|
2020-08-22 13:35:36 +02:00
|
|
|
|
|
|
|
|
seat->mouse.consumed = false;
|
2020-02-29 15:29:00 +01:00
|
|
|
break;
|
2019-07-11 16:42:59 +02:00
|
|
|
}
|
2019-07-05 14:24:51 +02:00
|
|
|
break;
|
2019-07-17 21:30:57 +02:00
|
|
|
}
|
2019-07-05 14:24:51 +02:00
|
|
|
|
2020-02-29 15:29:00 +01:00
|
|
|
case TERM_SURF_NONE:
|
|
|
|
|
assert(false);
|
2019-07-05 14:24:51 +02:00
|
|
|
break;
|
2020-02-29 15:29:00 +01:00
|
|
|
|
2019-07-05 14:24:51 +02:00
|
|
|
}
|
2019-07-05 10:44:57 +02:00
|
|
|
}
|
|
|
|
|
|
2019-07-26 18:47:56 +02:00
|
|
|
static void
|
2020-07-08 16:45:26 +02:00
|
|
|
mouse_scroll(struct seat *seat, int amount)
|
2019-07-26 18:47:56 +02:00
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
struct terminal *term = seat->mouse_focus;
|
2019-10-27 18:43:07 +01:00
|
|
|
assert(term != NULL);
|
|
|
|
|
|
2019-07-26 18:47:56 +02:00
|
|
|
int button = amount < 0 ? BTN_BACK : BTN_FORWARD;
|
|
|
|
|
|
|
|
|
|
void (*scrollback)(struct terminal *term, int rows)
|
|
|
|
|
= amount < 0 ? &cmd_scrollback_up : &cmd_scrollback_down;
|
|
|
|
|
|
|
|
|
|
amount = abs(amount);
|
|
|
|
|
|
2019-08-19 21:16:47 +02:00
|
|
|
if ((button == BTN_BACK || button == BTN_FORWARD) &&
|
2020-09-15 18:40:51 +02:00
|
|
|
term->grid == &term->alt && term->alt_scrolling &&
|
|
|
|
|
term->mouse_tracking == MOUSE_NONE)
|
2019-08-19 21:16:47 +02:00
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
* alternateScroll/faux scrolling - translate mouse
|
|
|
|
|
* "back"/"forward" to up/down keys
|
|
|
|
|
*/
|
|
|
|
|
|
2019-11-30 16:48:58 +01:00
|
|
|
static xkb_keycode_t key_arrow_up = 0;
|
|
|
|
|
static xkb_keycode_t key_arrow_down = 0;
|
|
|
|
|
|
|
|
|
|
if (key_arrow_up == 0) {
|
2020-07-08 16:45:26 +02:00
|
|
|
key_arrow_up = xkb_keymap_key_by_name(seat->kbd.xkb_keymap, "UP");
|
|
|
|
|
key_arrow_down = xkb_keymap_key_by_name(seat->kbd.xkb_keymap, "DOWN");
|
2019-11-30 16:48:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
xkb_keycode_t key = button == BTN_BACK ? key_arrow_up : key_arrow_down;
|
2019-08-19 21:16:47 +02:00
|
|
|
|
|
|
|
|
for (int i = 0; i < amount; i++)
|
2020-07-09 11:20:46 +02:00
|
|
|
keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_DOWN);
|
|
|
|
|
keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_UP);
|
2019-08-19 21:16:47 +02:00
|
|
|
} else {
|
2020-08-07 22:07:16 +02:00
|
|
|
if (!term_mouse_grabbed(term, seat) &&
|
|
|
|
|
seat->mouse.col >= 0 && seat->mouse.row >= 0)
|
|
|
|
|
{
|
|
|
|
|
assert(seat->mouse.col < term->cols);
|
|
|
|
|
assert(seat->mouse.row < term->rows);
|
|
|
|
|
|
2020-07-09 09:52:11 +02:00
|
|
|
for (int i = 0; i < amount; i++) {
|
|
|
|
|
term_mouse_down(
|
|
|
|
|
term, button, seat->mouse.row, seat->mouse.col,
|
|
|
|
|
seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl);
|
|
|
|
|
}
|
2020-08-07 22:07:16 +02:00
|
|
|
|
2020-07-09 09:52:11 +02:00
|
|
|
term_mouse_up(
|
2020-07-08 18:16:43 +02:00
|
|
|
term, button, seat->mouse.row, seat->mouse.col,
|
|
|
|
|
seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl);
|
2020-09-15 18:33:58 +02:00
|
|
|
} else
|
|
|
|
|
scrollback(term, amount);
|
2019-08-19 21:16:47 +02:00
|
|
|
}
|
2019-07-26 18:47:56 +02:00
|
|
|
}
|
|
|
|
|
|
2019-07-05 10:44:57 +02:00
|
|
|
static void
|
|
|
|
|
wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
|
|
|
|
|
uint32_t time, uint32_t axis, wl_fixed_t value)
|
|
|
|
|
{
|
2019-07-26 18:47:56 +02:00
|
|
|
if (axis != WL_POINTER_AXIS_VERTICAL_SCROLL)
|
|
|
|
|
return;
|
|
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
2019-10-27 18:43:07 +01:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
if (seat->mouse.have_discrete)
|
2019-07-26 18:47:56 +02:00
|
|
|
return;
|
2019-07-10 09:15:37 +02:00
|
|
|
|
2020-04-10 18:43:29 +02:00
|
|
|
/*
|
|
|
|
|
* Aggregate scrolled amount until we get at least 1.0
|
|
|
|
|
*
|
|
|
|
|
* Without this, very slow scrolling will never actually scroll
|
|
|
|
|
* anything.
|
|
|
|
|
*/
|
2020-08-03 19:43:06 +02:00
|
|
|
seat->mouse.axis_aggregated
|
|
|
|
|
+= seat->wayl->conf->scrollback.multiplier * wl_fixed_to_double(value);
|
2020-04-10 18:43:29 +02:00
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
if (fabs(seat->mouse.axis_aggregated) >= 1.) {
|
|
|
|
|
mouse_scroll(seat, round(seat->mouse.axis_aggregated));
|
|
|
|
|
seat->mouse.axis_aggregated = 0.;
|
2020-04-10 18:43:29 +02:00
|
|
|
}
|
2019-07-26 18:47:56 +02:00
|
|
|
}
|
2019-07-10 09:15:37 +02:00
|
|
|
|
2019-07-26 18:47:56 +02:00
|
|
|
static void
|
|
|
|
|
wl_pointer_axis_discrete(void *data, struct wl_pointer *wl_pointer,
|
|
|
|
|
uint32_t axis, int32_t discrete)
|
|
|
|
|
{
|
2019-07-10 09:15:37 +02:00
|
|
|
if (axis != WL_POINTER_AXIS_VERTICAL_SCROLL)
|
|
|
|
|
return;
|
|
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
|
|
|
|
seat->mouse.have_discrete = true;
|
2020-08-03 19:43:06 +02:00
|
|
|
mouse_scroll(seat, seat->wayl->conf->scrollback.multiplier * discrete);
|
2019-07-05 10:44:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wl_pointer_frame(void *data, struct wl_pointer *wl_pointer)
|
|
|
|
|
{
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
|
|
|
|
seat->mouse.have_discrete = false;
|
2019-07-05 10:44:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wl_pointer_axis_source(void *data, struct wl_pointer *wl_pointer,
|
|
|
|
|
uint32_t axis_source)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wl_pointer_axis_stop(void *data, struct wl_pointer *wl_pointer,
|
|
|
|
|
uint32_t time, uint32_t axis)
|
|
|
|
|
{
|
2020-04-10 18:43:29 +02:00
|
|
|
if (axis != WL_POINTER_AXIS_VERTICAL_SCROLL)
|
|
|
|
|
return;
|
|
|
|
|
|
2020-07-08 16:45:26 +02:00
|
|
|
struct seat *seat = data;
|
|
|
|
|
seat->mouse.axis_aggregated = 0.;
|
2019-07-05 10:44:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const struct wl_pointer_listener pointer_listener = {
|
|
|
|
|
.enter = wl_pointer_enter,
|
|
|
|
|
.leave = wl_pointer_leave,
|
|
|
|
|
.motion = wl_pointer_motion,
|
|
|
|
|
.button = wl_pointer_button,
|
|
|
|
|
.axis = wl_pointer_axis,
|
|
|
|
|
.frame = wl_pointer_frame,
|
|
|
|
|
.axis_source = wl_pointer_axis_source,
|
|
|
|
|
.axis_stop = wl_pointer_axis_stop,
|
|
|
|
|
.axis_discrete = wl_pointer_axis_discrete,
|
|
|
|
|
};
|