Diff

Differences From Artifact [439db8a8d6]:

To Artifact [ce1336794e]:


1538
1539
1540
1541
1542
1543
1544
1545

1546

1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
{
    struct draw_ctx *dctx = (struct draw_ctx *)ctx;
    struct gui_data *inst = dctx->inst;
    GdkGC *gc = dctx->gc;

    int nfg, nbg, t, fontid, shadow, rlen, widefactor;

    nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);

    nbg = 2 * ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);

    if (attr & ATTR_REVERSE) {
	t = nfg;
	nfg = nbg;
	nbg = t;
    }
    if (inst->cfg.bold_colour && (attr & ATTR_BOLD))
	nfg++;
    if (inst->cfg.bold_colour && (attr & ATTR_BLINK))
	nbg++;
    if (attr & TATTR_ACTCURS) {
	nfg = NCOLOURS-2;
	nbg = NCOLOURS-1;
    }

    fontid = shadow = 0;








|
>
|
>






|

|







1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
{
    struct draw_ctx *dctx = (struct draw_ctx *)ctx;
    struct gui_data *inst = dctx->inst;
    GdkGC *gc = dctx->gc;

    int nfg, nbg, t, fontid, shadow, rlen, widefactor;

    nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
    nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0);
    nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
    nbg = 2 * (nbg & 0xF) + (nbg & 0x10 ? 1 : 0);
    if (attr & ATTR_REVERSE) {
	t = nfg;
	nfg = nbg;
	nbg = t;
    }
    if (inst->cfg.bold_colour && (attr & ATTR_BOLD))
	nfg |= 1;
    if (inst->cfg.bold_colour && (attr & ATTR_BLINK))
	nbg |= 1;
    if (attr & TATTR_ACTCURS) {
	nfg = NCOLOURS-2;
	nbg = NCOLOURS-1;
    }

    fontid = shadow = 0;