Mercurial > vim

comparison src/libvterm/src/pen.c @ 20496:747a270eb1db v8.2.0802

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0802: libvterm code lags behind the upstream version Commit: https://github.com/vim/vim/commit/d863728913801c8fa6d633f6580edfcada533fd0 Author: Bram Moolenaar <Bram@vim.org> Date: Wed May 20 18:41:41 2020 +0200 patch 8.2.0802: libvterm code lags behind the upstream version Problem: Libvterm code lags behind the upstream version. Solution: Include revisions 759 - 762.
author Bram Moolenaar <Bram@vim.org>
date Wed, 20 May 2020 18:45:04 +0200
parents 9ad473b50471
children 03826c672315
comparison
equal deleted inserted replaced
20495:0736d3dc23ba 20496:747a270eb1db
168 state->pen.bold = 0; setpenattr_bool(state, VTERM_ATTR_BOLD, 0); 168 state->pen.bold = 0; setpenattr_bool(state, VTERM_ATTR_BOLD, 0);
169 state->pen.underline = 0; setpenattr_int( state, VTERM_ATTR_UNDERLINE, 0); 169 state->pen.underline = 0; setpenattr_int( state, VTERM_ATTR_UNDERLINE, 0);
170 state->pen.italic = 0; setpenattr_bool(state, VTERM_ATTR_ITALIC, 0); 170 state->pen.italic = 0; setpenattr_bool(state, VTERM_ATTR_ITALIC, 0);
171 state->pen.blink = 0; setpenattr_bool(state, VTERM_ATTR_BLINK, 0); 171 state->pen.blink = 0; setpenattr_bool(state, VTERM_ATTR_BLINK, 0);
172 state->pen.reverse = 0; setpenattr_bool(state, VTERM_ATTR_REVERSE, 0); 172 state->pen.reverse = 0; setpenattr_bool(state, VTERM_ATTR_REVERSE, 0);
173 state->pen.conceal = 0; setpenattr_bool(state, VTERM_ATTR_CONCEAL, 0);
173 state->pen.strike = 0; setpenattr_bool(state, VTERM_ATTR_STRIKE, 0); 174 state->pen.strike = 0; setpenattr_bool(state, VTERM_ATTR_STRIKE, 0);
174 state->pen.font = 0; setpenattr_int( state, VTERM_ATTR_FONT, 0); 175 state->pen.font = 0; setpenattr_int( state, VTERM_ATTR_FONT, 0);
175 176
176 state->fg_index = -1; 177 state->fg_index = -1;
177 state->bg_index = -1; 178 state->bg_index = -1;
190 setpenattr_bool(state, VTERM_ATTR_BOLD, state->pen.bold); 191 setpenattr_bool(state, VTERM_ATTR_BOLD, state->pen.bold);
191 setpenattr_int( state, VTERM_ATTR_UNDERLINE, state->pen.underline); 192 setpenattr_int( state, VTERM_ATTR_UNDERLINE, state->pen.underline);
192 setpenattr_bool(state, VTERM_ATTR_ITALIC, state->pen.italic); 193 setpenattr_bool(state, VTERM_ATTR_ITALIC, state->pen.italic);
193 setpenattr_bool(state, VTERM_ATTR_BLINK, state->pen.blink); 194 setpenattr_bool(state, VTERM_ATTR_BLINK, state->pen.blink);
194 setpenattr_bool(state, VTERM_ATTR_REVERSE, state->pen.reverse); 195 setpenattr_bool(state, VTERM_ATTR_REVERSE, state->pen.reverse);
196 setpenattr_bool(state, VTERM_ATTR_CONCEAL, state->pen.conceal);
195 setpenattr_bool(state, VTERM_ATTR_STRIKE, state->pen.strike); 197 setpenattr_bool(state, VTERM_ATTR_STRIKE, state->pen.strike);
196 setpenattr_int( state, VTERM_ATTR_FONT, state->pen.font); 198 setpenattr_int( state, VTERM_ATTR_FONT, state->pen.font);
197 setpenattr_col( state, VTERM_ATTR_FOREGROUND, state->pen.fg); 199 setpenattr_col( state, VTERM_ATTR_FOREGROUND, state->pen.fg);
198 setpenattr_col( state, VTERM_ATTR_BACKGROUND, state->pen.bg); 200 setpenattr_col( state, VTERM_ATTR_BACKGROUND, state->pen.bg);
199 } 201 }
291 case 7: // Reverse on 293 case 7: // Reverse on
292 state->pen.reverse = 1; 294 state->pen.reverse = 1;
293 setpenattr_bool(state, VTERM_ATTR_REVERSE, 1); 295 setpenattr_bool(state, VTERM_ATTR_REVERSE, 1);
294 break; 296 break;
295 297
298 case 8: // Conceal on
299 state->pen.conceal = 1;
300 setpenattr_bool(state, VTERM_ATTR_CONCEAL, 1);
301 break;
302
296 case 9: // Strikethrough on 303 case 9: // Strikethrough on
297 state->pen.strike = 1; 304 state->pen.strike = 1;
298 setpenattr_bool(state, VTERM_ATTR_STRIKE, 1); 305 setpenattr_bool(state, VTERM_ATTR_STRIKE, 1);
299 break; 306 break;
300 307
330 break; 337 break;
331 338
332 case 27: // Reverse off 339 case 27: // Reverse off
333 state->pen.reverse = 0; 340 state->pen.reverse = 0;
334 setpenattr_bool(state, VTERM_ATTR_REVERSE, 0); 341 setpenattr_bool(state, VTERM_ATTR_REVERSE, 0);
342 break;
343
344 case 28: // Conceal off (Reveal)
345 state->pen.conceal = 0;
346 setpenattr_bool(state, VTERM_ATTR_CONCEAL, 0);
335 break; 347 break;
336 348
337 case 29: // Strikethrough off 349 case 29: // Strikethrough off
338 state->pen.strike = 0; 350 state->pen.strike = 0;
339 setpenattr_bool(state, VTERM_ATTR_STRIKE, 0); 351 setpenattr_bool(state, VTERM_ATTR_STRIKE, 0);
430 if(state->pen.blink) 442 if(state->pen.blink)
431 args[argi++] = 5; 443 args[argi++] = 5;
432 444
433 if(state->pen.reverse) 445 if(state->pen.reverse)
434 args[argi++] = 7; 446 args[argi++] = 7;
447
448 if(state->pen.conceal)
449 args[argi++] = 8;
435 450
436 if(state->pen.strike) 451 if(state->pen.strike)
437 args[argi++] = 9; 452 args[argi++] = 9;
438 453
439 if(state->pen.font) 454 if(state->pen.font)
510 525
511 case VTERM_ATTR_REVERSE: 526 case VTERM_ATTR_REVERSE:
512 val->boolean = state->pen.reverse; 527 val->boolean = state->pen.reverse;
513 return 1; 528 return 1;
514 529
530 case VTERM_ATTR_CONCEAL:
531 val->boolean = state->pen.conceal;
532 return 1;
533
515 case VTERM_ATTR_STRIKE: 534 case VTERM_ATTR_STRIKE:
516 val->boolean = state->pen.strike; 535 val->boolean = state->pen.strike;
517 return 1; 536 return 1;
518 537
519 case VTERM_ATTR_FONT: 538 case VTERM_ATTR_FONT: