aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--brailleboi.c17
-rw-r--r--brailleboi.h1
2 files changed, 10 insertions, 8 deletions
diff --git a/brailleboi.c b/brailleboi.c
index 58fecce..d28a7d1 100644
--- a/brailleboi.c
+++ b/brailleboi.c
@@ -8,9 +8,11 @@
int brailleInit(int width, int height, image_buffer* buf)
{
setlocale(LC_ALL, "");
- buf->contents = malloc((width * height) * sizeof(int));
buf->width = width;
buf->height = height;
+ buf->char_width = (width+1)/2;
+ buf->char_height = (height+1)/2;
+ buf->contents = malloc((buf->char_width * buf->char_height) * sizeof(int));
return 0;
}
@@ -37,19 +39,18 @@ void braillePrint(int data)
int braillePlot(int x, int y, image_buffer* buf)
{
//Check if plot is within bounds
- //TODO: fix boundary check
-// if (x>buf->width | y>buf->height)
-// return 1;
- buf->contents[(y-1)/4 * buf->width + (x-1)/2] |= 1<<(y-1)%4+(1-x%2)*4;
+ if (x>buf->width | y>buf->height)
+ return 1;
+ buf->contents[(y-1)/4 * buf->char_width + (x-1)/2] |= 1<<(y-1)%4+(1-x%2)*4;
return 0;
}
void brailleUpdateScreen(image_buffer* buf)
{
- for (int x=0;x<buf->width;x++) {
- for (int y=0;y<buf->height;y++) {
+ for (int x=0;x<buf->char_width;x++) {
+ for (int y=0;y<buf->char_height;y++) {
wprintf(L"\e[%d;%dH", y+1, x+1);
- braillePrint(brailleReorganizeBits(buf->contents[y * buf->width + x]));
+ braillePrint(brailleReorganizeBits(buf->contents[y * buf->char_width + x]));
}
}
}
diff --git a/brailleboi.h b/brailleboi.h
index 1138e09..f06d0da 100644
--- a/brailleboi.h
+++ b/brailleboi.h
@@ -3,6 +3,7 @@
typedef struct image_buffer {
int width, height;
+ int char_width, char_height;
int* contents;
} image_buffer;