Patch 8.1.1408

[Bram Moolenaar]

Patch 8.1.1408
Problem: PFL_HIDDEN conflicts with system header file.
Solution: Rename to POPF_HIDDEN.
Files: src/popupwin.c, src/screen.c, src/vim.h


*** ../vim-8.1.1407/src/popupwin.c 2019-05-26 23:32:03.175678045 +0200
--- src/popupwin.c 2019-05-27 10:02:28.387158316 +0200
***************
*** 300,309 ****
win_T *wp;

for (wp = first_popupwin; wp != NULL; wp = wp->w_next)
! if ((wp->w_popup_flags & PFL_HIDDEN) == 0)
return TRUE;
for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next)
! if ((wp->w_popup_flags & PFL_HIDDEN) == 0)
return TRUE;
return FALSE;
}
--- 300,309 ----
win_T *wp;

for (wp = first_popupwin; wp != NULL; wp = wp->w_next)
! if ((wp->w_popup_flags & POPF_HIDDEN) == 0)
return TRUE;
for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next)
! if ((wp->w_popup_flags & POPF_HIDDEN) == 0)
return TRUE;
return FALSE;
}
***************
*** 328,336 ****
int id = (int)tv_get_number(argvars);
win_T *wp = find_popup_win(id);

! if (wp != NULL && (wp->w_popup_flags & PFL_HIDDEN) == 0)
{
! wp->w_popup_flags |= PFL_HIDDEN;
redraw_all_later(NOT_VALID);
}
}
--- 328,336 ----
int id = (int)tv_get_number(argvars);
win_T *wp = find_popup_win(id);

! if (wp != NULL && (wp->w_popup_flags & POPF_HIDDEN) == 0)
{
! wp->w_popup_flags |= POPF_HIDDEN;
redraw_all_later(NOT_VALID);
}
}
***************
*** 344,352 ****
int id = (int)tv_get_number(argvars);
win_T *wp = find_popup_win(id);

! if (wp != NULL && (wp->w_popup_flags & PFL_HIDDEN) != 0)
{
! wp->w_popup_flags &= ~PFL_HIDDEN;
redraw_all_later(NOT_VALID);
}
}
--- 344,352 ----
int id = (int)tv_get_number(argvars);
win_T *wp = find_popup_win(id);

! if (wp != NULL && (wp->w_popup_flags & POPF_HIDDEN) != 0)
{
! wp->w_popup_flags &= ~POPF_HIDDEN;
redraw_all_later(NOT_VALID);
}
}
*** ../vim-8.1.1407/src/screen.c 2019-05-26 23:32:03.175678045 +0200
--- src/screen.c 2019-05-27 10:03:06.838940720 +0200
***************
*** 999,1007 ****

// Reset all the VALID_POPUP flags.
for (wp = first_popupwin; wp != NULL; wp = wp->w_next)
! wp->w_popup_flags &= ~PFL_REDRAWN;
for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next)
! wp->w_popup_flags &= ~PFL_REDRAWN;

// TODO: don't redraw every popup every time.
for (;;)
--- 999,1007 ----

// Reset all the VALID_POPUP flags.
for (wp = first_popupwin; wp != NULL; wp = wp->w_next)
! wp->w_popup_flags &= ~POPF_REDRAWN;
for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next)
! wp->w_popup_flags &= ~POPF_REDRAWN;

// TODO: don't redraw every popup every time.
for (;;)
***************
*** 1012,1025 ****
lowest_zindex = INT_MAX;
lowest_wp = NULL;
for (wp = first_popupwin; wp != NULL; wp = wp->w_next)
! if ((wp->w_popup_flags & (PFL_REDRAWN|PFL_HIDDEN)) == 0
&& wp->w_zindex < lowest_zindex)
{
lowest_zindex = wp->w_zindex;
lowest_wp = wp;
}
for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next)
! if ((wp->w_popup_flags & (PFL_REDRAWN|PFL_HIDDEN)) == 0
&& wp->w_zindex < lowest_zindex)
{
lowest_zindex = wp->w_zindex;
--- 1012,1025 ----
lowest_zindex = INT_MAX;
lowest_wp = NULL;
for (wp = first_popupwin; wp != NULL; wp = wp->w_next)
! if ((wp->w_popup_flags & (POPF_REDRAWN|POPF_HIDDEN)) == 0
&& wp->w_zindex < lowest_zindex)
{
lowest_zindex = wp->w_zindex;
lowest_wp = wp;
}
for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next)
! if ((wp->w_popup_flags & (POPF_REDRAWN|POPF_HIDDEN)) == 0
&& wp->w_zindex < lowest_zindex)
{
lowest_zindex = wp->w_zindex;
***************
*** 1029,1035 ****
if (lowest_wp == NULL)
break;
win_update(lowest_wp);
! lowest_wp->w_popup_flags |= PFL_REDRAWN;
}
}
#endif
--- 1029,1035 ----
if (lowest_wp == NULL)
break;
win_update(lowest_wp);
! lowest_wp->w_popup_flags |= POPF_REDRAWN;
}
}
#endif
*** ../vim-8.1.1407/src/vim.h 2019-05-26 22:17:31.740314999 +0200
--- src/vim.h 2019-05-27 10:03:13.758901545 +0200
***************
*** 614,621 ****
#define VALID_TOPLINE 0x80 // w_topline is valid (for cursor position)

// Values for w_popup_flags.
! #define PFL_HIDDEN 1 // popup is not displayed
! #define PFL_REDRAWN 2 // popup was just redrawn

/*
* Terminal highlighting attribute bits.
--- 614,621 ----
#define VALID_TOPLINE 0x80 // w_topline is valid (for cursor position)

// Values for w_popup_flags.
! #define POPF_HIDDEN 1 // popup is not displayed
! #define POPF_REDRAWN 2 // popup was just redrawn

/*
* Terminal highlighting attribute bits.
*** ../vim-8.1.1407/src/version.c 2019-05-26 23:32:03.179678024 +0200
--- src/version.c 2019-05-27 10:04:19.022531903 +0200
***************
*** 769,770 ****
--- 769,772 ----
{ /* Add new patch number below this line */
+ /**/
+ 1408,
/**/

--
hundred-and-one symptoms of being an internet addict:
38. You wake up at 3 a.m. to go to the bathroom and stop and check your e-mail
on the way back to bed.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///