From 631176c9a290f0de8aae938690d41c4d5f41e969 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Thu, 26 May 2022 18:54:13 -0700 Subject: [PATCH] [amiwm] Implement a keyboard shortcut to move a client to a different screen This allows a keyboard shortcut to move a client to a different amiwm screen. That way when you have things like Firefox restart every window in a single screen, you can quickly move screens to where they should be. --- MODULES.md | 2 +- client.c | 15 +++++++++++++++ client.h | 2 ++ icon.c | 4 ++++ kbdlexer.l | 1 + libami/libami.h | 1 + libami/mdscreen.c | 5 +++++ module.c | 15 +++++++++++++++ module.h | 1 + 9 files changed, 45 insertions(+), 1 deletion(-) diff --git a/MODULES.md b/MODULES.md index cf1182b..f71cef6 100644 --- a/MODULES.md +++ b/MODULES.md @@ -75,11 +75,11 @@ Currently the following are defined: rotatescreens - Move the frontmost screen to the back raisewindow - Rotate the bottom window to the top of the screen lowerwindow - Rotate the top window to the bottom of the screen +rotatewindow - Move the current window to the next screen, rotate screen front - Move the window in which the key is pressed to the front back - Move the window in which the key is pressed to the back iconify - Iconify the window in which the key is pressed - #### Example Module "Keyboard" "\ diff --git a/client.c b/client.c index c6378ab..f500cc5 100644 --- a/client.c +++ b/client.c @@ -379,3 +379,18 @@ void flushclients() rmclient(c); } } + +/* + * Reparent the given client to the given screen. + * + * This moves the given client to the given screen. + */ +void +reparent_client(Scrn *s, Client *client) +{ + client->scr = s; + if(client->parent != client->scr->root) + XReparentWindow(dpy, client->parent, s->back, client->x, client->y); + setstringprop(client->window, amiwm_screen, s->deftitle); + sendconfig(client); +} diff --git a/client.h b/client.h index 38ac54f..d8b3c82 100644 --- a/client.h +++ b/client.h @@ -51,5 +51,7 @@ extern void getstate(Client *); extern void grav_map_frame_to_win(Client *, int, int, int *, int *); extern void grav_map_win_to_frame(Client *, int, int, int *, int *); extern void setclientstate(Client *, int); +extern void reparent_client(struct _Scrn *s, Client *client); + #endif diff --git a/icon.c b/icon.c index 2db0d17..1745e60 100644 --- a/icon.c +++ b/icon.c @@ -156,12 +156,16 @@ void reparenticon(Icon *i, Scrn *s, int x, int y) i->next=s->icons; s->icons=i; if(i->client) { +#if 1 + reparent_client(s, i->client); +#else i->client->scr=s; if(i->client->parent != i->client->scr->root) XReparentWindow(dpy, i->client->parent, s->back, i->client->x, i->client->y); setstringprop(i->client->window, amiwm_screen, s->deftitle); sendconfig(i->client); +#endif } if(os) selecticon(i); diff --git a/kbdlexer.l b/kbdlexer.l index 3149834..8f75d78 100644 --- a/kbdlexer.l +++ b/kbdlexer.l @@ -44,6 +44,7 @@ int parse_keyword(char *str, YYSTYPE *val) { "lowerwindow", (mdfuncp)md_rotate_window_lower }, { "raisewindow", (mdfuncp)md_rotate_window_raise }, { "rotatescreens", (mdfuncp)k_rotscreens }, + { "rotatewindow", (mdfuncp)md_rotate_window_desktop }, }; #define N_FUNC (sizeof(functab)/sizeof(functab[0])) struct { char *name; int token, num; } kwtab[] = { diff --git a/libami/libami.h b/libami/libami.h index 5e9e662..ce35024 100644 --- a/libami/libami.h +++ b/libami/libami.h @@ -370,6 +370,7 @@ extern int md_iconify(Window); extern int md_errormsg(Window, char *); extern int md_rotate_window_raise(Window); extern int md_rotate_window_lower(Window); +extern int md_rotate_window_desktop(Window); /* eventdispatcher.c */ extern void cx_event_broker(int, unsigned long, int (*)(XEvent*)); diff --git a/libami/mdscreen.c b/libami/mdscreen.c index 9599c99..c52d981 100644 --- a/libami/mdscreen.c +++ b/libami/mdscreen.c @@ -32,6 +32,11 @@ int md_rotate_window_lower(XID id) return md_command00(id, MCMD_ROTATE_WINDOW_LOWER); } +int md_rotate_window_desktop(XID id) +{ + return md_command00(id, MCMD_WINDOW_MOVE_NEXT_DESKTOP); +} + int md_errormsg(Window id, char *str) { return md_command0(id, MCMD_ERRORMSG, str, strlen(str)); diff --git a/module.c b/module.c index bb9dba7..157008a 100644 --- a/module.c +++ b/module.c @@ -45,6 +45,7 @@ extern void remove_fd_from_set(int); extern void screentoback(); extern void raiselowerclient(Client *, int); extern void wberror(Scrn *, char *); +extern void reparent(Client *); extern Icon *createappicon(struct module *, Window, char *, Pixmap, Pixmap, Pixmap, int, int); @@ -525,6 +526,20 @@ static void handle_module_cmd(struct module *m, char *data, int data_len) reply_module(m, NULL, 0); break; } + case MCMD_WINDOW_MOVE_NEXT_DESKTOP: + /* Move the current window, if any, to the next desktop */ + c = NULL; + if(! XFindContext(dpy, id, client_context, (XPointer*)&c)) { + /* Get the current screen */ + scr=getscreen(id); + /* Rotate screen, get the now front screen */ + screentoback(); + scr = get_front_scr(); + /* Assign this client to next screen */ + reparent_client(scr, c); + } + reply_module(m, NULL, 0); + break; break; default: reply_module(m, NULL, -1); diff --git a/module.h b/module.h index 4d227dd..58fd094 100644 --- a/module.h +++ b/module.h @@ -17,6 +17,7 @@ #define MCMD_ROTATE_WINDOW_RAISE 19 #define MCMD_ROTATE_WINDOW_LOWER 20 #define MCMD_UPDATE_BATTERY 21 +#define MCMD_WINDOW_MOVE_NEXT_DESKTOP 22 struct mcmd_header { XID id;