diff options
| -rw-r--r-- | Filelist | 5 | ||||
| -rw-r--r-- | runtime/doc/gui.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/gui_x11.txt | 38 | ||||
| -rw-r--r-- | src/Makefile | 49 | ||||
| -rw-r--r-- | src/clipboard.c | 2 | ||||
| -rw-r--r-- | src/evalfunc.c | 16 | ||||
| -rw-r--r-- | src/feature.h | 30 | ||||
| -rw-r--r-- | src/gui.c | 52 | ||||
| -rw-r--r-- | src/gui.h | 15 | ||||
| -rw-r--r-- | src/gui_at_fs.c | 2753 | ||||
| -rw-r--r-- | src/gui_at_sb.c | 1192 | ||||
| -rw-r--r-- | src/gui_at_sb.h | 161 | ||||
| -rw-r--r-- | src/gui_athena.c | 2303 | ||||
| -rw-r--r-- | src/gui_beval.c | 75 | ||||
| -rw-r--r-- | src/gui_motif.c | 6 | ||||
| -rw-r--r-- | src/gui_x11.c | 72 | ||||
| -rw-r--r-- | src/if_mzsch.c | 10 | ||||
| -rw-r--r-- | src/main.c | 11 | ||||
| -rw-r--r-- | src/menu.c | 10 | ||||
| -rw-r--r-- | src/mouse.c | 4 | ||||
| -rw-r--r-- | src/proto.h | 6 | ||||
| -rw-r--r-- | src/proto/gui_athena.pro | 33 | ||||
| -rw-r--r-- | src/structs.h | 3 | ||||
| -rw-r--r-- | src/testdir/gui_init.vim | 2 | ||||
| -rw-r--r-- | src/testdir/setup_gui.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_clientserver.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_edit.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_gui.vim | 17 | ||||
| -rw-r--r-- | src/testdir/test_highlight.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_quotestar.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_startup.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 20 | ||||
| -rw-r--r-- | src/vim.h | 4 |
33 files changed, 102 insertions, 6823 deletions
@@ -446,10 +446,6 @@ SRC_UNIX = \ src/create_cmdidxs.vim \ src/create_nvcmdidxs.c \ src/create_nvcmdidxs.vim \ - src/gui_at_fs.c \ - src/gui_at_sb.c \ - src/gui_at_sb.h \ - src/gui_athena.c \ src/gui_gtk.c \ src/gui_gtk_f.c \ src/gui_gtk_f.h \ @@ -474,7 +470,6 @@ SRC_UNIX = \ src/osdef1.h.in \ src/osdef2.h.in \ src/pathdef.sh \ - src/proto/gui_athena.pro \ src/proto/gui_gtk.pro \ src/proto/gui_gtk_x11.pro \ src/proto/gui_gtk_gresources.pro \ diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index 84d6984bf6..df812c9e72 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -25,7 +25,7 @@ Other GUI documentation: First you must make sure you actually have a version of Vim with the GUI code included. You can check this with the ":version" command, it says "with xxx -GUI", where "xxx" is X11-Motif, X11-Athena, Photon, GTK2, GTK3, etc., or +GUI", where "xxx" is X11-Motif, Photon, GTK2, GTK3, etc., or "MS-Windows 32 bit GUI version". How to start the GUI depends on the system used. Mostly you can run the @@ -108,7 +108,7 @@ There are a number of options which only have meaning in the GUI version of Vim. These are 'guicursor', 'guifont', 'guipty' and 'guioptions'. They are documented in |options.txt| with all the other options. -If using the Motif or Athena version of the GUI (but not for the GTK+ or +If using the Motif version of the GUI (but not for the GTK+ or Win32 version), a number of X resources are available. See |gui-resources|. Another way to set the colors for different occasions is with highlight @@ -236,7 +236,7 @@ takes too much time or you don't like the cursor jumping to another line, include the 'h' flag in 'guioptions'. Then the scrolling is limited by the text of the current cursor line. - *athena-intellimouse* + *motif-intellimouse* If you have an Intellimouse and an X server that supports using the wheel, then you can use the wheel to scroll the text up and down in gvim. This works with XFree86 4.0 and later, and with some older versions when you add patches. @@ -746,7 +746,7 @@ because the item will never be selected. Use a single colon to keep it simple. *gui-toolbar* -The toolbar is currently available in the Win32, Athena, Motif, GTK+ (X11), +The toolbar is currently available in the Win32, Motif, GTK+ (X11), and Photon GUI. It should turn up in other GUIs in due course. The default toolbar is setup in menu.vim. The display of the toolbar is controlled by the 'guioptions' letter 'T'. You @@ -862,7 +862,7 @@ The window toolbar uses the ToolbarLine and ToolbarButton highlight groups. When splitting the window the window toolbar is not copied to the new window. *popup-menu* -In the Win32, GTK+, Motif, Athena and Photon GUI, you can define the +In the Win32, GTK+, Motif and Photon GUI, you can define the special menu "PopUp". This is the menu that is displayed when the right mouse button is pressed, if 'mousemodel' is set to popup or popup_setpos. Example: > diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index 25cf898aa1..5b75fe29f8 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,11 +1,11 @@ -*gui_x11.txt* For Vim version 8.2. Last change: 2020 Jun 05 +*gui_x11.txt* For Vim version 8.2. Last change: 2022 Apr 03 VIM REFERENCE MANUAL by Bram Moolenaar Vim's Graphical User Interface *gui-x11* *GUI-X11* - *Athena* *Motif* + *Motif* 1. Starting the X11 GUI |gui-x11-start| 2. GUI Resources |gui-resources| 3. Shell Commands |gui-pty| @@ -64,7 +64,7 @@ flag in 'guioptions'. |-f|. ============================================================================== 2. GUI Resources *gui-resources* *.Xdefaults* -If using the Motif or Athena version of the GUI (not for the KDE, GTK+ or Win32 +If using the Motif version of the GUI (not for the KDE, GTK+ or Win32 version), a number of X resources are available. You should use Vim's class "Vim" when setting these. They are as follows: @@ -96,7 +96,6 @@ version), a number of X resources are available. You should use Vim's class is same size as terminal that started it). scrollbarWidth Thickness of scrollbars. borderWidth Thickness of border around text area. - menuHeight Height of the menu bar (only for Athena). A special font for italic, bold, and italic-bold text will only be used if the user has specified one via a resource. No attempt is made to guess what @@ -135,12 +134,9 @@ which make Motif applications look even better, highly recommended! The "Vim*fontList" is to set the menu font for Motif. Example: > Vim*menuBar*fontList: -*-courier-medium-r-*-*-10-*-*-*-*-*-*-* -With Athena: > - Vim*menuBar*SmeBSB*font: -*-courier-medium-r-*-*-10-*-*-*-*-*-*-* - Vim*menuBar*MenuButton*font: -*-courier-medium-r-*-*-10-*-*-*-*-*-*-* NOTE: A more portable, and indeed more correct, way to specify the menu font -in either Motif or Athena is through the resource: > +in Motif is through the resource: > Vim.menuFont: -*-courier-medium-r-*-*-10-*-*-*-*-*-*-* Or, when compiled with the |+xfontset| feature: > Vim.menuFontSet: -*-courier-medium-r-*-*-10-*-*-*-*-*-*-* @@ -255,7 +251,7 @@ For example: > :10vmenu File.Print :w !lpr -Php3 < *X11-icon* -Vim uses a black&white icon by default when compiled with Motif or Athena. A +Vim uses a black&white icon by default when compiled with Motif. A colored Vim icon is included as $VIMRUNTIME/vim32x32.xpm. For GTK+, this is the builtin icon used. Unfortunately, how you should install it depends on your window manager. When you use this, remove the 'i' flag from @@ -594,8 +590,7 @@ GTK+ files on your system. When both GTK+ 2 and GTK+ 3 are available, GTK+ 2 will be chosen unless --enable-gui=gtk3 is passed explicitly to configure. If the GTK+ files cannot be found, then the Motif files will be searched for. -Finally, if this fails, the Athena files will be searched for. If all three -fail, the GUI will be disabled. +If both fail, the GUI will be disabled. For GTK+, Vim's configuration process uses pkg-config(1) to check if the GTK+ required for a specified build is properly installed and usable. @@ -621,10 +616,10 @@ explicitly to configure, and avoid passing --enable-gnome-check to that, as the functionality of the GNOME 2 support has already been consolidated in GTK+ 3. -Otherwise, if you are using Motif or Athena, when you have the Motif or Athena -files in a directory where configure doesn't look, edit the Makefile to enter -the names of the directories. Search for "GUI_INC_LOC" for an example to set -the Motif directories, "CONF_OPT_X" for Athena. +Otherwise, if you are using Motif, when you have the Motif files in a +directory where configure doesn't look, edit the Makefile to enter the names +of the directories. Search for "GUI_INC_LOC" for an example to set +the Motif directories. *gui-x11-gtk* Currently, Vim supports both GTK+ 2 and GTK+ 3. @@ -643,18 +638,11 @@ few problems, but you might make it compile and run with a bit of work, please send me the patches if you do). The newest releases of LessTif have been reported to work fine too. - *gui-x11-athena* -The Athena version uses the Xaw widget set by default. If you have the 3D -version, you might want to link with Xaw3d instead. This will make the -menus look a bit better. Edit the Makefile and look for "XAW_LIB". The -scrollbars will remain the same, because Vim has its own, which are already -3D (in fact, they look more like Motif). - - *gui-x11-neXtaw* -The neXtaw version is mostly like Athena, but uses different widgets. + *gui-x11-athena* *gui-x11-neXtaw* +Support for the Athena GUI and neXtaw was removed in patch 8.2.4677. *gui-x11-misc* -In general, do not try to mix files from different GTK+, Motif, Athena and X11 +In general, do not try to mix files from different GTK+, Motif and X11 versions. This will cause problems. For example, using header files for X11R5 with a library for X11R6 probably doesn't work (although the linking won't give an error message, Vim will crash later). diff --git a/src/Makefile b/src/Makefile index 1b143b9ff2..3a713d7a6f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -182,10 +182,7 @@ #Irix 6.5 cc ? 6.0 (S) David Harrison #Irix 64 bit 4.5 (K) Jon Wright #Linux 2.0 gcc-2.7.2 Infomagic Motif 4.3 (3) Ronald Rietman -#Linux 2.0.31 gcc +X11 +GUI Athena 5.0w (U) Darren Hiebert -#LynxOS 3.0.1 2.9-gnupro-98r2 +X11 +GUI Athena 5.7.1(O) Lorenz Hahn -#LynxOS 3.1.0 2.9-gnupro-98r2 +X11 +GUI Athena 5.7.1(O) Lorenz Hahn -#NEC UP4800 UNIX_SV 4.2MP cc +X11R6 Motif,Athena4.6b (Q) Lennart Schultz +#NEC UP4800 UNIX_SV 4.2MP cc +X11R6 Motif 4.6b (Q) Lennart Schultz #NetBSD 1.0A gcc-2.4.5 -X11 -GUI 3.21 (X) Juergen Weigert #QNX 4.2 wcc386-10.6 -X11 4.2 (D) G.F. Desrochers #QNX 4.23 Watcom -X11 4.2 (F) John Oleynick @@ -199,14 +196,12 @@ #Solaris 2.4 (Sparc) cc +X11 +GUI 3.29 (9) Glauber #Solaris 2.4/2.5 clcc +X11 -GUI openwin 3.20 (7) Robert Colon #Solaris 2.5 (sun4m) cc (SC4.0) +X11R6 +GUI (CDE) 4.6b (E) Andrew Large -#Solaris 2.5 cc +X11 +GUI Athena 4.2 (9) Sonia Heimann #Solaris 2.5 gcc 2.5.6 +X11 Motif 5.0m (R) Ant. Colombo #Solaris 2.6 gcc 2.8.1 ncurses 5.3 (G) Larry W. Virden #Solaris with -lthread 5.5 (W) K. Nagano #Solaris gcc (b) Riccardo #SunOS 4.1.x +X11 -GUI 5.1b (J) Bram Moolenaar -#SunOS 4.1.3_U1 (sun4c) gcc +X11 +GUI Athena 5.0w (J) Darren Hiebert -#SUPER-UX 6.2 (NEC SX-4) cc +X11R6 Motif,Athena4.6b (P) Lennart Schultz +#SUPER-UX 6.2 (NEC SX-4) cc +X11R6 Motif 4.6b (P) Lennart Schultz #Tandem/NSK (c) Matthew Woehlke #Unisys 6035 cc +X11 Motif 5.3 (8) Glauber Ribeiro #ESIX V4.2 cc +X11 6.0 (a) Reinhard Wobst @@ -1342,8 +1337,8 @@ HAIKUGUI_TESTTARGET = gui HAIKUGUI_BUNDLE = # All GUI files -ALL_GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_athena.c gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c gui_haiku.cc -ALL_GUI_PRO = gui.pro gui_gtk.pro gui_motif.pro gui_xmdlg.pro gui_athena.pro gui_gtk_x11.pro gui_x11.pro gui_w32.pro gui_photon.pro gui_haiku.pro +ALL_GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_gtk_x11.c gui_x11.c gui_haiku.cc +ALL_GUI_PRO = gui.pro gui_gtk.pro gui_motif.pro gui_xmdlg.pro gui_gtk_x11.pro gui_x11.pro gui_w32.pro gui_photon.pro gui_haiku.pro # }}} @@ -3245,15 +3240,6 @@ objects/help.o: help.c objects/gui.o: gui.c $(CCC) -o $@ gui.c -objects/gui_at_fs.o: gui_at_fs.c - $(CCC) -o $@ gui_at_fs.c - -objects/gui_at_sb.o: gui_at_sb.c - $(CCC) -o $@ gui_at_sb.c - -objects/gui_athena.o: gui_athena.c - $(CCC) -o $@ gui_athena.c - objects/beval.o: beval.c $(CCC) -o $@ beval.c @@ -4182,25 +4168,6 @@ objects/gui_xmebw.o: gui_xmebw.c vim.h protodef.h auto/config.h feature.h \ os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h errors.h gui_xmebwp.h gui_xmebw.h -objects/gui_athena.o: gui_athena.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h gui_at_sb.h gui_x11_pm.h \ - ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm \ - ../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm \ - ../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ - ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \ - ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \ - ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \ - ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \ - ../pixmaps/tb_save_all.xpm ../pixmaps/tb_jump.xpm \ - ../pixmaps/tb_ctags.xpm ../pixmaps/tb_load_session.xpm \ - ../pixmaps/tb_save_session.xpm ../pixmaps/tb_new_session.xpm \ - ../pixmaps/tb_blank.xpm ../pixmaps/tb_maximize.xpm \ - ../pixmaps/tb_split.xpm ../pixmaps/tb_minimize.xpm \ - ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \ - ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \ - ../pixmaps/tb_minwidth.xpm objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h protodef.h auto/config.h feature.h \ os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ @@ -4211,14 +4178,6 @@ objects/gui_x11.o: gui_x11.c vim.h protodef.h auto/config.h feature.h os_unix.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h errors.h ../runtime/vim32x32.xpm \ ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm -objects/gui_at_sb.o: gui_at_sb.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h gui_at_sb.h -objects/gui_at_fs.o: gui_at_fs.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h errors.h gui_at_sb.h objects/gui_haiku.o: gui_haiku.cc vim.h protodef.h auto/config.h feature.h \ os_unix.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ diff --git a/src/clipboard.c b/src/clipboard.c index 9eace3de6d..fbeee72518 100644 --- a/src/clipboard.c +++ b/src/clipboard.c @@ -1354,7 +1354,7 @@ check_clipboard_option(void) /* * Open the application context (if it hasn't been opened yet). - * Used for Motif and Athena GUI and the xterm clipboard. + * Used for Motif GUI and the xterm clipboard. */ void open_app_context(void) diff --git a/src/evalfunc.c b/src/evalfunc.c index 768b27f927..5a0428ecff 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -5619,20 +5619,8 @@ f_has(typval_T *argvars, typval_T *rettv) 0 #endif }, - {"gui_neXtaw", -#if defined(FEAT_GUI_ATHENA) && defined(FEAT_GUI_NEXTAW) - 1 -#else - 0 -#endif - }, - {"gui_athena", -#if defined(FEAT_GUI_ATHENA) && !defined(FEAT_GUI_NEXTAW) - 1 -#else - 0 -#endif - }, + {"gui_neXtaw", 0 }, + {"gui_athena", 0 }, {"gui_gtk", #ifdef FEAT_GUI_GTK 1 diff --git a/src/feature.h b/src/feature.h index 0f5bf1e016..1a24879816 100644 --- a/src/feature.h +++ b/src/feature.h @@ -583,8 +583,7 @@ #if defined(FEAT_NORMAL) && defined(FEAT_MENU) \ && (defined(FEAT_GUI_GTK) \ || defined(FEAT_GUI_MSWIN) \ - || ((defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) \ - && defined(HAVE_XPM)) \ + || (defined(FEAT_GUI_MOTIF) && defined(HAVE_XPM)) \ || defined(FEAT_GUI_PHOTON) \ || defined(FEAT_GUI_HAIKU)) @@ -620,7 +619,7 @@ */ #if defined(FEAT_NORMAL) # define FEAT_BROWSE_CMD -# if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ +# if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_HAIKU) || defined(FEAT_GUI_PHOTON) # define FEAT_BROWSE # endif @@ -641,8 +640,7 @@ * When none of these defined there is no dialog support. */ #ifdef FEAT_NORMAL -# if ((defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MOTIF)) \ - && defined(HAVE_X11_XPM_H)) \ +# if (defined(FEAT_GUI_MOTIF) && defined(HAVE_X11_XPM_H)) \ || defined(FEAT_GUI_GTK) \ || defined(FEAT_GUI_PHOTON) \ || defined(FEAT_GUI_HAIKU) \ @@ -654,13 +652,13 @@ # endif #endif #if !defined(FEAT_GUI_DIALOG) && (defined(FEAT_GUI_MOTIF) \ - || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) \ + || defined(FEAT_GUI_GTK) \ || defined(FEAT_GUI_MSWIN)) // need a dialog to show error messages when starting from the desktop # define FEAT_GUI_DIALOG #endif #if defined(FEAT_GUI_DIALOG) && \ - (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ + (defined(FEAT_GUI_MOTIF) \ || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) \ || defined(FEAT_GUI_PHOTON) \ || defined(FEAT_GUI_HAIKU)) @@ -881,7 +879,7 @@ * +X11 Unix only. Include code for xterm title saving and X * clipboard. Only works if HAVE_X11 is also defined. */ -#if (defined(FEAT_NORMAL) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) +#if defined(FEAT_NORMAL) || defined(FEAT_GUI_MOTIF) # define WANT_X11 #endif @@ -1047,7 +1045,7 @@ # define MCH_CURSOR_SHAPE # endif # if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ - || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) \ + || defined(FEAT_GUI_GTK) \ || defined(FEAT_GUI_PHOTON) # define FEAT_MOUSESHAPE # endif @@ -1064,7 +1062,7 @@ #endif #if defined(FEAT_MZSCHEME) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \ - || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) + || defined(FEAT_GUI_MOTIF)) # define MZSCHEME_GUI_THREADS #endif @@ -1090,7 +1088,6 @@ * +tcl TCL interface: "--enable-tclinterp" * +netbeans_intg Netbeans integration * +channel Inter process communication - * +GUI_Athena Athena GUI * +GUI_Motif Motif GUI */ @@ -1154,8 +1151,7 @@ */ #if defined(FEAT_BIG) || defined(FEAT_NETBEANS_INTG) || defined(FEAT_PROP_POPUP) # define FEAT_SIGNS -# if ((defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) \ - && defined(HAVE_X11_XPM_H)) \ +# if (defined(FEAT_GUI_MOTIF) && defined(HAVE_X11_XPM_H)) \ || defined(FEAT_GUI_GTK) \ || (defined(MSWIN) && defined(FEAT_GUI)) # define FEAT_SIGN_ICONS @@ -1167,7 +1163,7 @@ * debugger and for tooltips. * Only for GUIs where it was implemented. */ -#if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ +#if (defined(FEAT_GUI_MOTIF) \ || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN)) \ && ( ((defined(FEAT_TOOLBAR) || defined(FEAT_GUI_TABLINE)) \ && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MSWIN)) \ @@ -1179,7 +1175,7 @@ # endif #endif -#if defined(FEAT_BEVAL_GUI) && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) +#if defined(FEAT_BEVAL_GUI) && defined(FEAT_GUI_MOTIF) # define FEAT_BEVAL_TIP // balloon eval used for toolbar tooltip #endif @@ -1196,8 +1192,8 @@ # define FEAT_BEVAL #endif -// both Motif and Athena are X11 and share some code -#if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) +// Motif is X11 +#if defined(FEAT_GUI_MOTIF) # define FEAT_GUI_X11 #endif @@ -53,15 +53,6 @@ static int can_update_cursor = TRUE; // can display the cursor static int disable_flush = 0; // If > 0, gui_mch_flush() is disabled. /* - * The Athena scrollbars can move the thumb to after the end of the scrollbar, - * this makes the thumb indicate the part of the text that is shown. Motif - * can't do this. - */ -#if defined(FEAT_GUI_ATHENA) -# define SCROLL_PAST_END -#endif - -/* * gui_start -- Called when user wants to start the GUI. * * Careful: This function can be called recursively when there is a ":gui" @@ -445,8 +436,7 @@ gui_init_check(void) gui.menu_width = 0; # endif #endif -#if defined(FEAT_TOOLBAR) && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ - || defined(FEAT_GUI_HAIKU)) +#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) @@ -789,7 +779,7 @@ gui_init(void) balloonEval = gui_mch_create_beval_area(gui.drawarea, NULL, &general_beval_cb, NULL); # else -# if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) +# if defined(FEAT_GUI_MOTIF) { extern Widget textArea; balloonEval = gui_mch_create_beval_area(textArea, NULL, @@ -1441,11 +1431,11 @@ gui_position_components(int total_width UNUSED) text_area_y += gui.tabline_height; #endif -#if defined(FEAT_TOOLBAR) && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ +#if defined(FEAT_TOOLBAR) && (defined(FEAT_GUI_MOTIF) \ || defined(FEAT_GUI_HAIKU) || defined(FEAT_GUI_MSWIN)) if (vim_strchr(p_go, GO_TOOLBAR) != NULL) { -# if defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_HAIKU) +# if defined(FEAT_GUI_HAIKU) gui_mch_set_toolbar_pos(0, text_area_y, gui.menu_width, gui.toolbar_height); # endif @@ -2043,10 +2033,10 @@ gui_write( old_curwin = curwin; /* - * We need to make sure this is cleared since Athena doesn't tell us when - * he is done dragging. Do the same for GTK. + * We need to make sure this is cleared since GTK doesn't tell us when + * the user is done dragging. */ -#if defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) +#if defined(FEAT_GUI_GTK) gui.dragged_sb = SBAR_NONE; #endif @@ -3410,10 +3400,10 @@ button_set: prev_col = col; /* - * We need to make sure this is cleared since Athena doesn't tell us when - * he is done dragging. Neither does GTK+ 2 -- at least for now. + * We need to make sure this is cleared since GTK doesn't tell us when + * the user is done dragging. */ -#if defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) +#if defined(FEAT_GUI_GTK) gui.dragged_sb = SBAR_NONE; #endif } @@ -3952,9 +3942,6 @@ gui_create_scrollbar(scrollbar_T *sb, int type, win_T *wp) sb->wp = wp; sb->type = type; sb->value = 0; -#ifdef FEAT_GUI_ATHENA - sb->pixval = 0; -#endif sb->size = 1; sb->max = 1; sb->top = 0; @@ -4336,7 +4323,7 @@ gui_update_scrollbars( y += gui.menu_height; #endif -#if defined(FEAT_TOOLBAR) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_ATHENA) \ +#if defined(FEAT_TOOLBAR) && (defined(FEAT_GUI_MSWIN) \ || defined(FEAT_GUI_HAIKU)) if (vim_strchr(p_go, GO_TOOLBAR) != NULL) y += gui.toolbar_height; @@ -4369,25 +4356,10 @@ gui_update_scrollbars( } } - // Reduce the number of calls to gui_mch_set_scrollbar_thumb() by - // checking if the thumb moved at least a pixel. Only do this for - // Athena, most other GUIs require the update anyway to make the - // arrows work. -#ifdef FEAT_GUI_ATHENA - if (max == 0) - y = 0; - else - y = (val * (sb->height + 2) * gui.char_height + max / 2) / max; - if (force || sb->pixval != y || sb->size != size || sb->max != max) -#else if (force || sb->value != val || sb->size != size || sb->max != max) -#endif { // Thumb of scrollbar has moved sb->value = val; -#ifdef FEAT_GUI_ATHENA - sb->pixval = y; -#endif sb->size = size; sb->max = max; if (gui.which_scrollbars[SBAR_LEFT] @@ -5122,7 +5094,7 @@ ex_gui(exarg_T *eap) || defined(FEAT_GUI_HAIKU)) \ && defined(FEAT_TOOLBAR)) || defined(PROTO) /* - * This is shared between Athena, Haiku, Motif, and GTK. + * This is shared between Haiku, Motif, and GTK. */ /* @@ -11,11 +11,6 @@ # include <Xm/Xm.h> #endif -#ifdef FEAT_GUI_ATHENA -# include <X11/Intrinsic.h> -# include <X11/StringDefs.h> -#endif - #ifdef FEAT_GUI_GTK # ifdef VMS // undef MIN and MAX because Intrinsic.h redefines them anyway # ifdef MAX @@ -36,7 +31,7 @@ // Needed when generating prototypes, since FEAT_GUI is always defined then. #if defined(FEAT_XCLIPBOARD) && !defined(FEAT_GUI_MOTIF) \ - && !defined(FEAT_GUI_ATHENA) && !defined(FEAT_GUI_GTK) + && !defined(FEAT_GUI_GTK) # include <X11/Intrinsic.h> #endif @@ -160,9 +155,6 @@ typedef struct GuiScrollbar win_T *wp; // Scrollbar's window, NULL for bottom int type; // one of SBAR_{LEFT,RIGHT,BOTTOM} long value; // Represents top line number visible -#ifdef FEAT_GUI_ATHENA - int pixval; // pixel count of value -#endif long size; // Size of scrollbar thumb long max; // Number of lines in buffer @@ -277,9 +269,6 @@ typedef struct Gui int menu_width; // Width of the menu bar # endif char menu_is_active; // TRUE if menu is present -# ifdef FEAT_GUI_ATHENA - char menu_height_fixed; // TRUE if menu height fixed -# endif #endif scrollbar_T bottom_sbar; // Bottom scrollbar @@ -418,7 +407,7 @@ typedef struct Gui #endif #if defined(FEAT_TOOLBAR) \ - && (defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_HAIKU) || defined(FEAT_GUI_MSWIN)) + && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_HAIKU) || defined(FEAT_GUI_MSWIN)) int toolbar_height; // height of the toolbar #endif diff --git a/src/gui_at_fs.c b/src/gui_at_fs.c deleted file mode 100644 index 739d309b81..0000000000 --- a/src/gui_at_fs.c +++ /dev/null @@ -1,2753 +0,0 @@ -/* vi:set ts=8 sts=4 sw=4 noet: */ - -/* - * Copyright 1989 Software Research Associates, Inc., Tokyo, Japan - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, provided - * that the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Software Research Associates not be used - * in advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. Software Research Associates - * makes no representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied warranty. - * - * SOFTWARE RESEARCH ASSOCIATES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, - * IN NO EVENT SHALL SOFTWARE RESEARCH ASSOCIATES BE LIABLE FOR ANY SPECIAL, - * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - * - * Author: Erik M. van der Poel - * Software Research Associates, Inc., Tokyo, Japan - * erik@sra.co.jp - */ -/* - * Author's addresses: - * erik@sra.co.jp - * erik%sra.co.jp@uunet.uu.net - * erik%sra.co.jp@mcvax.uucp - * try junet instead of co.jp - * Erik M. van der Poel - * Software Research Associates, Inc. - * 1-1-1 Hirakawa-cho, Chiyoda-ku - * Tokyo 102 Japan. TEL +81-3-234-2692 - */ - -/* - * Heavely modified for Vim by Bram Moolenaar - */ - -#include "vim.h" - -// Only include this when using the file browser - -#ifdef FEAT_BROWSE - -// Weird complication: for "make lint" Text.h doesn't combine with Xm.h -#if defined(FEAT_GUI_MOTIF) && defined(FMT8BIT) -# undef FMT8BIT -#endif - -#ifndef FEAT_GUI_NEXTAW -# include "gui_at_sb.h" -#endif - -////////////////// SFinternal.h - -#include <X11/Intrinsic.h> -#include <X11/StringDefs.h> -#include <X11/Xos.h> -#ifdef FEAT_GUI_NEXTAW -# include <X11/neXtaw/Text.h> -# include <X11/neXtaw/AsciiText.h> -# include <X11/neXtaw/Scrollbar.h> -#else -# include <X11/Xaw/Text.h> -# include <X11/Xaw/AsciiText.h> -#endif - -#define SEL_FILE_CANCEL -1 -#define SEL_FILE_OK 0 -#define SEL_FILE_NULL 1 -#define SEL_FILE_TEXT 2 - -#define SF_DO_SCROLL 1 -#define SF_DO_NOT_SCROLL 0 - -typedef struct -{ - int statDone; - char *real; - char *shown; -} SFEntry; - -typedef struct -{ - char *dir; - char *path; - SFEntry *entries; - int nEntries; - int vOrigin; - int nChars; - int hOrigin; - int changed; - int beginSelection; - int endSelection; - time_t mtime; -} SFDir; - -static char SFstartDir[MAXPATHL], - SFcurrentPath[MAXPATHL], - SFcurrentDir[MAXPATHL]; - -static Widget selFile, - selFileField, - selFileForm, - selFileHScroll, - selFileHScrolls[3], - selFileLists[3], - selFileOK, - selFileCancel, - selFilePrompt, - selFileVScrolls[3]; - -static Display *SFdisplay; - -static int SFcharWidth, SFcharAscent, SFcharHeight; - -static SFDir *SFdirs = NULL; - -static int SFdirEnd; -static int SFdirPtr; - -static Pixel SFfore, SFback; - -static Atom SFwmDeleteWindow; - -static XSegment SFsegs[2], SFcompletionSegs[2]; - -static XawTextPosition SFtextPos; - -static int SFupperX, SFlowerY, SFupperY; - -static int SFtextX, SFtextYoffset; - -static int SFentryWidth, SFentryHeight; - -static int SFlineToTextH = 3; -static int SFlineToTextV = 3; - -static int SFbesideText = 3; |