Mercurial > vim

comparison src/gui_x11.c @ 15510:41fbbcea0f1b v8.1.0763

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0763: nobody is using the Sun Workshop support commit https://github.com/vim/vim/commit/bb1969b6ab28120c93b77817e7b6075e1aecf663 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 17 15:45:25 2019 +0100 patch 8.1.0763: nobody is using the Sun Workshop support Problem: Nobody is using the Sun Workshop support. Solution: Remove the Workshop support.
author Bram Moolenaar <Bram@vim.org>
date Thu, 17 Jan 2019 16:00:08 +0100
parents 7ce4992e4ab7
children 2ad5f0ffaa2e
comparison
equal deleted inserted replaced
15509:2650d9461407 15510:41fbbcea0f1b
20 #include <X11/Intrinsic.h> 20 #include <X11/Intrinsic.h>
21 #include <X11/Shell.h> 21 #include <X11/Shell.h>
22 #include <X11/cursorfont.h> 22 #include <X11/cursorfont.h>
23 23
24 /* 24 /*
25 * For Workshop XpmP.h is preferred, because it makes the signs drawn with a 25 * XpmP.h is preferred, because it makes the signs drawn with a transparent
26 * transparent background instead of black. 26 * background instead of black.
27 */ 27 */
28 #if defined(HAVE_XM_XPMP_H) && defined(FEAT_GUI_MOTIF) \ 28 #if defined(HAVE_XM_XPMP_H) && defined(FEAT_GUI_MOTIF) \
29 && (!defined(HAVE_X11_XPM_H) || defined(FEAT_SUN_WORKSHOP)) 29 && !defined(HAVE_X11_XPM_H)
30 # include <Xm/XpmP.h> 30 # include <Xm/XpmP.h>
31 #else 31 #else
32 # ifdef HAVE_X11_XPM_H 32 # ifdef HAVE_X11_XPM_H
33 # include <X11/xpm.h> 33 # include <X11/xpm.h>
34 # endif 34 # endif
467 sizeof(char *), 467 sizeof(char *),
468 XtOffsetOf(gui_T, rsrc_tooltip_font_name), 468 XtOffsetOf(gui_T, rsrc_tooltip_font_name),
469 XtRString, 469 XtRString,
470 DFLT_TOOLTIP_FONT 470 DFLT_TOOLTIP_FONT
471 }, 471 },
472 /* This one isn't really needed, keep for Sun Workshop? */ 472 /* This one may not be really needed? */
473 { 473 {
474 "balloonEvalFontSet", 474 "balloonEvalFontSet",
475 XtCFontSet, 475 XtCFontSet,
476 XtRFontSet, 476 XtRFontSet,
477 sizeof(XFontSet), 477 sizeof(XFontSet),
634 634
635 /* This is needed for when redrawing is slow. */ 635 /* This is needed for when redrawing is slow. */
636 gui_mch_update(); 636 gui_mch_update();
637 } 637 }
638 638
639 #if ((defined(FEAT_NETBEANS_INTG) || defined(FEAT_SUN_WORKSHOP)) \ 639 #if (defined(FEAT_NETBEANS_INTG) && defined(FEAT_GUI_MOTIF)) || defined(PROTO)
640 && defined(FEAT_GUI_MOTIF)) || defined(PROTO)
641 /* 640 /*
642 * This function fills in the XRectangle object with the current x,y 641 * This function fills in the XRectangle object with the current x,y
643 * coordinates and height, width so that an XtVaSetValues to the same shell of 642 * coordinates and height, width so that an XtVaSetValues to the same shell of
644 * those resources will restore the window to its former position and 643 * those resources will restore the window to its former position and
645 * dimensions. 644 * dimensions.
699 #ifdef FEAT_XIM 698 #ifdef FEAT_XIM
700 - xim_get_status_area_height() 699 - xim_get_status_area_height()
701 #endif 700 #endif
702 ); 701 );
703 } 702 }
704 #ifdef FEAT_SUN_WORKSHOP
705 if (usingSunWorkShop)
706 {
707 XRectangle rec;
708
709 shellRectangle(w, &rec);
710 workshop_frame_moved(rec.x, rec.y, rec.width, rec.height);
711 }
712 #endif
713 #if defined(FEAT_NETBEANS_INTG) && defined(FEAT_GUI_MOTIF) 703 #if defined(FEAT_NETBEANS_INTG) && defined(FEAT_GUI_MOTIF)
714 if (netbeans_active()) 704 if (netbeans_active())
715 { 705 {
716 XRectangle rec; 706 XRectangle rec;
717 707
1222 } 1212 }
1223 } 1213 }
1224 argv[*argc] = NULL; 1214 argv[*argc] = NULL;
1225 } 1215 }
1226 else 1216 else
1227 #ifdef FEAT_SUN_WORKSHOP
1228 if (strcmp("-ws", argv[arg]) == 0)
1229 {
1230 usingSunWorkShop++;
1231 p_acd = TRUE;
1232 gui.dofork = FALSE; /* don't fork() when starting GUI */
1233 mch_memmove(&argv[arg], &argv[arg + 1],
1234 (--*argc - arg) * sizeof(char *));
1235 argv[*argc] = NULL;
1236 # ifdef WSDEBUG
1237 wsdebug_wait(WT_ENV | WT_WAIT | WT_STOP, "SPRO_GVIM_WAIT", 20);
1238 wsdebug_log_init("SPRO_GVIM_DEBUG", "SPRO_GVIM_DLEVEL");
1239 # endif
1240 }
1241 else
1242 #endif
1243 #ifdef FEAT_NETBEANS_INTG 1217 #ifdef FEAT_NETBEANS_INTG
1244 if (strncmp("-nb", argv[arg], 3) == 0) 1218 if (strncmp("-nb", argv[arg], 3) == 0)
1245 { 1219 {
1246 gui.dofork = FALSE; /* don't fork() when starting GUI */ 1220 gui.dofork = FALSE; /* don't fork() when starting GUI */
1247 netbeansArg = argv[arg]; 1221 netbeansArg = argv[arg];
1540 #endif 1514 #endif
1541 } 1515 }
1542 1516
1543 if (gui.color_approx) 1517 if (gui.color_approx)
1544 emsg(_("Vim E458: Cannot allocate colormap entry, some colors may be incorrect")); 1518 emsg(_("Vim E458: Cannot allocate colormap entry, some colors may be incorrect"));
1545
1546 #ifdef FEAT_SUN_WORKSHOP
1547 if (usingSunWorkShop)
1548 workshop_connect(app_context);
1549 #endif
1550 1519
1551 #ifdef FEAT_BEVAL_GUI 1520 #ifdef FEAT_BEVAL_GUI
1552 gui_init_tooltip_font(); 1521 gui_init_tooltip_font();
1553 #endif 1522 #endif
1554 #ifdef FEAT_MENU 1523 #ifdef FEAT_MENU
1678 #ifdef FEAT_HANGULIN 1647 #ifdef FEAT_HANGULIN
1679 hangul_keyboard_set(); 1648 hangul_keyboard_set();
1680 #endif 1649 #endif
1681 #ifdef FEAT_XIM 1650 #ifdef FEAT_XIM
1682 xim_init(); 1651 xim_init();
1683 #endif
1684 #ifdef FEAT_SUN_WORKSHOP
1685 workshop_postinit();
1686 #endif 1652 #endif
1687 1653
1688 return OK; 1654 return OK;
1689 } 1655 }
1690 1656
2746 channel_timer = XtAppAddTimeOut(app_context, (long_u)20, 2712 channel_timer = XtAppAddTimeOut(app_context, (long_u)20,
2747 channel_poll_cb, (XtPointer)&channel_timer); 2713 channel_poll_cb, (XtPointer)&channel_timer);
2748 #endif 2714 #endif
2749 2715
2750 focus = gui.in_focus; 2716 focus = gui.in_focus;
2751 #ifdef ALT_X_INPUT 2717 desired = (XtIMAll);
2752 if (suppress_alternate_input)
2753 desired = (XtIMXEvent | XtIMTimer);
2754 else
2755 #endif
2756 desired = (XtIMAll);
2757 while (!timed_out) 2718 while (!timed_out)
2758 { 2719 {
2759 /* Stop or start blinking when focus changes */ 2720 /* Stop or start blinking when focus changes */
2760 if (gui.in_focus != focus) 2721 if (gui.in_focus != focus)
2761 { 2722 {