From 0b962e5685edd41b55d5427b894797e725707639 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 3 Apr 2022 18:02:37 +0100 Subject: patch 8.2.4677: the Athena GUI support is outdated Problem: The Athena GUI support is outdated. Solution: Remove the Athena GUI code. --- src/testdir/gui_init.vim | 2 +- src/testdir/setup_gui.vim | 2 +- src/testdir/test_clientserver.vim | 4 ++-- src/testdir/test_edit.vim | 2 +- src/testdir/test_gui.vim | 17 ++++------------- src/testdir/test_highlight.vim | 2 +- src/testdir/test_quotestar.vim | 2 +- src/testdir/test_startup.vim | 14 +++++++------- 8 files changed, 18 insertions(+), 27 deletions(-) (limited to 'src/testdir') diff --git a/src/testdir/gui_init.vim b/src/testdir/gui_init.vim index 42b2bca7fe..4fa6cbc77a 100644 --- a/src/testdir/gui_init.vim +++ b/src/testdir/gui_init.vim @@ -1,6 +1,6 @@ " gvimrc for test_gui_init.vim -if has('gui_athena') || has('gui_motif') || has('gui_gtk2') || has('gui_gtk3') +if has('gui_motif') || has('gui_gtk2') || has('gui_gtk3') set guiheadroom=0 set guioptions+=p endif diff --git a/src/testdir/setup_gui.vim b/src/testdir/setup_gui.vim index 05e49997b8..2e5e77771d 100644 --- a/src/testdir/setup_gui.vim +++ b/src/testdir/setup_gui.vim @@ -1,6 +1,6 @@ " Common preparations for running GUI tests. -let g:x11_based_gui = has('gui_athena') || has('gui_motif') +let g:x11_based_gui = has('gui_motif') \ || has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3') " Reasons for 'skipped'. diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim index 03d201ddf4..aebbc2f6ec 100644 --- a/src/testdir/test_clientserver.vim +++ b/src/testdir/test_clientserver.vim @@ -63,8 +63,8 @@ func Test_client_server() " the GUI and check that the remote command still works. " Need to wait for the GUI to start up, otherwise the send hangs in trying " to send to the terminal window. - if has('gui_athena') || has('gui_motif') - " For those GUIs, ignore the 'failed to create input context' error. + if has('gui_motif') + " For this GUI ignore the 'failed to create input context' error. call remote_send(name, ":call test_ignore_error('E285') | gui -f\") else call remote_send(name, ":gui -f\") diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim index e3518d8656..a96a95bd3a 100644 --- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -2094,7 +2094,7 @@ endfunc func Test_edit_CTRL_hat() CheckFeature xim - " FIXME: test fails with Athena and Motif GUI. + " FIXME: test fails with Motif GUI. " test also fails when running in the GUI. CheckFeature gui_gtk CheckNotGui diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index c5332b8c22..4ae01b8551 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -63,7 +63,7 @@ endfunc func Test_getfontname_with_arg() CheckX11BasedGui - if has('gui_athena') || has('gui_motif') + if has('gui_motif') " Invalid font name. The result should be an empty string. call assert_equal('', getfontname('notexist')) @@ -90,7 +90,7 @@ func Test_getfontname_without_arg() if has('gui_kde') " 'expected' is the value specified by SetUp() above. call assert_equal('Courier 10 Pitch/8/-1/5/50/0/0/0/0/0', fname) - elseif has('gui_athena') || has('gui_motif') + elseif has('gui_motif') " 'expected' is DFLT_FONT of gui_x11.c or its real name. let pat = '\(7x13\)\|\(\c-Misc-Fixed-Medium-R-Normal--13-120-75-75-C-70-ISO8859-1\)' call assert_match(pat, fname) @@ -376,7 +376,7 @@ func Test_set_guifont() set guifontset= endif - if has('gui_athena') || has('gui_motif') + if has('gui_motif') " Non-empty font list with invalid font names. " " This test is twofold: (1) It checks if the command fails as expected @@ -514,7 +514,7 @@ func Test_set_guifontwide() let &guifontwide = guifontwide_saved let &guifont = guifont_saved - elseif has('gui_athena') || has('gui_motif') + elseif has('gui_motif') " guifontwide is premised upon the xfontset feature. if !has('xfontset') let skipped = g:not_supported . 'xfontset' @@ -1280,8 +1280,6 @@ func TestGuiTabToolTip() endfunc func Test_gui_tablabel_tooltip() - CheckNotFeature gui_athena - %bw! " Removing the tabline at the end of this test, reduces the window height by " one. Save and restore it after the test. @@ -1436,10 +1434,6 @@ endfunc " Test for generating a GUI tabline event to select a tab page func Test_gui_tabline_event() - if has('gui_athena') - throw 'Skipped: tabline is not supported in Athena GUI' - endif - %bw! edit Xfile1 tabedit Xfile2 @@ -1467,9 +1461,6 @@ endfunc " Test for generating a GUI tabline menu event to execute an action func Test_gui_tabmenu_event() - if has('gui_athena') - throw 'Skipped: tabmenu is not supported in Athena GUI' - endif %bw! " Try to close the last tab page diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim index 4b8cd86faf..51a25242fe 100644 --- a/src/testdir/test_highlight.vim +++ b/src/testdir/test_highlight.vim @@ -759,7 +759,7 @@ func Test_1_highlight_Normalgroup_exists() elseif has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3') " expect is DEFAULT_FONT of gui_gtk_x11.c call assert_match('hi Normal\s*font=Monospace 10', hlNormal) - elseif has('gui_motif') || has('gui_athena') + elseif has('gui_motif') " expect is DEFAULT_FONT of gui_x11.c call assert_match('hi Normal\s*font=7x13', hlNormal) elseif has('win32') diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim index b669019d8e..1d26942547 100644 --- a/src/testdir/test_quotestar.vim +++ b/src/testdir/test_quotestar.vim @@ -98,7 +98,7 @@ func Do_test_quotestar_for_x11() " Running in a terminal and the GUI is available: Tell the server to open " the GUI and check that the remote command still works. - if has('gui_athena') || has('gui_motif') + if has('gui_motif') " For those GUIs, ignore the 'failed to create input context' error. call remote_send(name, ":call test_ignore_error('E285') | gui -f\") else diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 1c1e1c0f3f..6926ba313e 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -441,7 +441,7 @@ endfunction " Test the -reverse and +reverse arguments (for GUI only). func Test_reverse() CheckCanRunGui - CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena + CheckAnyOf Feature:gui_gtk Feature:gui_motif let after =<< trim [CODE] call writefile([&background], "Xtest_reverse") @@ -462,7 +462,7 @@ endfunc " Test the -background and -foreground arguments (for GUI only). func Test_background_foreground() CheckCanRunGui - CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena + CheckAnyOf Feature:gui_gtk Feature:gui_motif " Is there a better way to check the effect of -background & -foreground " other than merely looking at &background (dark or light)? @@ -489,7 +489,7 @@ func Test_font() if has('gui_gtk') let font = 'Courier 14' - elseif has('gui_motif') || has('gui_athena') + elseif has('gui_motif') let font = '-misc-fixed-bold-*' else throw 'Skipped: test does not set a valid font for this GUI' @@ -511,10 +511,10 @@ endfunc " Test the -geometry argument (for GUI only). func Test_geometry() CheckCanRunGui - CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena + CheckAnyOf Feature:gui_gtk Feature:gui_motif - if has('gui_motif') || has('gui_athena') - " FIXME: With GUI Athena or Motif, the value of getwinposx(), + if has('gui_motif') + " FIXME: With GUI Motif the value of getwinposx(), " getwinposy() and getwinpos() do not match exactly the " value given in -geometry. Why? " So only check &columns and &lines for those GUIs. @@ -550,7 +550,7 @@ endfunc " Test the -iconic argument (for GUI only). func Test_iconic() CheckCanRunGui - CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena + CheckAnyOf Feature:gui_gtk Feature:gui_motif call RunVim([], [], '-f -g -iconic -cq') -- cgit v1.2.3