diff options
| author | okan <okan> | 2013-01-02 21:37:21 +0000 |
|---|---|---|
| committer | okan <okan> | 2013-01-02 21:37:21 +0000 |
| commit | 2ac65bd2882c26dc4dddac26d1883dd140704fef (patch) | |
| tree | 738d18d60e9e4a87b51bfebdd281638595800c63 /client.c | |
| parent | 6e5dda99a62cb659d30cdb6a59478a042fb485ed (diff) | |
| download | cwm-2ac65bd2882c26dc4dddac26d1883dd140704fef.tar.gz cwm-2ac65bd2882c26dc4dddac26d1883dd140704fef.tar.xz cwm-2ac65bd2882c26dc4dddac26d1883dd140704fef.zip | |
re-work client_snapcalc() so it takes client and edge dimensions with
snapdist; allows for simplier snap calculations. required for an upcoming diff for honoring gap.
Diffstat (limited to 'client.c')
| -rw-r--r-- | client.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/client.c b/client.c index c162dac..c76c1f4 100644 --- a/client.c +++ b/client.c @@ -850,19 +850,17 @@ client_inbound(struct client_ctx *cc, int x, int y) } int -client_snapcalc(int n, int dn, int nmax, int bwidth, int snapdist) +client_snapcalc(int n0, int n1, int e0, int e1, int snapdist) { - int n0, n1, s0, s1; + int s0, s1; s0 = s1 = 0; - n0 = n; - n1 = n + dn + (bwidth * 2); - if (abs(n0) <= snapdist) - s0 = -n0; + if (abs(e0 - n0) <= snapdist) + s0 = e0 - n0; - if (nmax - snapdist <= n1 && n1 <= nmax + snapdist) - s1 = nmax - n1; + if (abs(e1 - n1) <= snapdist) + s1 = e1 - n1; /* possible to snap in both directions */ if (s0 != 0 && s1 != 0) |