hiro/spectrwm
1
0
Fork 0
mirror of https://github.com/vale981/spectrwm synced 2025-03-05 18:01:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alt-j/alt-k = move focus to next/prev

Browse source 
alt-shift-j/alt-shift-k = swap focus window with next/prev
This commit is contained in:
Ryan McBride 2009-01-15 06:41:06 +00:00
parent 0dc00b1a83
commit e6727e082a
1 changed files with 96 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
scrotwm.c
View file

@ -78,16 +78,18 @@
#ifdef SWM_DEBUG #ifdef SWM_DEBUG
#define DPRINTF(x...) do { if (swm_debug) fprintf(stderr, x); } while(0) #define DPRINTF(x...) do { if (swm_debug) fprintf(stderr, x); } while(0)
#define DNPRINTF(n,x...) do { if (swm_debug & n) fprintf(stderr, x); } while(0) #define DNPRINTF(n,x...) do { if (swm_debug & n) fprintf(stderr, x); } while(0)
#define SWM_D_EVENT 0x0001 #define SWM_D_MISC 0x8001
#define SWM_D_WS 0x0002 #define SWM_D_EVENT 0x0002
#define SWM_D_FOCUS 0x0004 #define SWM_D_WS 0x0004
#define SWM_D_MISC 0x0008 #define SWM_D_FOCUS 0x0008
#define SWM_D_FOCUS 0x0010
u_int32_t swm_debug = 0 u_int32_t swm_debug = 0
| SWM_D_MISC
| SWM_D_EVENT | SWM_D_EVENT
| SWM_D_WS | SWM_D_WS
| SWM_D_FOCUS | SWM_D_FOCUS
| SWM_D_MISC | SWM_D_MOVE
; ;
#else #else
#define DPRINTF(x...) #define DPRINTF(x...)
@ -162,6 +164,9 @@ union arg {
#define SWM_ARG_ID_FOCUSNEXT (0) #define SWM_ARG_ID_FOCUSNEXT (0)
#define SWM_ARG_ID_FOCUSPREV (1) #define SWM_ARG_ID_FOCUSPREV (1)
#define SWM_ARG_ID_FOCUSMAIN (2) #define SWM_ARG_ID_FOCUSMAIN (2)
#define SWM_ARG_ID_SWAPNEXT (3)
#define SWM_ARG_ID_SWAPPREV (4)
#define SWM_ARG_ID_SWAPMAIN (5)
char **argv; char **argv;
}; };
@ -441,42 +446,104 @@ switchws(union arg *args)
} }
} }
void
swapwin(union arg *args)
{
struct ws_win *target;
DNPRINTF(SWM_D_MOVE, "swapwin: id %d\n", args->id);
if (ws[current_ws].focus == NULL)
return;
switch (args->id) {
case SWM_ARG_ID_SWAPPREV:
target = TAILQ_PREV(ws[current_ws].focus, ws_win_list, entry);
if (target == NULL)
target = TAILQ_LAST(&ws[current_ws].winlist,
ws_win_list);
if (target == ws[current_ws].focus)
return;
TAILQ_REMOVE(&ws[current_ws].winlist,
ws[current_ws].focus, entry);
TAILQ_INSERT_BEFORE(target, ws[current_ws].focus, entry);
break;
case SWM_ARG_ID_SWAPNEXT: {
int loop = 0;
target = TAILQ_NEXT(ws[current_ws].focus, entry);
if (target == NULL) {
loop = 1;
target = TAILQ_FIRST(&ws[current_ws].winlist);
}
if (target == ws[current_ws].focus)
return;
TAILQ_REMOVE(&ws[current_ws].winlist,
ws[current_ws].focus, entry);
TAILQ_INSERT_AFTER(&ws[current_ws].winlist, target,
ws[current_ws].focus, entry);
if (loop) {
TAILQ_REMOVE(&ws[current_ws].winlist, target, entry);
TAILQ_INSERT_TAIL(&ws[current_ws].winlist,
target, entry);
}
break;
}
case SWM_ARG_ID_SWAPMAIN:
target = TAILQ_FIRST(&ws[current_ws].winlist);
if (target == ws[current_ws].focus)
return;
TAILQ_REMOVE(&ws[current_ws].winlist, target, entry);
TAILQ_INSERT_BEFORE(ws[current_ws].focus, target, entry);
TAILQ_REMOVE(&ws[current_ws].winlist,
ws[current_ws].focus, entry);
TAILQ_INSERT_HEAD(&ws[current_ws].winlist,
ws[current_ws].focus, entry);
break;
default:
DNPRINTF(SWM_D_MOVE, "invalid id: %d\n", args->id);
return;
}
ignore_enter = 2;
stack();
}
void void
focus(union arg *args) focus(union arg *args)
{ {
struct ws_win *winfocus, *winlostfocus; struct ws_win *winfocus, *winlostfocus;
DNPRINTF(SWM_D_FOCUS, "focus: id %d\n", args->id); DNPRINTF(SWM_D_FOCUS, "focus: id %d\n", args->id);
if (ws[current_ws].focus == NULL || count_win(current_ws, 1) == 0) if (ws[current_ws].focus == NULL)
return; return;
winlostfocus = ws[current_ws].focus; winlostfocus = ws[current_ws].focus;
switch (args->id) { switch (args->id) {
case SWM_ARG_ID_FOCUSPREV: case SWM_ARG_ID_FOCUSPREV:
ws[current_ws].focus = winfocus = TAILQ_PREV(ws[current_ws].focus, ws_win_list, entry);
TAILQ_PREV(ws[current_ws].focus, ws_win_list, entry); if (winfocus == NULL)
if (ws[current_ws].focus == NULL) winfocus =
ws[current_ws].focus =
TAILQ_LAST(&ws[current_ws].winlist, ws_win_list); TAILQ_LAST(&ws[current_ws].winlist, ws_win_list);
break; break;
case SWM_ARG_ID_FOCUSNEXT: case SWM_ARG_ID_FOCUSNEXT:
ws[current_ws].focus = TAILQ_NEXT(ws[current_ws].focus, entry); winfocus = TAILQ_NEXT(ws[current_ws].focus, entry);
if (ws[current_ws].focus == NULL) if (winfocus == NULL)
ws[current_ws].focus = winfocus = TAILQ_FIRST(&ws[current_ws].winlist);
TAILQ_FIRST(&ws[current_ws].winlist);
break; break;
case SWM_ARG_ID_FOCUSMAIN: case SWM_ARG_ID_FOCUSMAIN:
ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist); winfocus = TAILQ_FIRST(&ws[current_ws].winlist);
break; break;
default: default:
return; return;
} }
winfocus = ws[current_ws].focus; if (winfocus == winlostfocus)
return;
unfocus_win(winlostfocus); unfocus_win(winlostfocus);
focus_win(winfocus); focus_win(winfocus);
XSync(display, False); XSync(display, False);
@ -576,34 +643,13 @@ stack(void)
XSync(display, False); XSync(display, False);
} }
void
swap_to_main(union arg *args)
{
struct ws_win *tmpwin = TAILQ_FIRST(&ws[current_ws].winlist);
DNPRINTF(SWM_D_MISC, "swap_to_main: win: %lu\n",
ws[current_ws].focus ? ws[current_ws].focus->id : 0);
if (ws[current_ws].focus == NULL || ws[current_ws].focus == tmpwin)
return;
TAILQ_REMOVE(&ws[current_ws].winlist, tmpwin, entry);
TAILQ_INSERT_AFTER(&ws[current_ws].winlist, ws[current_ws].focus,
tmpwin, entry);
TAILQ_REMOVE(&ws[current_ws].winlist, ws[current_ws].focus, entry);
TAILQ_INSERT_HEAD(&ws[current_ws].winlist, ws[current_ws].focus, entry);
ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);
ignore_enter = 2;
stack();
}
void void
send_to_ws(union arg *args) send_to_ws(union arg *args)
{ {
int wsid = args->id; int wsid = args->id;
struct ws_win *win = ws[current_ws].focus; struct ws_win *win = ws[current_ws].focus;
DNPRINTF(SWM_D_WS, "send_to_ws: win: %lu\n", win->id); DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id);
XUnmapWindow(display, win->id); XUnmapWindow(display, win->id);
@ -611,6 +657,8 @@ send_to_ws(union arg *args)
ws[current_ws].focus = TAILQ_PREV(win, ws_win_list, entry); ws[current_ws].focus = TAILQ_PREV(win, ws_win_list, entry);
if (ws[current_ws].focus == NULL) if (ws[current_ws].focus == NULL)
ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist); ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);
if (ws[current_ws].focus == win)
ws[current_ws].focus = NULL;
TAILQ_REMOVE(&ws[current_ws].winlist, win, entry); TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
@ -630,7 +678,11 @@ struct key {
union arg args; union arg args;
} keys[] = { } keys[] = {
/* modifier key function argument */ /* modifier key function argument */
{ MODKEY, XK_Return, swap_to_main, {0} }, { MODKEY, XK_Return, swapwin, {.id = SWM_ARG_ID_SWAPMAIN} },
{ MODKEY, XK_j, focus, {.id = SWM_ARG_ID_FOCUSNEXT} },
{ MODKEY, XK_k, focus, {.id = SWM_ARG_ID_FOCUSPREV} },
{ MODKEY | ShiftMask, XK_j, swapwin, {.id = SWM_ARG_ID_SWAPNEXT} },
{ MODKEY | ShiftMask, XK_k, swapwin, {.id = SWM_ARG_ID_SWAPPREV} },
{ MODKEY | ShiftMask, XK_Return, spawn, {.argv = spawn_term} }, { MODKEY | ShiftMask, XK_Return, spawn, {.argv = spawn_term} },
{ MODKEY, XK_p, spawn, {.argv = spawn_menu} }, { MODKEY, XK_p, spawn, {.argv = spawn_menu} },
{ MODKEY | ShiftMask, XK_q, quit, {0} }, { MODKEY | ShiftMask, XK_q, quit, {0} },
@ -830,11 +882,13 @@ destroynotify(XEvent *e)
TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) { TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
if (ev->window == win->id) { if (ev->window == win->id) {
/* find a window to focus */ /* find a window to focus */
ws[current_ws].focus = ws[current_ws].focus = TAILQ_PREV(win,
TAILQ_PREV(win, ws_win_list,entry); ws_win_list, entry);
if (ws[current_ws].focus == NULL) if (ws[current_ws].focus == NULL)
ws[current_ws].focus = ws[current_ws].focus =
TAILQ_FIRST(&ws[current_ws].winlist); TAILQ_FIRST(&ws[current_ws].winlist);
if (win == ws[current_ws].focus)
ws[current_ws].focus = NULL;
TAILQ_REMOVE(&ws[current_ws].winlist, win, entry); TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
free(win); free(win);