1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
|
From a97feef5fdcf0ecdf1cfa55f927eea01a6b93c1f Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Mon, 27 Jan 2014 07:47:12 +0000
Subject: Rename SX and SY to KALISX and KALISY
Xosdefs.h has evil namespace pollution and thinks SX indicates some strange
Unix from the dawn of time.
Bug-Debian: http://bugs.debian.org/238629
Forwarded: no
Last-Update: 2010-05-26
Patch-Name: namespace-pollution.patch
---
kali.c | 18 +++++++++---------
main.h | 4 ++--
psio.c | 2 +-
symmetry.c | 12 ++++++------
xio.c | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/kali.c b/kali.c
index 062dd00..4f84a8b 100644
--- a/kali.c
+++ b/kali.c
@@ -187,10 +187,10 @@ void handleLeftmouse(int how, int x, int y)
if(how > 0 && (mode == KALIPICK || mode == KALIMOVE)) {
/* On initial click, swap endpoints to find closest */
if(distance(tmppoint.x, tmppoint.y, Lines->m[EX], Lines->m[EY]) >
- distance(tmppoint.x, tmppoint.y, Lines->m[SX], Lines->m[SY])) {
+ distance(tmppoint.x, tmppoint.y, Lines->m[KALISX], Lines->m[KALISY])) {
float t;
- t = Lines->m[EX]; Lines->m[EX] = Lines->m[SX]; Lines->m[SX] = t;
- t = Lines->m[EY]; Lines->m[EY] = Lines->m[SY]; Lines->m[SY] = t;
+ t = Lines->m[EX]; Lines->m[EX] = Lines->m[KALISX]; Lines->m[KALISX] = t;
+ t = Lines->m[EY]; Lines->m[EY] = Lines->m[KALISY]; Lines->m[KALISY] = t;
}
}
Lines->m[EX]=tmppoint.x;
@@ -233,8 +233,8 @@ void handleLeftmouse(int how, int x, int y)
tmppoint.y -= refpoint.y;
/* Convert to standard basis */
VectorMatrixMult(&tmppoint,xforms[4],&tmppoint);
- Lines->m[EX]=Lines->m[SX]=tmppoint.x;
- Lines->m[EY]=Lines->m[SY]=tmppoint.y;
+ Lines->m[EX]=Lines->m[KALISX]=tmppoint.x;
+ Lines->m[EY]=Lines->m[KALISY]=tmppoint.y;
scheduleRedraw();
}
}
@@ -802,10 +802,10 @@ static void PickLine(DRAWER *drawer, LINE *lp)
{
float midx, midy, dx, dy, linex, liney;
float l2, dot, r2;
- midx = .5*(lp->m[SX] + lp->m[EX]) - pick0.x;
- midy = .5*(lp->m[SY] + lp->m[EY]) - pick0.y;
- dx = .5*(lp->m[SX] - lp->m[EX]);
- dy = .5*(lp->m[SY] - lp->m[EY]);
+ midx = .5*(lp->m[KALISX] + lp->m[EX]) - pick0.x;
+ midy = .5*(lp->m[KALISY] + lp->m[EY]) - pick0.y;
+ dx = .5*(lp->m[KALISX] - lp->m[EX]);
+ dy = .5*(lp->m[KALISY] - lp->m[EY]);
l2 = dx*dx + dy*dy;
if(l2 < best.r2 + midx*midx + midy*midy)
diff --git a/main.h b/main.h
index 0ba4427..5c80531 100644
--- a/main.h
+++ b/main.h
@@ -70,8 +70,8 @@
#define SPINSIDLE 22
#define STEP 23
-#define SX 0
-#define SY 1
+#define KALISX 0
+#define KALISY 1
#define EX 2
#define EY 3
#define GLIDE 1
diff --git a/psio.c b/psio.c
index 2eaa647..c5f853a 100644
--- a/psio.c
+++ b/psio.c
@@ -87,7 +87,7 @@ void PSPop(DRAWER *drawer) {
void PSDrawLine(DRAWER *drawer, LINE *l) {
fprintf(f,"%6.3f %6.3f moveto\n",l->m[EX],l->m[EY]);
- fprintf(f,"%6.3f %6.3f lineto\n",l->m[SX],l->m[SY]);
+ fprintf(f,"%6.3f %6.3f lineto\n",l->m[KALISX],l->m[KALISY]);
}
void PSDrawLines(DRAWER *drawer, LINE *l) {
diff --git a/symmetry.c b/symmetry.c
index 51cb211..bfca8fc 100644
--- a/symmetry.c
+++ b/symmetry.c
@@ -585,10 +585,10 @@ LINE *AddLineToObject(LINE *obj, LINE *l, RECTANGLE *r,int *pos_count)
void AdjustBoundingBox(LINE *l, RECTANGLE *r)
{
float min,max;
- GetMinMax(r->x,r->width,l->m[EX],l->m[SX],&min,&max);
+ GetMinMax(r->x,r->width,l->m[EX],l->m[KALISX],&min,&max);
r->x = min;
r->width = max;
- GetMinMax(r->y,r->height,l->m[EY],l->m[SY],&min,&max);
+ GetMinMax(r->y,r->height,l->m[EY],l->m[KALISY],&min,&max);
r->y = min;
r->height = max;
}
@@ -643,13 +643,13 @@ void ClosestEndpoint(LINE *line, POINT *p)
{
float temp;
temp = distance(line->m[EX],line->m[EY],p->x,p->y);
- temp = distance(line->m[SX],line->m[SY],p->x,p->y);
+ temp = distance(line->m[KALISX],line->m[KALISY],p->x,p->y);
if (distance(line->m[EX],line->m[EY],p->x,p->y) >
- distance(line->m[SX],line->m[SY],p->x,p->y))
+ distance(line->m[KALISX],line->m[KALISY],p->x,p->y))
{
- temp = line->m[SX]; line->m[SX] = line->m[EX]; line->m[EX] = temp;
- temp = line->m[SY]; line->m[SY] = line->m[EY]; line->m[EY] = temp;
+ temp = line->m[KALISX]; line->m[KALISX] = line->m[EX]; line->m[EX] = temp;
+ temp = line->m[KALISY]; line->m[KALISY] = line->m[EY]; line->m[EY] = temp;
}
}
diff --git a/xio.c b/xio.c
index cf7affc..aad10f3 100644
--- a/xio.c
+++ b/xio.c
@@ -342,7 +342,7 @@ void GXPop(DRAWER *d) {
void GXDrawLine(DRAWER *drawer, LINE *l) {
float v1[2], v2[2];
- v1[0] = l->m[SX] + GXx0; v1[1] = l->m[SY] + GXy0;
+ v1[0] = l->m[KALISX] + GXx0; v1[1] = l->m[KALISY] + GXy0;
v2[0] = l->m[EX] + GXx0; v2[1] = l->m[EY] + GXy0;
bgnline();
v2f(v1);
|
