X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=d5a9c1907df09f874bbaf169e3fdaa52de62fdc9;hb=5f7c713e639041cc183df5e65815f5c8c9e756b7;hp=da457258877fc1abf38bfaa3f7da3f8cac75b1ef;hpb=762accdc0274dbd63c05d1163b5856b2d7226654;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index da45725..d5a9c19 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -354,6 +354,7 @@ struct quirk {
 	{ "OpenOffice.org 2.4",	"VCLSalFrame",	SWM_Q_FLOAT },
 	{ "OpenOffice.org 3.0",	"VCLSalFrame",	SWM_Q_FLOAT },
 	{ "Firefox-bin",	"firefox-bin",	SWM_Q_TRANSSZ },
+	{ "Firefox",		"Dialog",	SWM_Q_FLOAT },
 	{ "Gimp",		"gimp",		SWM_Q_FLOAT | SWM_Q_ANYWHERE },
 	{ "XTerm",		"xterm",	SWM_Q_XTERM_FONTADJ },
 	{ "xine",		"Xine Window",	SWM_Q_FLOAT | SWM_Q_ANYWHERE },
@@ -1288,6 +1289,10 @@ focus(struct swm_region *r, union arg *args)
 
 	case SWM_ARG_ID_FOCUSMAIN:
 		winfocus = TAILQ_FIRST(wl);
+		if (winfocus == cur_focus)
+			winfocus = cur_focus->ws->focus_prev;
+		if (winfocus == NULL)
+			return;
 		break;
 
 	default: