aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-18 07:54:29 -04:00
Code Activity

patch 8.1.0763: nobody is using the Sun Workshop support

Browse Source 
Problem:    Nobody is using the Sun Workshop support.
Solution:   Remove the Workshop support.
This commit is contained in:
Bram Moolenaar
2019-01-17 15:45:25 +01:00
parent e40742526e
commit bb1969b6ab
37 changed files with 55 additions and 4093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/gui_x11.c
View File

@@ -22,11 +22,11 @@
#include <X11/cursorfont.h>
/*
* For Workshop XpmP.h is preferred, because it makes the signs drawn with a
* transparent background instead of black.
* XpmP.h is preferred, because it makes the signs drawn with a transparent
* background instead of black.
*/
#if defined(HAVE_XM_XPMP_H) && defined(FEAT_GUI_MOTIF) \
&& (!defined(HAVE_X11_XPM_H) || defined(FEAT_SUN_WORKSHOP))
&& !defined(HAVE_X11_XPM_H)
# include <Xm/XpmP.h>
#else
# ifdef HAVE_X11_XPM_H
@@ -469,7 +469,7 @@ static XtResource vim_resources[] =
XtRString,
DFLT_TOOLTIP_FONT
},
/* This one isn't really needed, keep for Sun Workshop? */
/* This one may not be really needed? */
{
"balloonEvalFontSet",
XtCFontSet,
@@ -636,8 +636,7 @@ gui_x11_expose_cb(
gui_mch_update();
}
#if ((defined(FEAT_NETBEANS_INTG) || defined(FEAT_SUN_WORKSHOP)) \
&& defined(FEAT_GUI_MOTIF)) || defined(PROTO)
#if (defined(FEAT_NETBEANS_INTG) && defined(FEAT_GUI_MOTIF)) || defined(PROTO)
/*
* This function fills in the XRectangle object with the current x,y
* coordinates and height, width so that an XtVaSetValues to the same shell of
@@ -701,15 +700,6 @@ gui_x11_resize_window_cb(
#endif
);
}
#ifdef FEAT_SUN_WORKSHOP
if (usingSunWorkShop)
{
XRectangle rec;
shellRectangle(w, &rec);
workshop_frame_moved(rec.x, rec.y, rec.width, rec.height);
}
#endif
#if defined(FEAT_NETBEANS_INTG) && defined(FEAT_GUI_MOTIF)
if (netbeans_active())
{
@@ -1224,22 +1214,6 @@ gui_mch_prepare(int *argc, char **argv)
argv[*argc] = NULL;
}
else
#ifdef FEAT_SUN_WORKSHOP
if (strcmp("-ws", argv[arg]) == 0)
{
usingSunWorkShop++;
p_acd = TRUE;
gui.dofork = FALSE; /* don't fork() when starting GUI */
mch_memmove(&argv[arg], &argv[arg + 1],
(--*argc - arg) * sizeof(char *));
argv[*argc] = NULL;
# ifdef WSDEBUG
wsdebug_wait(WT_ENV | WT_WAIT | WT_STOP, "SPRO_GVIM_WAIT", 20);
wsdebug_log_init("SPRO_GVIM_DEBUG", "SPRO_GVIM_DLEVEL");
# endif
}
else
#endif
#ifdef FEAT_NETBEANS_INTG
if (strncmp("-nb", argv[arg], 3) == 0)
{
@@ -1543,11 +1517,6 @@ gui_mch_init(void)
if (gui.color_approx)
emsg(_("Vim E458: Cannot allocate colormap entry, some colors may be incorrect"));
#ifdef FEAT_SUN_WORKSHOP
if (usingSunWorkShop)
workshop_connect(app_context);
#endif
#ifdef FEAT_BEVAL_GUI
gui_init_tooltip_font();
#endif
@@ -1681,9 +1650,6 @@ gui_mch_open(void)
#ifdef FEAT_XIM
xim_init();
#endif
#ifdef FEAT_SUN_WORKSHOP
workshop_postinit();
#endif
return OK;
}
@@ -2748,12 +2714,7 @@ gui_mch_wait_for_chars(long wtime)
#endif
focus = gui.in_focus;
#ifdef ALT_X_INPUT
if (suppress_alternate_input)
desired = (XtIMXEvent | XtIMTimer);
else
#endif
desired = (XtIMAll);
desired = (XtIMAll);
while (!timed_out)
{
/* Stop or start blinking when focus changes */