X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=b0c116d2770b3c4e23cbbd1862af3ef772d0c620;hb=a8c625928eca5ad3c8af0f22fb25f4aa85ddaf8c;hp=48ddf00a6a9266483ccc69a394e9f93c05f412d1;hpb=03de52ac9397db5787811186a9527a9749463f72;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 48ddf00..b0c116d 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -1945,12 +1945,12 @@ validate_win(struct ws_win *testwin)
 	struct ws_win		*win;
 	struct workspace	*ws;
 	struct swm_region	*r;
-	int			i, x, foundit = 0;
+	int			i, x;
 
 	if (testwin == NULL)
 		return (0);
 
-	for (i = 0, foundit = 0; i < ScreenCount(display); i++)
+	for (i = 0; i < ScreenCount(display); i++)
 		TAILQ_FOREACH(r, &screens[i].rl, entry)
 			for (x = 0; x < SWM_WS_MAX; x++) {
 				ws = &r->s->ws[x];
@@ -1966,10 +1966,10 @@ validate_ws(struct workspace *testws)
 {
 	struct swm_region	*r;
 	struct workspace	*ws;
-	int			foundit, i, x;
+	int			i, x;
 
 	/* validate all ws */
-	for (i = 0, foundit = 0; i < ScreenCount(display); i++)
+	for (i = 0; i < ScreenCount(display); i++)
 		TAILQ_FOREACH(r, &screens[i].rl, entry)
 			for (x = 0; x < SWM_WS_MAX; x++) {
 				ws = &r->s->ws[x];
@@ -2523,13 +2523,10 @@ void
 cycle_layout(struct swm_region *r, union arg *args)
 {
 	struct workspace	*ws = r->ws;
-	struct ws_win		*winfocus;
 	union arg		a;
 
 	DNPRINTF(SWM_D_EVENT, "cycle_layout: workspace: %d\n", ws->idx);
 
-	winfocus = ws->focus;
-
 	ws->cur_layout++;
 	if (ws->cur_layout->l_stack == NULL)
 		ws->cur_layout = &layouts[0];
@@ -3266,14 +3263,11 @@ uniconify(struct swm_region *r, union arg *args)
 void
 name_workspace(struct swm_region *r, union arg *args)
 {
-	struct workspace	*ws;
 	FILE			*lfile;
 
 	DNPRINTF(SWM_D_MISC, "name_workspace\n");
 
-	if (r && r->ws)
-		ws = r->ws;
-	else
+	if (r == NULL)
 		return;
 
 	search_r = r;
@@ -3820,9 +3814,7 @@ move_window(struct ws_win *win)
 {
 	unsigned int		mask;
 	XWindowChanges		wc;
-	struct swm_region	*r;
 
-	r = root_to_region(win->wa.root);
 	bzero(&wc, sizeof wc);
 	mask = CWX | CWY;
 	wc.x = win->g.x;
@@ -4731,7 +4723,7 @@ setup_keys(void)
 	setkeybinding(MODKEY|ShiftMask,	XK_bracketright,kf_move_down,	NULL);
 	setkeybinding(MODKEY|ShiftMask,	XK_slash,	kf_name_workspace,NULL);
 	setkeybinding(MODKEY,		XK_slash,	kf_search_workspace,NULL);
-	setkeybinding(MODKEY,		XK_s,		kf_search_win,	NULL);
+	setkeybinding(MODKEY,		XK_f,		kf_search_win,	NULL);
 #ifdef SWM_DEBUG
 	setkeybinding(MODKEY|ShiftMask,	XK_d,		kf_dumpwins,	NULL);
 #endif