Mercurial > vim

comparison src/gui.c @ 12716:351cf7c67bbe v8.0.1236

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1236: Mac features are confusing commit https://github.com/vim/vim/commit/d057301b1f28736f094affa17b190244ad56e8d9 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 28 21:11:06 2017 +0200 patch 8.0.1236: Mac features are confusing Problem: Mac features are confusing. Solution: Make feature names more consistent, add "osxdarwin". Rename feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
author Christian Brabandt <cb@256bit.org>
date Sat, 28 Oct 2017 21:15:35 +0200
parents 25f7d8ee04c7
children 29a728529f92
comparison
equal deleted inserted replaced
12715:279ec0abb4ac 12716:351cf7c67bbe
35 static void gui_update_horiz_scrollbar(int); 35 static void gui_update_horiz_scrollbar(int);
36 static void gui_set_fg_color(char_u *name); 36 static void gui_set_fg_color(char_u *name);
37 static void gui_set_bg_color(char_u *name); 37 static void gui_set_bg_color(char_u *name);
38 static win_T *xy2win(int x, int y); 38 static win_T *xy2win(int x, int y);
39 39
40 #if defined(UNIX) && !defined(MACOS_X) && !defined(__APPLE__) 40 #if defined(UNIX) && !defined(FEAT_GUI_MAC)
41 # define MAY_FORK 41 # define MAY_FORK
42 static void gui_do_fork(void); 42 static void gui_do_fork(void);
43 43
44 static int gui_read_child_pipe(int fd); 44 static int gui_read_child_pipe(int fd);
45 45
2518 # endif 2518 # endif
2519 } 2519 }
2520 /* Draw a composing char on top of the previous char. */ 2520 /* Draw a composing char on top of the previous char. */
2521 if (comping && sep_comp) 2521 if (comping && sep_comp)
2522 { 2522 {
2523 # if (defined(__APPLE_CC__) || defined(__MRC__)) && TARGET_API_MAC_CARBON 2523 # if defined(__APPLE_CC__) && TARGET_API_MAC_CARBON
2524 /* Carbon ATSUI autodraws composing char over previous char */ 2524 /* Carbon ATSUI autodraws composing char over previous char */
2525 gui_mch_draw_string(gui.row, scol, s + i, cl, 2525 gui_mch_draw_string(gui.row, scol, s + i, cl,
2526 draw_flags | DRAW_TRANSP); 2526 draw_flags | DRAW_TRANSP);
2527 # else 2527 # else
2528 gui_mch_draw_string(gui.row, scol - cn, s + i, cl, 2528 gui_mch_draw_string(gui.row, scol - cn, s + i, cl,