mirror of
https://github.com/tmux/tmux.git
synced 2026-10-12 13:44:44 +00:00
Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'
* refs/remotes/tmux-openbsd/master: Add some additional simple events. fix window_copy_mouse_in_selection() indentation; ok nicm@ Work out a single layout for the entire prompt so it can all be drawn together, fixes centered prompts. GitHub issue 5328. Allow drag on a selection to modify it, from Michael Grant. Make split-window inside a floating pane work more nicely and not immediately create an overlapping pane, from Dane Jensen. Set other cell when creating layout set, from Dane Jensen. Size comparison should be >= not >, from Yayo Razo. Remove worflow from master
This commit is contained in:
13
tmux.h
13
tmux.h
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: tmux.h,v 1.1396 2026/07/10 15:45:11 nicm Exp $ */
|
||||
/* $OpenBSD: tmux.h,v 1.1399 2026/07/13 13:01:14 nicm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
|
||||
@@ -2127,6 +2127,8 @@ struct prompt_create_data {
|
||||
|
||||
struct grid_cell style;
|
||||
struct grid_cell command_style;
|
||||
const char *style_str;
|
||||
const char *command_style_str;
|
||||
enum screen_cursor_style cstyle;
|
||||
enum screen_cursor_style command_cstyle;
|
||||
int ccolour;
|
||||
@@ -2496,6 +2498,8 @@ struct spawn_context {
|
||||
#define SPAWN_EMPTY 0x40
|
||||
#define SPAWN_ZOOM 0x80
|
||||
#define SPAWN_FLOATING 0x100
|
||||
#define SPAWN_HORIZONTAL 0x200
|
||||
#define SPAWN_SPLIT 0x400
|
||||
};
|
||||
|
||||
/* Paste buffer. */
|
||||
@@ -3670,6 +3674,8 @@ int window_has_floating_panes(struct window *);
|
||||
int window_has_pane(struct window *, struct window_pane *);
|
||||
int window_set_active_pane(struct window *, struct window_pane *,
|
||||
int);
|
||||
void window_fire_pane_moved(struct window_pane *, struct window *,
|
||||
int, struct window *, int);
|
||||
void window_update_focus(struct window *);
|
||||
void window_pane_update_focus(struct window_pane *);
|
||||
void window_redraw_active_switch(struct window *,
|
||||
@@ -3840,10 +3846,13 @@ struct layout_cell *layout_get_tiled_cell(struct cmdq_item *, struct args *,
|
||||
struct window *, struct window_pane *, int, char **);
|
||||
struct layout_cell *layout_get_floating_cell(struct cmdq_item *, struct args *,
|
||||
enum pane_lines, struct window *, struct window_pane *,
|
||||
char **);
|
||||
int, char **);
|
||||
int layout_floating_args_parse(struct cmdq_item *, struct args *,
|
||||
enum pane_lines, struct window *, struct layout_geometry *,
|
||||
char **);
|
||||
int layout_split_floating_cell(struct layout_cell *,
|
||||
struct window *, struct layout_geometry *, enum pane_lines,
|
||||
int, char **);
|
||||
int layout_remove_tile(struct window *, struct layout_cell *);
|
||||
int layout_insert_tile(struct window *, struct layout_cell *);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user