Mercurial > vim

comparison src/gui.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 55ccc2d353bd
children 3ef31ce9d9f9
comparison
equal deleted inserted replaced
15509:2650d9461407 15510:41fbbcea0f1b
669 } 669 }
670 gui_create_scrollbar(&gui.bottom_sbar, SBAR_BOTTOM, NULL); 670 gui_create_scrollbar(&gui.bottom_sbar, SBAR_BOTTOM, NULL);
671 671
672 #ifdef FEAT_MENU 672 #ifdef FEAT_MENU
673 gui_create_initial_menus(root_menu); 673 gui_create_initial_menus(root_menu);
674 #endif
675 #ifdef FEAT_SUN_WORKSHOP
676 if (usingSunWorkShop)
677 workshop_init();
678 #endif 674 #endif
679 #ifdef FEAT_SIGN_ICONS 675 #ifdef FEAT_SIGN_ICONS
680 sign_gui_started(); 676 sign_gui_started();
681 #endif 677 #endif
682 678
1602 base_height = gui_get_base_height(); 1598 base_height = gui_get_base_height();
1603 if (fit_to_display) 1599 if (fit_to_display)
1604 /* Remember the original window position. */ 1600 /* Remember the original window position. */
1605 (void)gui_mch_get_winpos(&x, &y); 1601 (void)gui_mch_get_winpos(&x, &y);
1606 1602
1607 #ifdef USE_SUN_WORKSHOP 1603 width = Columns * gui.char_width + base_width;
1608 if (!mustset && usingSunWorkShop 1604 height = Rows * gui.char_height + base_height;
1609 && workshop_get_width_height(&width, &height))
1610 {
1611 Columns = (width - base_width + gui.char_width - 1) / gui.char_width;
1612 Rows = (height - base_height + gui.char_height - 1) / gui.char_height;
1613 }
1614 else
1615 #endif
1616 {
1617 width = Columns * gui.char_width + base_width;
1618 height = Rows * gui.char_height + base_height;
1619 }
1620 1605
1621 if (fit_to_display) 1606 if (fit_to_display)
1622 { 1607 {
1623 gui_mch_get_screen_dimensions(&screen_w, &screen_h); 1608 gui_mch_get_screen_dimensions(&screen_w, &screen_h);
1624 if ((direction & RESIZE_HOR) && width > screen_w) 1609 if ((direction & RESIZE_HOR) && width > screen_w)
5126 # endif 5111 # endif
5127 ); 5112 );
5128 } 5113 }
5129 #endif 5114 #endif
5130 5115
5131 #if defined(FIND_REPLACE_DIALOG) || defined(FEAT_SUN_WORKSHOP) \ 5116 #if defined(FIND_REPLACE_DIALOG) \
5132 || defined(NEED_GUI_UPDATE_SCREEN) \ 5117 || defined(NEED_GUI_UPDATE_SCREEN) \
5133 || defined(PROTO) 5118 || defined(PROTO)
5134 /* 5119 /*
5135 * Update the current window and the screen. 5120 * Update the current window and the screen.
5136 */ 5121 */