[hackers] [st] use struct instead of array. || Aurélien Aptel

changeset: 126:89ff6952e77c
tag: tip
user: Aurélien Aptel <aurelien.aptel_AT_gmail.com>
date: Tue Aug 31 18:30:18 2010 +0200
files: st.c
description:
use struct instead of array.

diff -r f3e02c5a70e9 -r 89ff6952e77c st.c
--- a/st.c Tue Aug 31 18:22:59 2010 +0200
+++ b/st.c Tue Aug 31 18:30:18 2010 +0200
@@ -125,11 +125,12 @@
         GC gc;
 } DC;
 
+/* TODO: use better name for vars... */
 typedef struct {
         int mode;
         int bx, by;
         int ex, ey;
- int b[2], e[2];
+ struct {int x, y;} b, e;
         char *clip;
 } Selection;
 
@@ -223,8 +224,8 @@
                 int ex = MAX(sel.bx, sel.ex);
                 return BETWEEN(x, bx, ex);
         }
- return ((sel.b[1] < y&&y < sel.e[1]) || (y==sel.e[1] && x<=sel.e[0]))
- || (y==sel.b[1] && x>=sel.b[0] && (x<=sel.e[0] || sel.b[1]!=sel.e[1]));
+ return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x))
+ || (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y));
 }
 
 static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
@@ -232,10 +233,10 @@
                 *b=*b==4096?5:*b==2048?4:*b==1024?3:*b==512?2:*b==256?1:-1;
         *x = e->xbutton.x/xw.cw;
         *y = e->xbutton.y/xw.ch;
- sel.b[0] = sel.by < sel.ey ? sel.bx : sel.ex;
- sel.b[1] = MIN(sel.by, sel.ey);
- sel.e[0] = sel.by < sel.ey ? sel.ex : sel.bx;
- sel.e[1] = MAX(sel.by, sel.ey);
+ sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
+ sel.b.y = MIN(sel.by, sel.ey);
+ sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
+ sel.e.y = MAX(sel.by, sel.ey);
 }
 
 static void bpress(XEvent *e) {
@@ -249,7 +250,7 @@
         int ls, x, y, sz;
         if(sel.bx == -1)
                 return NULL;
- sz = (term.col+1) * (sel.e[1]-sel.b[1]+1);
+ sz = (term.col+1) * (sel.e.y-sel.b.y+1);
         ptr = str = malloc(sz);
         for(y = 0; y < term.row; y++) {
                 for(x = 0; x < term.col; x++)
Received on Tue Aug 31 2010 - 18:30:21 CEST