[BACK]Return to popup.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/popup.c between version 1.34 and 1.35

version 1.34, 2021/08/17 08:22:44 version 1.35, 2021/10/11 10:55:30
Line 590 
Line 590 
   
 int  int
 popup_display(int flags, struct cmdq_item *item, u_int px, u_int py, u_int sx,  popup_display(int flags, struct cmdq_item *item, u_int px, u_int py, u_int sx,
     u_int sy, const char *shellcmd, int argc, char **argv, const char *cwd,      u_int sy, struct environ *env, const char *shellcmd, int argc, char **argv,
     struct client *c, struct session *s, popup_close_cb cb, void *arg)      const char *cwd, struct client *c, struct session *s, popup_close_cb cb,
       void *arg)
 {  {
         struct popup_data       *pd;          struct popup_data       *pd;
         u_int                    jx, jy;          u_int                    jx, jy;
Line 635 
Line 636 
         pd->psx = sx;          pd->psx = sx;
         pd->psy = sy;          pd->psy = sy;
   
         pd->job = job_run(shellcmd, argc, argv, s, cwd,          pd->job = job_run(shellcmd, argc, argv, env, s, cwd,
             popup_job_update_cb, popup_job_complete_cb, NULL, pd,              popup_job_update_cb, popup_job_complete_cb, NULL, pd,
             JOB_NOWAIT|JOB_PTY|JOB_KEEPWRITE, jx, jy);              JOB_NOWAIT|JOB_PTY|JOB_KEEPWRITE, jx, jy);
         pd->ictx = input_init(NULL, job_get_event(pd->job), &pd->palette);          pd->ictx = input_init(NULL, job_get_event(pd->job), &pd->palette);
Line 725 
Line 726 
   
         xasprintf(&cmd, "%s %s", editor, path);          xasprintf(&cmd, "%s %s", editor, path);
         if (popup_display(POPUP_INTERNAL|POPUP_CLOSEEXIT, NULL, px, py, sx, sy,          if (popup_display(POPUP_INTERNAL|POPUP_CLOSEEXIT, NULL, px, py, sx, sy,
             cmd, 0, NULL, _PATH_TMP, c, NULL, popup_editor_close_cb, pe) != 0) {              NULL, cmd, 0, NULL, _PATH_TMP, c, NULL, popup_editor_close_cb, pe) != 0) {
                 popup_editor_free(pe);                  popup_editor_free(pe);
                 free(cmd);                  free(cmd);
                 return (-1);                  return (-1);

Legend:
Removed from v.1.34  
changed lines
  Added in v.1.35