mirror of https://github.com/tmux/tmux.git
Merge remote-tracking branch 'origin/master' into sixel
commit
6794facc82
2
popup.c
2
popup.c
|
@ -636,7 +636,7 @@ int
|
||||||
popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
|
popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
|
||||||
u_int py, u_int sx, u_int sy, struct environ *env, const char *shellcmd,
|
u_int py, u_int sx, u_int sy, struct environ *env, const char *shellcmd,
|
||||||
int argc, char **argv, const char *cwd, const char *title, struct client *c,
|
int argc, char **argv, const char *cwd, const char *title, struct client *c,
|
||||||
struct session *s, const char* style, const char* border_style,
|
struct session *s, const char *style, const char *border_style,
|
||||||
popup_close_cb cb, void *arg)
|
popup_close_cb cb, void *arg)
|
||||||
{
|
{
|
||||||
struct popup_data *pd;
|
struct popup_data *pd;
|
||||||
|
|
14
tmux.h
14
tmux.h
|
@ -2915,8 +2915,8 @@ void screen_write_hline(struct screen_write_ctx *, u_int, int, int);
|
||||||
void screen_write_vline(struct screen_write_ctx *, u_int, int, int);
|
void screen_write_vline(struct screen_write_ctx *, u_int, int, int);
|
||||||
void screen_write_menu(struct screen_write_ctx *, struct menu *, int,
|
void screen_write_menu(struct screen_write_ctx *, struct menu *, int,
|
||||||
const struct grid_cell *);
|
const struct grid_cell *);
|
||||||
void screen_write_box(struct screen_write_ctx *, u_int, u_int, int,
|
void screen_write_box(struct screen_write_ctx *, u_int, u_int,
|
||||||
const struct grid_cell *, const char *);
|
enum box_lines, const struct grid_cell *, const char *);
|
||||||
void screen_write_preview(struct screen_write_ctx *, struct screen *, u_int,
|
void screen_write_preview(struct screen_write_ctx *, struct screen *, u_int,
|
||||||
u_int);
|
u_int);
|
||||||
void screen_write_backspace(struct screen_write_ctx *);
|
void screen_write_backspace(struct screen_write_ctx *);
|
||||||
|
@ -3344,11 +3344,11 @@ int menu_key_cb(struct client *, void *, struct key_event *);
|
||||||
#define POPUP_INTERNAL 0x4
|
#define POPUP_INTERNAL 0x4
|
||||||
typedef void (*popup_close_cb)(int, void *);
|
typedef void (*popup_close_cb)(int, void *);
|
||||||
typedef void (*popup_finish_edit_cb)(char *, size_t, void *);
|
typedef void (*popup_finish_edit_cb)(char *, size_t, void *);
|
||||||
int popup_display(int, int, struct cmdq_item *, u_int, u_int,
|
int popup_display(int, enum box_lines, struct cmdq_item *, u_int,
|
||||||
u_int, u_int, struct environ *, const char *, int, char **,
|
u_int, u_int, u_int, struct environ *, const char *, int,
|
||||||
const char *, const char *, struct client *,
|
char **, const char *, const char *, struct client *,
|
||||||
struct session *, const char *, const char *,
|
struct session *, const char *, const char *,
|
||||||
popup_close_cb, void *);
|
popup_close_cb, void *);
|
||||||
int popup_editor(struct client *, const char *, size_t,
|
int popup_editor(struct client *, const char *, size_t,
|
||||||
popup_finish_edit_cb, void *);
|
popup_finish_edit_cb, void *);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue