Add replay_click_on_focus config key

And also bump the version goddamit

Author: tudurom

VERSION

@@ -1 +1 @@
-0.3.2
+0.4.1

client.c

@@ -96,6 +96,7 @@ static struct ConfigEntry configs[] = {
 	{ "enable_borders"      , IPCConfigEnableBorders     , 1 , fn_bool     },
 	{ "enable_last_window_focusing", IPCConfigEnableLastWindowFocusing, 1 , fn_bool },
 	{ "apply_settings"      , IPCConfigApplySettings     , 1 , fn_bool     },
+	{ "replay_click_on_focus" , IPCConfigReplayClickOnFocus, 1, fn_bool    },
 	{ "pointer_actions"     , IPCConfigPointerActions    , 3 , fn_pac      },
 	{ "pointer_modifier"    , IPCConfigPointerModifier   , 1 , fn_mod      },
 	{ "click_to_focus"      , IPCConfigClickToFocus      , 1 , fn_button   },

config.h

@@ -40,6 +40,9 @@
 /* if true, apply settings on windows when they are set (like border color, border width) */
 #define APPLY_SETTINGS true
 
+/* When clicking a window to focus it, send the click to it too. */
+#define REPLAY_CLICK_ON_FOCUS true
+
 /* default pointer actions */
 #define DEFAULT_LEFT_BUTTON_ACTION POINTER_ACTION_MOVE
 #define DEFAULT_MIDDLE_BUTTON_ACTION POINTER_ACTION_RESIZE_SIDE

examples/windowchefrc

@@ -13,6 +13,7 @@ waitron wm_config sticky_windows false
 waitron wm_config enable_borders true
 waitron wm_config enable_last_window_focusing true
 waitron wm_config apply_settings true
+waitron wm_config replay_click_on_focus true
 waitron wm_config pointer_actions move resize_side resize_corner
 waitron wm_config pointer_modifier super
 waitron wm_config click_to_focus any

ipc.h

@@ -55,6 +55,7 @@ enum IPCConfig {
 	IPCConfigEnableBorders,
 	IPCConfigEnableLastWindowFocusing,
 	IPCConfigApplySettings,
+	IPCConfigReplayClickOnFocus,
 	IPCConfigPointerActions,
 	IPCConfigPointerModifier,
 	IPCConfigClickToFocus,

man/waitron.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" https://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "WAITRON" "1" "August 2017" "Windowchef" "Windowchef Manual"
+.TH "WAITRON" "1" "September 2017" "Windowchef" "Windowchef Manual"
 .
 .SH "NAME"
 \fBwaitron\fR \- A client for windowchef(1)
@@ -247,6 +247,10 @@ If true, when the currently focused window is unmapped or closed, \fBwindowchef\
 If true, then some settings will be applied on all windows instead of newly created windows\. True by default\.
 .
 .TP
+\fBreplay_click_on_focus\fR \fIBOOL\fR
+If true, when clicking on an unfocused with the intent to focus it, windowchef will also send the click event to the target window\. If false, the window will receive the click event only if it\'s already focused\.
+.
+.TP
 \fBpointer_actions\fR \fIPOINTER_ACTION\fR \fIPOINTER_ACTION\fR \fIPOINTER_ACTION\fR
 Sets the action that should be done whenever the modifier key and the corresponding button are clicked at the same time on the window\. There are 3 actions for three mouse buttons: left, middle and right\.
 .

man/waitron.1.html

@@ -215,6 +215,11 @@ are:
 	If true, then some settings will be applied on all windows instead of newly created windows.
 	True by default.
 
+* `replay_click_on_focus` <BOOL>:
+	If true, when clicking on an unfocused with the intent to focus it, windowchef will also send
+	the click event to the target window. If false, the window will receive the click event only
+	if it's already focused.
+
 * `pointer_actions` <POINTER_ACTION> <POINTER_ACTION> <POINTER_ACTION>:
 	Sets the action that should be done whenever the modifier key and the corresponding button
 	are clicked at the same time on the window. There are 3 actions for three mouse buttons:

man/waitron.1.md

@@ -98,6 +98,7 @@ struct conf {
 	bool borders;
 	bool last_window_focusing;
 	bool apply_settings;
+	bool replay_click_on_focus;
 	enum pointer_action pointer_actions[3];
 	uint16_t pointer_modifier;
 	int8_t click_to_focus;

types.h

@@ -2996,6 +2996,9 @@ ipc_wm_config(uint32_t *d)
 	case IPCConfigApplySettings:
 		conf.apply_settings = d[1];
 		break;
+	case IPCConfigReplayClickOnFocus:
+		conf.replay_click_on_focus = d[1];
+		break;
 	case IPCConfigPointerActions:
 		for (int i = 0; i < NR_BUTTONS; i++) {
 			conf.pointer_actions[i] = d[i + 1];
@@ -3138,7 +3141,8 @@ pointer_grab(enum pointer_action pac)
 		DMSG("grabbing pointer to focus on 0x%08x\n", client->window);
 		if (client != focused_win) {
 			set_focused(client);
-			return true;
+			if (!conf.replay_click_on_focus)
+				return true;
 		}
 		return false;
 	}
@@ -3387,6 +3391,7 @@ load_defaults(void)
 	conf.borders         = BORDERS;
 	conf.last_window_focusing = LAST_WINDOW_FOCUSING;
 	conf.apply_settings       = APPLY_SETTINGS;
+	conf.replay_click_on_focus = REPLAY_CLICK_ON_FOCUS;
 	conf.pointer_actions[BUTTON_LEFT]   = DEFAULT_LEFT_BUTTON_ACTION;
 	conf.pointer_actions[BUTTON_MIDDLE] = DEFAULT_MIDDLE_BUTTON_ACTION;
 	conf.pointer_actions[BUTTON_RIGHT]  = DEFAULT_RIGHT_BUTTON_ACTION;