Use a separate define for each default format template and strip clutter

from the choose-tree defaults.

1 files changed, 50 insertions, 10 deletions

diff --git a/tmux.h b/tmux.h
index 0b20eb56..10d4f03d 100644
--- a/tmux.h
+++ b/tmux.h
@@ -92,34 +92,74 @@ extern char   **environ;
 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
 #endif
 
-/* Default format templates. */
-#define DEFAULT_BUFFER_LIST_TEMPLATE				\
+/* Default template for choose-buffer. */
+#define CHOOSE_BUFFER_TEMPLATE					\
 	"#{line}: #{buffer_size} bytes: \"#{buffer_sample}\""
-#define DEFAULT_CLIENT_TEMPLATE					\
+
+/* Default template for choose-client. */
+#define CHOOSE_CLIENT_TEMPLATE					\
 	"#{client_tty}: #{session_name} "			\
 	"[#{client_width}x#{client_height} #{client_termname}]"	\
 	"#{?client_utf8, (utf8),} #{?client_readonly, (ro),}"
-#define DEFAULT_DISPLAY_MESSAGE_TEMPLATE			\
+
+/* Default templates for choose-tree. */
+#define CHOOSE_TREE_SESSION_TEMPLATE				\
+	"#{session_name}: #{session_windows} windows "		\
+	"#{?session_grouped, (group ,}"				\
+	"#{session_group}#{?session_grouped,),}"		\
+	"#{?session_attached, (attached),}"
+#define CHOOSE_TREE_WINDOW_TEMPLATE				\
+	"#{window_index}: #{window_name}#{window_flags} "	\
+	"\"#{pane_title}\""
+
+/* Default template for display-message. */
+#define DISPLAY_MESSAGE_TEMPLATE				\
 	"[#{session_name}] #{window_index}:"			\
 	"#{window_name}, current pane #{pane_index} "		\
 	"- (%H:%M %d-%b-%y)"
-#define DEFAULT_FIND_WINDOW_TEMPLATE				\
+
+/* Default template for find-window. */
+#define FIND_WINDOW_TEMPLATE					\
 	"#{window_index}: #{window_name} "			\
 	"[#{window_width}x#{window_height}] "			\
 	"(#{window_panes} panes) #{window_find_matches}"
-#define DEFAULT_SESSION_TEMPLATE \
+
+/* Default template for list-buffers. */
+#define LIST_BUFFERS_TEMPLATE					\
+	"#{line}: #{buffer_size} bytes: \"#{buffer_sample}\""
+
+/* Default template for list-clients. */
+#define LIST_CLIENTS_TEMPLATE					\
+	"#{client_tty}: #{session_name} "			\
+	"[#{client_width}x#{client_height} #{client_termname}]"	\
+	"#{?client_utf8, (utf8),} #{?client_readonly, (ro),}"
+
+/* Default template for list-sessions. */
+#define LIST_SESSIONS_TEMPLATE					\
 	"#{session_name}: #{session_windows} windows "		\
 	"(created #{session_created_string}) "			\
 	"[#{session_width}x#{session_height}]"			\
 	"#{?session_grouped, (group ,}"				\
 	"#{session_group}#{?session_grouped,),}"		\
 	"#{?session_attached, (attached),}"
-#define DEFAULT_WINDOW_TEMPLATE					\
+
+/* Default templates for list-windows. */
+#define LIST_WINDOWS_TEMPLATE					\
 	"#{window_index}: #{window_name}#{window_flags} "	\
 	"(#{window_panes} panes) "				\
-	"[#{window_width}x#{window_height}]"
-#define DEFAULT_PANE_INFO_TEMPLATE				\
-	"#{session_name}:#{window_index}.#{pane_index}"
+	"[#{window_width}x#{window_height}] "			\
+	"[layout #{window_layout}] #{window_id}"		\
+	"#{?window_active, (active),}";
+#define LIST_WINDOWS_WITH_SESSION_TEMPLATE			\
+	"#{session_name}: "					\
+	"#{window_index}: #{window_name}#{window_flags} "	\
+	"(#{window_panes} panes) "				\
+	"[#{window_width}x#{window_height}] "
+
+/* Default templates for break-pane, new-window and split-window. */
+#define BREAK_PANE_TEMPLATE "#{session_name}:#{window_index}.#{pane_index}"
+#define NEW_WINDOW_TEMPLATE BREAK_PANE_TEMPLATE
+#define SPLIT_WINDOW_TEMPLATE BREAK_PANE_TEMPLATE
 
 /* Bell option values. */
 #define BELL_NONE 0