Patch 9.0.0375
Problem: The footer feature is unused.
Solution: Remove FEAT_FOOTER and code.
Files: src/feature.h, src/evalfunc.c, src/gui.c, src/gui_motif.c,
src/version.c, src/gui.h
*** ../vim-9.0.0374/src/feature.h 2022-08-30 15:05:27.016802522 +0100
--- src/feature.h 2022-09-04 12:23:21.725996264 +0100
***************
*** 127,132 ****
--- 127,134 ----
* Support was removed in 8.1.1093.
* +farsi Farsi (Persian language) Keymap support.
* Removed in patch 8.1.0932
+ * +footer Motif only: Add a message area at the bottom of the
+ * main window area.
*/
/*
***************
*** 1133,1146 ****
# endif
#endif
- #if 0
- /*
- * +footer Motif only: Add a message area at the bottom of the
- * main window area.
- */
- # define FEAT_FOOTER
- #endif
-
/*
* +autochdir 'autochdir' option.
*/
--- 1135,1140 ----
*** ../vim-9.0.0374/src/evalfunc.c 2022-09-02 15:15:11.063569185 +0100
--- src/evalfunc.c 2022-09-04 12:20:30.338144839 +0100
***************
*** 5650,5662 ****
0
#endif
},
! {"footer",
! #ifdef FEAT_FOOTER
! 1
! #else
! 0
! #endif
! },
{"fork",
#if !defined(USE_SYSTEM) && defined(UNIX)
1
--- 5650,5656 ----
0
#endif
},
! {"footer", 0},
{"fork",
#if !defined(USE_SYSTEM) && defined(UNIX)
1
*** ../vim-9.0.0374/src/gui.c 2022-08-14 14:16:07.991582244 +0100
--- src/gui.c 2022-09-04 12:22:21.538048804 +0100
***************
*** 445,453 ****
#if defined(FEAT_TOOLBAR) && (defined(FEAT_GUI_MOTIF) ||
defined(FEAT_GUI_HAIKU))
gui.toolbar_height = 0;
#endif
- #if defined(FEAT_FOOTER) && defined(FEAT_GUI_MOTIF)
- gui.footer_height = 0;
- #endif
#ifdef FEAT_BEVAL_TIP
gui.tooltip_fontset = NOFONTSET;
#endif
--- 445,450 ----
***************
*** 1530,1539 ****
if (gui_has_tabline())
base_height += gui.tabline_height;
# endif
- # ifdef FEAT_FOOTER
- if (vim_strchr(p_go, GO_FOOTER) != NULL)
- base_height += gui.footer_height;
- # endif
# if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU)
base_height += gui_mch_text_area_extra_height();
# endif
--- 1527,1532 ----
***************
*** 3479,3488 ****
#ifdef FEAT_GUI_TABLINE
int using_tabline;
#endif
- #ifdef FEAT_FOOTER
- static int prev_footer = -1;
- int using_footer = FALSE;
- #endif
#if defined(FEAT_MENU)
static int prev_tearoff = -1;
int using_tearoff = FALSE;
--- 3472,3477 ----
***************
*** 3557,3567 ****
using_toolbar = TRUE;
break;
#endif
- #ifdef FEAT_FOOTER
- case GO_FOOTER:
- using_footer = TRUE;
- break;
- #endif
case GO_TEAROFF:
#if defined(FEAT_MENU)
using_tearoff = TRUE;
--- 3546,3551 ----
***************
*** 3661,3676 ****
fix_size = TRUE;
}
#endif
- #ifdef FEAT_FOOTER
- if (using_footer != prev_footer)
- {
- gui_mch_enable_footer(using_footer);
- prev_footer = using_footer;
- need_set_size |= RESIZE_VERT;
- if (using_footer)
- fix_size = TRUE;
- }
- #endif
#if defined(FEAT_MENU) && !(defined(MSWIN) && !defined(FEAT_TEAROFF))
if (using_tearoff != prev_tearoff)
{
--- 3645,3650 ----
*** ../vim-9.0.0374/src/gui_motif.c 2022-04-03 17:31:14.000000000 +0100
--- src/gui_motif.c 2022-09-04 12:22:59.714015513 +0100
***************
*** 75,83 ****
static Widget tabLine_menu = 0;
static int showing_tabline = 0;
#endif
- #ifdef FEAT_FOOTER
- static Widget footer;
- #endif
#ifdef FEAT_MENU
# if (XmVersion >= 1002)
// remember the last set value for the tearoff item
--- 75,80 ----
***************
*** 87,96 ****
#endif
#ifdef FEAT_TOOLBAR
- # ifdef FEAT_FOOTER
- static void toolbarbutton_enter_cb(Widget, XtPointer, XEvent *, Boolean *);
- static void toolbarbutton_leave_cb(Widget, XtPointer, XEvent *, Boolean *);
- # endif
static void reset_focus(void);
#endif
--- 84,89 ----
***************
*** 574,598 ****
XmNshadowThickness, 0,
NULL);
- #ifdef FEAT_FOOTER
- /*
- * Create the Footer.
- */
- footer = XtVaCreateWidget("footer",
- xmLabelGadgetClass, vimForm,
- XmNalignment, XmALIGNMENT_BEGINNING,
- XmNmarginHeight, 0,
- XmNmarginWidth, 0,
- XmNtraversalOn, False,
- XmNrecomputeSize, False,
- XmNleftAttachment, XmATTACH_FORM,
- XmNleftOffset, 5,
- XmNrightAttachment, XmATTACH_FORM,
- XmNbottomAttachment, XmATTACH_FORM,
- NULL);
- gui_mch_set_footer((char_u *) "");
- #endif
-
/*
* Install the callbacks.
*/
--- 567,572 ----
***************
*** 1315,1326 ****
{
XtAddCallback(menu->id,
XmNactivateCallback, gui_x11_menu_cb, menu);
- # ifdef FEAT_FOOTER
- XtAddEventHandler(menu->id, EnterWindowMask, False,
- toolbarbutton_enter_cb, menu);
- XtAddEventHandler(menu->id, LeaveWindowMask, False,
- toolbarbutton_leave_cb, menu);
- # endif
}
}
else
--- 1289,1294 ----
***************
*** 2855,2912 ****
}
#endif // FEAT_GUI_DIALOG
- #if defined(FEAT_FOOTER) || defined(PROTO)
-
- static int
- gui_mch_compute_footer_height(void)
- {
- Dimension height; // total Toolbar height
- Dimension top; // XmNmarginTop
- Dimension bottom; // XmNmarginBottom
- Dimension shadow; // XmNshadowThickness
-
- XtVaGetValues(footer,
- XmNheight, &height,
- XmNmarginTop, &top,
- XmNmarginBottom, &bottom,
- XmNshadowThickness, &shadow,
- NULL);
-
- return (int) height + top + bottom + (shadow << 1);
- }
-
- void
- gui_mch_enable_footer(int showit)
- {
- if (showit)
- {
- gui.footer_height = gui_mch_compute_footer_height();
- XtManageChild(footer);
- }
- else
- {
- gui.footer_height = 0;
- XtUnmanageChild(footer);
- }
- XtVaSetValues(textAreaForm, XmNbottomOffset, gui.footer_height, NULL);
- }
-
- void
- gui_mch_set_footer(char_u *s)
- {
- XmString xms;
-
- xms = XmStringCreate((char *)s, STRING_TAG);
- if (xms != NULL)
- {
- XtVaSetValues(footer, XmNlabelString, xms, NULL);
- XmStringFree(xms);
- }
- }
-
- #endif
-
-
#if defined(FEAT_TOOLBAR) || defined(PROTO)
void
gui_mch_show_toolbar(int showit)
--- 2823,2828 ----
***************
*** 3131,3169 ****
XmNhighlightColor, hsp,
NULL);
}
-
- # ifdef FEAT_FOOTER
- /*
- * The next toolbar enter/leave callbacks should really do balloon help. But
- * I have to use footer help for backwards compatibility. Hopefully both will
- * get implemented and the user will have a choice.
- */
- static void
- toolbarbutton_enter_cb(
- Widget w UNUSED,
- XtPointer client_data,
- XEvent *event UNUSED,
- Boolean *cont UNUSED)
- {
- vimmenu_T *menu = (vimmenu_T *) client_data;
-
- if (menu->strings[MENU_INDEX_TIP] != NULL)
- {
- if (vim_strchr(p_go, GO_FOOTER) != NULL)
- gui_mch_set_footer(menu->strings[MENU_INDEX_TIP]);
- }
- }
-
- static void
- toolbarbutton_leave_cb(
- Widget w UNUSED,
- XtPointer client_data UNUSED,
- XEvent *event UNUSED,
- Boolean *cont UNUSED)
- {
- gui_mch_set_footer((char_u *) "");
- }
- # endif
#endif
#if defined(FEAT_GUI_TABLINE) || defined(PROTO)
--- 3047,3052 ----
*** ../vim-9.0.0374/src/version.c 2022-09-04 11:55:16.154941174 +0100
--- src/version.c 2022-09-04 12:27:59.241145553 +0100
***************
*** 254,265 ****
#else
"-folding",
#endif
- #ifdef FEAT_FOOTER
- "+footer",
- #else
"-footer",
! #endif
! // only interesting on Unix systems
#if !defined(USE_SYSTEM) && defined(UNIX)
"+fork()",
#endif
--- 254,261 ----
#else
"-folding",
#endif
"-footer",
! // only interesting on Unix systems
#if !defined(USE_SYSTEM) && defined(UNIX)
"+fork()",
#endif
*** ../vim-9.0.0374/src/gui.h 2022-04-03 17:29:05.000000000 +0100
--- src/gui.h 2022-09-04 12:23:31.933987319 +0100
***************
*** 402,411 ****
int tabline_height;
#endif
- #ifdef FEAT_FOOTER
- int footer_height; // height of the message footer
- #endif
-
#if defined(FEAT_TOOLBAR) \
&& (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_HAIKU) ||
defined(FEAT_GUI_MSWIN))
int toolbar_height; // height of the toolbar
--- 402,407 ----
*** ../vim-9.0.0374/src/version.c 2022-09-04 11:55:16.154941174 +0100
--- src/version.c 2022-09-04 12:27:59.241145553 +0100
***************
*** 709,710 ****
--- 705,708 ----
{ /* Add new patch number below this line */
+ /**/
+ 375,
/**/
--
Bad fashion can discourage normal people from interacting with the engineer
and talking about the cute things their children do.
(Scott Adams - The Dilbert principle)
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20220904112952.A26461C0CE4%40moolenaar.net.
