Mercurial > vim

comparison src/gui.c @ 15868:7fad90423bd2 v8.1.0941

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0941: macros for MS-Windows are inconsistent commit https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 17 17:44:42 2019 +0100 patch 8.1.0941: macros for MS-Windows are inconsistent Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and others. Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the GUI build. (Hirohito Higashi, closes #3932)
author Bram Moolenaar <Bram@vim.org>
date Sun, 17 Feb 2019 17:45:08 +0100
parents ad8b2c109b22
children cd5c83115ec6
comparison
equal deleted inserted replaced
15867:4a3823e692d3 15868:7fad90423bd2
747 extern Widget textArea; 747 extern Widget textArea;
748 balloonEval = gui_mch_create_beval_area(textArea, NULL, 748 balloonEval = gui_mch_create_beval_area(textArea, NULL,
749 &general_beval_cb, NULL); 749 &general_beval_cb, NULL);
750 } 750 }
751 # else 751 # else
752 # ifdef FEAT_GUI_W32 752 # ifdef FEAT_GUI_MSWIN
753 balloonEval = gui_mch_create_beval_area(NULL, NULL, 753 balloonEval = gui_mch_create_beval_area(NULL, NULL,
754 &general_beval_cb, NULL); 754 &general_beval_cb, NULL);
755 # endif 755 # endif
756 # endif 756 # endif
757 # endif 757 # endif
2430 int comping; /* current char is composing */ 2430 int comping; /* current char is composing */
2431 int scol = col; /* screen column */ 2431 int scol = col; /* screen column */
2432 int curr_wide = FALSE; /* use 'guifontwide' */ 2432 int curr_wide = FALSE; /* use 'guifontwide' */
2433 int prev_wide = FALSE; 2433 int prev_wide = FALSE;
2434 int wide_changed; 2434 int wide_changed;
2435 # ifdef WIN3264 2435 # ifdef MSWIN
2436 int sep_comp = FALSE; /* Don't separate composing chars. */ 2436 int sep_comp = FALSE; /* Don't separate composing chars. */
2437 # else 2437 # else
2438 int sep_comp = TRUE; /* Separate composing chars. */ 2438 int sep_comp = TRUE; /* Separate composing chars. */
2439 # endif 2439 # endif
2440 2440
2566 #ifdef FEAT_SIGN_ICONS 2566 #ifdef FEAT_SIGN_ICONS
2567 if (draw_sign) 2567 if (draw_sign)
2568 /* Draw the sign on top of the spaces. */ 2568 /* Draw the sign on top of the spaces. */
2569 gui_mch_drawsign(gui.row, col, gui.highlight_mask); 2569 gui_mch_drawsign(gui.row, col, gui.highlight_mask);
2570 # if defined(FEAT_NETBEANS_INTG) && (defined(FEAT_GUI_X11) \ 2570 # if defined(FEAT_NETBEANS_INTG) && (defined(FEAT_GUI_X11) \
2571 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)) 2571 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN))
2572 if (multi_sign) 2572 if (multi_sign)
2573 netbeans_draw_multisign_indicator(gui.row); 2573 netbeans_draw_multisign_indicator(gui.row);
2574 # endif 2574 # endif
2575 #endif 2575 #endif
2576 2576
3559 need_set_size |= RESIZE_VERT; 3559 need_set_size |= RESIZE_VERT;
3560 if (using_footer) 3560 if (using_footer)
3561 fix_size = TRUE; 3561 fix_size = TRUE;
3562 } 3562 }
3563 #endif 3563 #endif
3564 #if defined(FEAT_MENU) && !(defined(WIN3264) && !defined(FEAT_TEAROFF)) 3564 #if defined(FEAT_MENU) && !(defined(MSWIN) && !defined(FEAT_TEAROFF))
3565 if (using_tearoff != prev_tearoff) 3565 if (using_tearoff != prev_tearoff)
3566 { 3566 {
3567 gui_mch_toggle_tearoffs(using_tearoff); 3567 gui_mch_toggle_tearoffs(using_tearoff);
3568 prev_tearoff = using_tearoff; 3568 prev_tearoff = using_tearoff;
3569 } 3569 }
4123 static win_T *prev_curwin = NULL; 4123 static win_T *prev_curwin = NULL;
4124 4124
4125 /* Update the horizontal scrollbar */ 4125 /* Update the horizontal scrollbar */
4126 gui_update_horiz_scrollbar(force); 4126 gui_update_horiz_scrollbar(force);
4127 4127
4128 #ifndef WIN3264 4128 #ifndef MSWIN
4129 /* Return straight away if there is neither a left nor right scrollbar. 4129 /* Return straight away if there is neither a left nor right scrollbar.
4130 * On MS-Windows this is required anyway for scrollwheel messages. */ 4130 * On MS-Windows this is required anyway for scrollwheel messages. */
4131 if (!gui.which_scrollbars[SBAR_LEFT] && !gui.which_scrollbars[SBAR_RIGHT]) 4131 if (!gui.which_scrollbars[SBAR_LEFT] && !gui.which_scrollbars[SBAR_RIGHT])
4132 return; 4132 return;
4133 #endif 4133 #endif
4877 } 4877 }
4878 } 4878 }
4879 4879
4880 /* 4880 /*
4881 * Find window where the mouse pointer "x" / "y" coordinate is in. 4881 * Find window where the mouse pointer "x" / "y" coordinate is in.
4882 * As a side effect update the shape of the mouse pointer.
4882 */ 4883 */
4883 static win_T * 4884 static win_T *
4884 xy2win(int x UNUSED, int y UNUSED) 4885 xy2win(int x, int y)
4885 { 4886 {
4886 int row; 4887 int row;
4887 int col; 4888 int col;
4888 win_T *wp; 4889 win_T *wp;
4889 4890
4949 } 4950 }
4950 if (!ends_excmd(*eap->arg)) 4951 if (!ends_excmd(*eap->arg))
4951 ex_next(eap); 4952 ex_next(eap);
4952 } 4953 }
4953 4954
4954 #if ((defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32) \ 4955 #if ((defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) \
4955 || defined(FEAT_GUI_PHOTON)) && defined(FEAT_TOOLBAR)) || defined(PROTO) 4956 || defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_PHOTON)) \
4957 && defined(FEAT_TOOLBAR)) || defined(PROTO)
4956 /* 4958 /*
4957 * This is shared between Athena, Motif and GTK. 4959 * This is shared between Athena, Motif and GTK.
4958 */ 4960 */
4959 4961
4960 /* 4962 /*