luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use text layer (color) attribute for text objects also in no-CAIRO builds

This commit is contained in:
Stefan Schippers 2020-08-29 11:58:50 +02:00
parent d879967fa8
commit f26a0c737e
5 changed files with 51 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/actions.c
View File

@ -2239,10 +2239,9 @@ void place_text(int draw_text, double mx, double my)
if(strlayer[0]) textelement[lasttext].layer = atoi(strlayer);
else textelement[lasttext].layer = -1;
my_strdup(21, &textelement[lasttext].font, get_tok_value(textelement[lasttext].prop_ptr, "font", 0));/* 20171206 */
textlayer = TEXTLAYER;
#ifdef HAS_CAIRO
textlayer = textelement[lasttext].layer;
if(textlayer < 0 || textlayer >= cadlayers) textlayer = TEXTLAYER;
#ifdef HAS_CAIRO
textfont = textelement[lasttext].font;
if(textfont && textfont[0]) {
cairo_save(ctx);

28
src/draw.c
View File

@ -543,12 +543,10 @@ void draw_symbol(int what,int c, int n,int layer,int tmp_flip, int rot,
ROTATION(0.0,0.0,text.x0,text.y0,x1,y1);
textlayer = c;
#ifdef HAS_CAIRO
if( !(c == PINLAYER && (inst_ptr[n].flags & 4))) {
textlayer = symptr->txtptr[j].layer;
if(textlayer < 0 || textlayer >= cadlayers) textlayer = c;
}
#endif
if((c == PINLAYER && inst_ptr[n].flags & 4) || enable_layer[textlayer]) {
#ifdef HAS_CAIRO
textfont = symptr->txtptr[j].font;
@ -563,6 +561,10 @@ void draw_symbol(int what,int c, int n,int layer,int tmp_flip, int rot,
(text.rot + ( (flip && (text.rot & 1) ) ? rot+2 : rot) ) & 0x3,
flip^text.flip, text.hcenter, text.vcenter,
x0+x1, y0+y1, text.xscale, text.yscale);
#ifndef HAS_CAIRO
drawrect(textlayer, END, 0.0, 0.0, 0.0, 0.0);
drawline(textlayer, END, 0.0, 0.0, 0.0, 0.0);
#endif
#ifdef HAS_CAIRO
if(textfont && textfont[0]) {
cairo_restore(ctx);
@ -1618,17 +1620,12 @@ void draw(void)
drawline(WIRELAYER, END, 0.0, 0.0, 0.0, 0.0);
}
if(draw_single_layer ==-1 || draw_single_layer==TEXTLAYER) { /* 20151117 */
#ifndef HAS_CAIRO
drawline(TEXTLAYER,BEGIN, 0.0, 0.0, 0.0, 0.0);
drawrect(TEXTLAYER,BEGIN, 0.0, 0.0, 0.0, 0.0);
#endif
for(i=0;i<lasttext;i++)
{
textlayer = TEXTLAYER;
dbg(1, "draw(): drawing string %d = %s\n",i, textelement[i].txt_ptr);
#ifdef HAS_CAIRO
textlayer = textelement[i].layer; /*20171206 */
if(textlayer < 0 || textlayer >= cadlayers) textlayer = TEXTLAYER;
dbg(1, "draw(): drawing string %d = %s\n",i, textelement[i].txt_ptr);
#ifdef HAS_CAIRO
textfont = textelement[i].font; /* 20171206 */
if(textfont && textfont[0]) {
cairo_save(ctx);
@ -1637,6 +1634,11 @@ void draw(void)
cairo_select_font_face (save_ctx, textfont, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
}
#endif
#ifndef HAS_CAIRO
drawline(textlayer,BEGIN, 0.0, 0.0, 0.0, 0.0);
drawrect(textlayer,BEGIN, 0.0, 0.0, 0.0, 0.0);
#endif
draw_string(textlayer, ADD, textelement[i].txt_ptr,
textelement[i].rot, textelement[i].flip, textelement[i].hcenter, textelement[i].vcenter,
textelement[i].x0,textelement[i].y0,
@ -1647,11 +1649,11 @@ void draw(void)
cairo_restore(save_ctx);
}
#endif
#ifndef HAS_CAIRO
drawrect(textlayer, END, 0.0, 0.0, 0.0, 0.0);
drawline(textlayer, END, 0.0, 0.0, 0.0, 0.0);
#endif
}
#ifndef HAS_CAIRO
drawrect(TEXTLAYER, END, 0.0, 0.0, 0.0, 0.0);
drawline(TEXTLAYER, END, 0.0, 0.0, 0.0, 0.0);
#endif
}
} /* !only_probes, 20110112 */
draw_hilight_net(draw_window);

16
src/move.c
View File

@ -743,10 +743,10 @@ void copy_objects(int what)
textelement[lasttext].xscale=textelement[n].xscale;
textelement[lasttext].yscale=textelement[n].yscale;
textlayer = TEXTLAYER;
#ifdef HAS_CAIRO
textlayer = textelement[lasttext].layer; /* 20171206 */
if(textlayer < 0 || textlayer >= cadlayers) textlayer = TEXTLAYER;
#ifdef HAS_CAIRO
textfont = textelement[lasttext].font; /* 20171206 */
if(textfont && textfont[0]) {
cairo_save(ctx);
@ -759,6 +759,10 @@ void copy_objects(int what)
textelement[lasttext].rot, textelement[lasttext].flip, textelement[lasttext].hcenter, textelement[lasttext].vcenter,
rx1+deltax,ry1+deltay,
textelement[lasttext].xscale, textelement[lasttext].yscale);
#ifndef HAS_CAIRO
drawrect(textlayer, END, 0.0, 0.0, 0.0, 0.0);
drawline(textlayer, END, 0.0, 0.0, 0.0, 0.0);
#endif
#ifdef HAS_CAIRO
if(textfont && textfont[0]) {
/* cairo_select_font_face (ctx, cairo_font_name, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); */
@ -1208,11 +1212,9 @@ void move_objects(int what, int merge, double dx, double dy)
( (flip && (textelement[n].rot & 1) ) ? rot+2 : rot) ) & 0x3;
textelement[n].flip=flip^textelement[n].flip;
/* 20171112 */
textlayer = TEXTLAYER;
#ifdef HAS_CAIRO
textlayer = textelement[n].layer; /* 20171206 */
if(textlayer < 0 || textlayer >= cadlayers) textlayer = TEXTLAYER;
#ifdef HAS_CAIRO
textfont = textelement[n].font; /* 20171206 */
if(textfont && textfont[0]) {
cairo_save(ctx);
@ -1225,6 +1227,10 @@ void move_objects(int what, int merge, double dx, double dy)
textelement[n].rot, textelement[n].flip, textelement[n].hcenter, textelement[n].vcenter,
textelement[n].x0, textelement[n].y0,
textelement[n].xscale, textelement[n].yscale);
#ifndef HAS_CAIRO
drawrect(textlayer, END, 0.0, 0.0, 0.0, 0.0);
drawline(textlayer, END, 0.0, 0.0, 0.0, 0.0);
#endif
#ifdef HAS_CAIRO
if(textfont && textfont[0]) {
/*cairo_select_font_face (ctx, cairo_font_name, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); */

17
src/psprint.c
View File

@ -184,6 +184,7 @@ static void ps_draw_string(int gctext, char *str,
yscale*=nocairo_font_yscale;
if(!textclip(areax1,areay1,areax2,areay2,rx1,ry1,rx2,ry2)) return;
set_ps_colors(gctext);
x1=rx1;y1=ry1;
if(rot&1) {y1=ry2;rot=3;}
else rot=0;
@ -251,7 +252,7 @@ static void ps_draw_symbol(int n,int layer,int tmp_flip, int rot,
{ /* a "for(i=0;i<cadlayers;i++)" loop */
int j;
double x0,y0,x1,y1,x2,y2;
int flip;
int flip, textlayer;
Line line;
Box box;
Text text;
@ -345,7 +346,12 @@ static void ps_draw_symbol(int n,int layer,int tmp_flip, int rot,
text.txt_ptr=
translate(n, text.txt_ptr);
ROTATION(0.0,0.0,text.x0,text.y0,x1,y1);
ps_draw_string(layer, text.txt_ptr,
textlayer = layer;
if( !(layer == PINLAYER && (inst_ptr[n].flags & 4))) {
textlayer = (inst_ptr[n].ptr+instdef)->txtptr[j].layer;
if(textlayer < 0 || textlayer >= cadlayers) textlayer = layer;
}
ps_draw_string(textlayer, text.txt_ptr,
(text.rot + ( (flip && (text.rot & 1) ) ? rot+2 : rot) ) & 0x3,
flip^text.flip, text.hcenter, text.vcenter,
x0+x1, y0+y1, text.xscale, text.yscale);
@ -379,7 +385,7 @@ static void fill_ps_colors()
void ps_draw(void)
{
double dx, dy, delta,scale;
int c,i;
int c,i, textlayer;
char *tmp=NULL; /* 20161121 */
int old_grid;
int modified_save;
@ -468,10 +474,11 @@ void ps_draw(void)
restore_lw();
ps_drawgrid();
set_ps_colors(TEXTLAYER);
for(i=0;i<lasttext;i++)
{
ps_draw_string(TEXTLAYER, textelement[i].txt_ptr,
textlayer = textelement[i].layer; /*20171206 */
if(textlayer < 0 || textlayer >= cadlayers) textlayer = TEXTLAYER;
ps_draw_string(textlayer, textelement[i].txt_ptr,
textelement[i].rot, textelement[i].flip, textelement[i].hcenter, textelement[i].vcenter,
textelement[i].x0,textelement[i].y0,
textelement[i].xscale, textelement[i].yscale);

15
src/svgdraw.c
View File

@ -278,7 +278,7 @@ static void svg_draw_symbol(int n,int layer,int tmp_flip, int rot,
{ /* a "for(i=0;i<cadlayers;i++)" loop */
int j;
double x0,y0,x1,y1,x2,y2;
int flip;
int flip, textlayer;
Line line;
Box box;
Text text;
@ -372,6 +372,12 @@ static void svg_draw_symbol(int n,int layer,int tmp_flip, int rot,
text.txt_ptr=
translate(n, text.txt_ptr);
ROTATION(0.0,0.0,text.x0,text.y0,x1,y1);
textlayer = layer;
if( !(layer == PINLAYER && (inst_ptr[n].flags & 4))) {
textlayer = (inst_ptr[n].ptr+instdef)->txtptr[j].layer;
if(textlayer < 0 || textlayer >= cadlayers) textlayer = layer;
}
svg_draw_string(layer, text.txt_ptr,
(text.rot + ( (flip && (text.rot & 1) ) ? rot+2 : rot) ) & 0x3,
flip^text.flip, text.hcenter, text.vcenter,
@ -408,7 +414,7 @@ static void fill_svg_colors()
void svg_draw(void)
{
double dx, dy;
int c,i;
int c,i, textlayer;
int filledrect;
int old_grid;
int modified_save; /* 20161121 */
@ -488,7 +494,10 @@ void svg_draw(void)
set_svg_colors(TEXTLAYER);
for(i=0;i<lasttext;i++)
{
svg_draw_string(TEXTLAYER, textelement[i].txt_ptr,
textlayer = textelement[i].layer; /*20171206 */
if(textlayer < 0 || textlayer >= cadlayers) textlayer = TEXTLAYER;
svg_draw_string(textlayer, textelement[i].txt_ptr,
textelement[i].rot, textelement[i].flip, textelement[i].hcenter, textelement[i].vcenter,
textelement[i].x0,textelement[i].y0,
textelement[i].xscale, textelement[i].yscale);