command line flag to auto-map only input to only output

This commit is contained in:
Adam Stohl 2021-06-21 10:07:05 -07:00
parent efaf76e9ab
commit c88aa04cf0
3 changed files with 19 additions and 5 deletions

8
cage.c
View file

@ -184,6 +184,7 @@ usage(FILE *file, const char *cage)
fprintf(file, fprintf(file,
"Usage: %s [OPTIONS] [--] APPLICATION\n" "Usage: %s [OPTIONS] [--] APPLICATION\n"
"\n" "\n"
" -a\t Auto-map input device to output (Useful when only one output present)\n"
" -d\t Don't draw client side decorations, when possible\n" " -d\t Don't draw client side decorations, when possible\n"
#ifdef DEBUG #ifdef DEBUG
" -D\t Turn on damage tracking debugging\n" " -D\t Turn on damage tracking debugging\n"
@ -204,11 +205,14 @@ parse_args(struct cg_server *server, int argc, char *argv[])
{ {
int c; int c;
#ifdef DEBUG #ifdef DEBUG
while ((c = getopt(argc, argv, "dDhm:rsv")) != -1) { while ((c = getopt(argc, argv, "adDhm:rsv")) != -1) {
#else #else
while ((c = getopt(argc, argv, "dhm:rsv")) != -1) { while ((c = getopt(argc, argv, "adhm:rsv")) != -1) {
#endif #endif
switch (c) { switch (c) {
case 'a':
server->auto_map_output = true;
break;
case 'd': case 'd':
server->xdg_decoration = true; server->xdg_decoration = true;
break; break;

15
seat.c
View file

@ -129,12 +129,21 @@ update_capabilities(struct cg_seat *seat)
static void static void
map_input_device_to_output(struct cg_seat *seat, struct wlr_input_device *device) map_input_device_to_output(struct cg_seat *seat, struct wlr_input_device *device)
{ {
struct cg_output *output;
if (!device->output_name) { if (!device->output_name) {
wlr_log(WLR_INFO, "Input device %s cannot be mapped to an output device\n", device->name); if (wl_list_length(&seat->server->outputs) == 1 && seat->server->auto_map_output) {
return; wl_list_for_each (output, &seat->server->outputs, link) {
wlr_log(WLR_INFO, "Input device %s does not have an output name, mapping to only output %s\n", device->name,
output->wlr_output->name);
wlr_cursor_map_input_to_output(seat->cursor, device, output->wlr_output);
return;
}
} else {
wlr_log(WLR_INFO, "Input device %s cannot be mapped to an output device\n", device->name);
return;
}
} }
struct cg_output *output;
wl_list_for_each (output, &seat->server->outputs, link) { wl_list_for_each (output, &seat->server->outputs, link) {
if (strcmp(device->output_name, output->wlr_output->name) == 0) { if (strcmp(device->output_name, output->wlr_output->name) == 0) {
wlr_log(WLR_INFO, "Mapping input device %s to output device %s\n", device->name, wlr_log(WLR_INFO, "Mapping input device %s to output device %s\n", device->name,

View file

@ -45,6 +45,7 @@ struct cg_server {
struct wl_listener new_xwayland_surface; struct wl_listener new_xwayland_surface;
#endif #endif
bool auto_map_output;
bool xdg_decoration; bool xdg_decoration;
bool allow_vt_switch; bool allow_vt_switch;
enum wl_output_transform output_transform; enum wl_output_transform output_transform;