Merge branch 'obsd-master'

resize.c

@@ -264,16 +264,9 @@ clients_calculate_size(int type, int current, struct client *c,
 }
 
 static int
-default_window_size_skip_client(struct client *loop, int type,
+default_window_size_skip_client(struct client *loop, __unused int type,
     __unused int current, struct session *s, struct window *w)
 {
-	/*
-	 * Latest checks separately, so do not check here. Otherwise only
-	 * include clients where the session contains the window or where the
-	 * session is the given session.
-	 */
-	if (type == WINDOW_SIZE_LATEST)
-		return (0);
 	if (w != NULL && !session_has(loop->session, w))
 		return (1);
 	if (w == NULL && loop->session != s)
@@ -305,12 +298,12 @@ default_window_size(struct client *c, struct session *s, struct window *w,
 		goto done;
 	}
 
-        /*
-         * Ignore the given client if it is a control client - the creating
-         * client should only affect the size if it is not a control client.
-         */
-        if (c != NULL && (c->flags & CLIENT_CONTROL))
-                c = NULL;
+	/*
+	 * Ignore the given client if it is a control client - the creating
+	 * client should only affect the size if it is not a control client.
+	 */
+	if (c != NULL && (c->flags & CLIENT_CONTROL))
+		c = NULL;
 
 	/*
 	 * Look for a client to base the size on. If none exists (or the type

server-client.c

@@ -79,7 +79,7 @@ RB_GENERATE(client_windows, client_window, entry, server_client_window_cmp);
 u_int
 server_client_how_many(void)
 {
-	struct client  	*c;
+	struct client	*c;
 	u_int		 n;
 
 	n = 0;
@@ -880,7 +880,11 @@ server_client_check_mouse(struct client *c, struct key_event *event)
 		m->wp = -1;
 
 	/* Stop dragging if needed. */
-	if (type != DRAG && type != WHEEL && c->tty.mouse_drag_flag != 0) {
+	if (type != DRAG &&
+	    type != WHEEL &&
+	    type != DOUBLE &&
+	    type != TRIPLE &&
+	    c->tty.mouse_drag_flag != 0) {
 		if (c->tty.mouse_drag_release != NULL)
 			c->tty.mouse_drag_release(c, m);
 
@@ -2244,7 +2248,7 @@ server_client_is_bracket_paste(struct client *c, key_code key)
 	}
 
 	if (key == KEYC_PASTE_END) {
- 		c->flags &= ~CLIENT_BRACKETPASTING;
+		c->flags &= ~CLIENT_BRACKETPASTING;
 		log_debug("%s: bracket paste off", c->name);
 		return (0);
 	}
@@ -3726,7 +3730,7 @@ const char *
 server_client_get_flags(struct client *c)
 {
 	static char	s[256];
-	char	 	tmp[32];
+	char		tmp[32];
 
 	*s = '\0';
 	if (c->flags & CLIENT_ATTACHED)