Mercurial > vim

comparison src/libvterm/src/pen.c @ 30894:bf4f25d50fdd v9.0.0781

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0781: workaround to rename "small" to "smallfont" is clumsy Commit: https://github.com/vim/vim/commit/e6a16e9950111adfcfdb85261b3d5a8c13f1d533 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Oct 17 14:51:36 2022 +0100 patch 9.0.0781: workaround to rename "small" to "smallfont" is clumsy Problem: Workaround to rename "small" to "smallfont" is clumsy. Solution: Undefine "small" after including windows.h. (Ken Takata)
author Bram Moolenaar <Bram@vim.org>
date Mon, 17 Oct 2022 16:00:04 +0200
parents ac9464a32606
children b13f723a7ec6
comparison
equal deleted inserted replaced
30893:5795425ca42f 30894:bf4f25d50fdd
179 state->pen.blink = 0; setpenattr_bool(state, VTERM_ATTR_BLINK, 0); 179 state->pen.blink = 0; setpenattr_bool(state, VTERM_ATTR_BLINK, 0);
180 state->pen.reverse = 0; setpenattr_bool(state, VTERM_ATTR_REVERSE, 0); 180 state->pen.reverse = 0; setpenattr_bool(state, VTERM_ATTR_REVERSE, 0);
181 state->pen.conceal = 0; setpenattr_bool(state, VTERM_ATTR_CONCEAL, 0); 181 state->pen.conceal = 0; setpenattr_bool(state, VTERM_ATTR_CONCEAL, 0);
182 state->pen.strike = 0; setpenattr_bool(state, VTERM_ATTR_STRIKE, 0); 182 state->pen.strike = 0; setpenattr_bool(state, VTERM_ATTR_STRIKE, 0);
183 state->pen.font = 0; setpenattr_int (state, VTERM_ATTR_FONT, 0); 183 state->pen.font = 0; setpenattr_int (state, VTERM_ATTR_FONT, 0);
184 state->pen.smallfont = 0; setpenattr_bool(state, VTERM_ATTR_SMALL, 0); 184 state->pen.small = 0; setpenattr_bool(state, VTERM_ATTR_SMALL, 0);
185 state->pen.baseline = 0; setpenattr_int (state, VTERM_ATTR_BASELINE, 0); 185 state->pen.baseline = 0; setpenattr_int (state, VTERM_ATTR_BASELINE, 0);
186 186
187 state->pen.fg = state->default_fg; setpenattr_col(state, VTERM_ATTR_FOREGROUND, state->default_fg); 187 state->pen.fg = state->default_fg; setpenattr_col(state, VTERM_ATTR_FOREGROUND, state->default_fg);
188 state->pen.bg = state->default_bg; setpenattr_col(state, VTERM_ATTR_BACKGROUND, state->default_bg); 188 state->pen.bg = state->default_bg; setpenattr_col(state, VTERM_ATTR_BACKGROUND, state->default_bg);
189 } 189 }
202 setpenattr_bool(state, VTERM_ATTR_BLINK, state->pen.blink); 202 setpenattr_bool(state, VTERM_ATTR_BLINK, state->pen.blink);
203 setpenattr_bool(state, VTERM_ATTR_REVERSE, state->pen.reverse); 203 setpenattr_bool(state, VTERM_ATTR_REVERSE, state->pen.reverse);
204 setpenattr_bool(state, VTERM_ATTR_CONCEAL, state->pen.conceal); 204 setpenattr_bool(state, VTERM_ATTR_CONCEAL, state->pen.conceal);
205 setpenattr_bool(state, VTERM_ATTR_STRIKE, state->pen.strike); 205 setpenattr_bool(state, VTERM_ATTR_STRIKE, state->pen.strike);
206 setpenattr_int (state, VTERM_ATTR_FONT, state->pen.font); 206 setpenattr_int (state, VTERM_ATTR_FONT, state->pen.font);
207 setpenattr_bool(state, VTERM_ATTR_SMALL, state->pen.smallfont); 207 setpenattr_bool(state, VTERM_ATTR_SMALL, state->pen.small);
208 setpenattr_int (state, VTERM_ATTR_BASELINE, state->pen.baseline); 208 setpenattr_int (state, VTERM_ATTR_BASELINE, state->pen.baseline);
209 209
210 setpenattr_col( state, VTERM_ATTR_FOREGROUND, state->pen.fg); 210 setpenattr_col( state, VTERM_ATTR_FOREGROUND, state->pen.fg);
211 setpenattr_col( state, VTERM_ATTR_BACKGROUND, state->pen.bg); 211 setpenattr_col( state, VTERM_ATTR_BACKGROUND, state->pen.bg);
212 } 212 }
452 break; 452 break;
453 453
454 case 73: // Superscript 454 case 73: // Superscript
455 case 74: // Subscript 455 case 74: // Subscript
456 case 75: // Superscript/subscript off 456 case 75: // Superscript/subscript off
457 state->pen.smallfont = (arg != 75); 457 state->pen.small = (arg != 75);
458 state->pen.baseline = 458 state->pen.baseline =
459 (arg == 73) ? VTERM_BASELINE_RAISE : 459 (arg == 73) ? VTERM_BASELINE_RAISE :
460 (arg == 74) ? VTERM_BASELINE_LOWER : 460 (arg == 74) ? VTERM_BASELINE_LOWER :
461 VTERM_BASELINE_NORMAL; 461 VTERM_BASELINE_NORMAL;
462 setpenattr_bool(state, VTERM_ATTR_SMALL, state->pen.smallfont); 462 setpenattr_bool(state, VTERM_ATTR_SMALL, state->pen.small);
463 setpenattr_int (state, VTERM_ATTR_BASELINE, state->pen.baseline); 463 setpenattr_int (state, VTERM_ATTR_BASELINE, state->pen.baseline);
464 break; 464 break;
465 465
466 case 90: case 91: case 92: case 93: 466 case 90: case 91: case 92: case 93:
467 case 94: case 95: case 96: case 97: // Foreground colour high-intensity palette 467 case 94: case 95: case 96: case 97: // Foreground colour high-intensity palette
558 558
559 argi = vterm_state_getpen_color(&state->pen.fg, argi, args, TRUE); 559 argi = vterm_state_getpen_color(&state->pen.fg, argi, args, TRUE);
560 560
561 argi = vterm_state_getpen_color(&state->pen.bg, argi, args, FALSE); 561 argi = vterm_state_getpen_color(&state->pen.bg, argi, args, FALSE);
562 562
563 if(state->pen.smallfont) { 563 if(state->pen.small) {
564 if(state->pen.baseline == VTERM_BASELINE_RAISE) 564 if(state->pen.baseline == VTERM_BASELINE_RAISE)
565 args[argi++] = 73; 565 args[argi++] = 73;
566 else if(state->pen.baseline == VTERM_BASELINE_LOWER) 566 else if(state->pen.baseline == VTERM_BASELINE_LOWER)
567 args[argi++] = 74; 567 args[argi++] = 74;
568 } 568 }
612 case VTERM_ATTR_BACKGROUND: 612 case VTERM_ATTR_BACKGROUND:
613 val->color = state->pen.bg; 613 val->color = state->pen.bg;
614 return 1; 614 return 1;
615 615
616 case VTERM_ATTR_SMALL: 616 case VTERM_ATTR_SMALL:
617 val->boolean = state->pen.smallfont; 617 val->boolean = state->pen.small;
618 return 1; 618 return 1;
619 619
620 case VTERM_ATTR_BASELINE: 620 case VTERM_ATTR_BASELINE:
621 val->number = state->pen.baseline; 621 val->number = state->pen.baseline;
622 return 1; 622 return 1;