Mercurial > vim

comparison src/gui.c @ 8140:563c923b1584 v7.4.1364

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/cf7164a088664961e7d70dd100c5874dc5ceb293 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Feb 20 13:55:06 2016 +0100 patch 7.4.1364 Problem: The Win 16 code is not maintained and unused. Solution: Remove the Win 16 support.
author Christian Brabandt <cb@256bit.org>
date Sat, 20 Feb 2016 14:00:06 +0100
parents 81794242a275
children caed4b2d305f
comparison
equal deleted inserted replaced
8139:2b0d471e04f7 8140:563c923b1584
2182 long_u highlight_mask; 2182 long_u highlight_mask;
2183 long_u hl_mask_todo; 2183 long_u hl_mask_todo;
2184 guicolor_T fg_color; 2184 guicolor_T fg_color;
2185 guicolor_T bg_color; 2185 guicolor_T bg_color;
2186 guicolor_T sp_color; 2186 guicolor_T sp_color;
2187 #if !defined(MSWIN16_FASTTEXT) && !defined(FEAT_GUI_GTK) 2187 #if !defined(FEAT_GUI_GTK)
2188 GuiFont font = NOFONT; 2188 GuiFont font = NOFONT;
2189 # ifdef FEAT_MBYTE 2189 # ifdef FEAT_MBYTE
2190 GuiFont wide_font = NOFONT; 2190 GuiFont wide_font = NOFONT;
2191 # endif 2191 # endif
2192 # ifdef FEAT_XFONTSET 2192 # ifdef FEAT_XFONTSET
2239 } 2239 }
2240 else 2240 else
2241 highlight_mask = gui.highlight_mask; 2241 highlight_mask = gui.highlight_mask;
2242 hl_mask_todo = highlight_mask; 2242 hl_mask_todo = highlight_mask;
2243 2243
2244 #if !defined(MSWIN16_FASTTEXT) && !defined(FEAT_GUI_GTK) 2244 #if !defined(FEAT_GUI_GTK)
2245 /* Set the font */ 2245 /* Set the font */
2246 if (aep != NULL && aep->ae_u.gui.font != NOFONT) 2246 if (aep != NULL && aep->ae_u.gui.font != NOFONT)
2247 font = aep->ae_u.gui.font; 2247 font = aep->ae_u.gui.font;
2248 # ifdef FEAT_XFONTSET 2248 # ifdef FEAT_XFONTSET
2249 else if (aep != NULL && aep->ae_u.gui.fontset != NOFONTSET) 2249 else if (aep != NULL && aep->ae_u.gui.fontset != NOFONTSET)
2356 /* Clear the selection if we are about to write over it */ 2356 /* Clear the selection if we are about to write over it */
2357 if (!(flags & GUI_MON_NOCLEAR)) 2357 if (!(flags & GUI_MON_NOCLEAR))
2358 clip_may_clear_selection(gui.row, gui.row); 2358 clip_may_clear_selection(gui.row, gui.row);
2359 2359
2360 2360
2361 #ifndef MSWIN16_FASTTEXT
2362 /* If there's no bold font, then fake it */ 2361 /* If there's no bold font, then fake it */
2363 if (hl_mask_todo & (HL_BOLD | HL_STANDOUT)) 2362 if (hl_mask_todo & (HL_BOLD | HL_STANDOUT))
2364 draw_flags |= DRAW_BOLD; 2363 draw_flags |= DRAW_BOLD;
2365 #endif
2366 2364
2367 /* 2365 /*
2368 * When drawing bold or italic characters the spill-over from the left 2366 * When drawing bold or italic characters the spill-over from the left
2369 * neighbor may be destroyed. Let the caller backup to start redrawing 2367 * neighbor may be destroyed. Let the caller backup to start redrawing
2370 * just after a blank. 2368 * just after a blank.
2381 /* Do we underline the text? */ 2379 /* Do we underline the text? */
2382 if (hl_mask_todo & HL_UNDERLINE) 2380 if (hl_mask_todo & HL_UNDERLINE)
2383 draw_flags |= DRAW_UNDERL; 2381 draw_flags |= DRAW_UNDERL;
2384 #else 2382 #else
2385 /* Do we underline the text? */ 2383 /* Do we underline the text? */
2386 if ((hl_mask_todo & HL_UNDERLINE) 2384 if ((hl_mask_todo & HL_UNDERLINE) || (hl_mask_todo & HL_ITALIC))
2387 # ifndef MSWIN16_FASTTEXT
2388 || (hl_mask_todo & HL_ITALIC)
2389 # endif
2390 )
2391 draw_flags |= DRAW_UNDERL; 2385 draw_flags |= DRAW_UNDERL;
2392 #endif 2386 #endif
2393 /* Do we undercurl the text? */ 2387 /* Do we undercurl the text? */
2394 if (hl_mask_todo & HL_UNDERCURL) 2388 if (hl_mask_todo & HL_UNDERCURL)
2395 draw_flags |= DRAW_UNDERC; 2389 draw_flags |= DRAW_UNDERC;
3336 #endif 3330 #endif
3337 #ifdef FEAT_FOOTER 3331 #ifdef FEAT_FOOTER
3338 static int prev_footer = -1; 3332 static int prev_footer = -1;
3339 int using_footer = FALSE; 3333 int using_footer = FALSE;
3340 #endif 3334 #endif
3341 #if defined(FEAT_MENU) && !defined(WIN16) 3335 #if defined(FEAT_MENU)
3342 static int prev_tearoff = -1; 3336 static int prev_tearoff = -1;
3343 int using_tearoff = FALSE; 3337 int using_tearoff = FALSE;
3344 #endif 3338 #endif
3345 3339
3346 char_u *p; 3340 char_u *p;
3413 case GO_FOOTER: 3407 case GO_FOOTER:
3414 using_footer = TRUE; 3408 using_footer = TRUE;
3415 break; 3409 break;
3416 #endif 3410 #endif
3417 case GO_TEAROFF: 3411 case GO_TEAROFF:
3418 #if defined(FEAT_MENU) && !defined(WIN16) 3412 #if defined(FEAT_MENU)
3419 using_tearoff = TRUE; 3413 using_tearoff = TRUE;
3420 #endif 3414 #endif
3421 break; 3415 break;
3422 default: 3416 default:
3423 /* Ignore options that are not supported */ 3417 /* Ignore options that are not supported */
3520 need_set_size |= RESIZE_VERT; 3514 need_set_size |= RESIZE_VERT;
3521 if (using_footer) 3515 if (using_footer)
3522 fix_size = TRUE; 3516 fix_size = TRUE;
3523 } 3517 }
3524 #endif 3518 #endif
3525 #if defined(FEAT_MENU) && !defined(WIN16) && !(defined(WIN3264) && !defined(FEAT_TEAROFF)) 3519 #if defined(FEAT_MENU) && !(defined(WIN3264) && !defined(FEAT_TEAROFF))
3526 if (using_tearoff != prev_tearoff) 3520 if (using_tearoff != prev_tearoff)
3527 { 3521 {
3528 gui_mch_toggle_tearoffs(using_tearoff); 3522 gui_mch_toggle_tearoffs(using_tearoff);
3529 prev_tearoff = using_tearoff; 3523 prev_tearoff = using_tearoff;
3530 } 3524 }