October 2011 - Gfxprim

[repo.or.cz] gfxprim.git branch generate updated: 859d22427003b1d4be3f536075d48a847bcd2c8a
by metan 25 Oct '11

25 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via 859d22427003b1d4be3f536075d48a847bcd2c8a (commit) via 4500e9d17c2657652e54e1ff4796d09bbef67952 (commit) from 040f8cdfb686e243d75d7c4e27c36b495d76656f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/859d22427003b1d4be3f536075d48a847bcd… commit 859d22427003b1d4be3f536075d48a847bcd2c8a Merge: 040f8cd 4500e9d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Oct 25 12:24:02 2011 +0200 Merge ssh://192.168.1.1/home/metan/Devel/gfxprim into generate http://repo.or.cz/w/gfxprim.git/commit/4500e9d17c2657652e54e1ff4796d09bbef6… commit 4500e9d17c2657652e54e1ff4796d09bbef67952 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Oct 25 14:13:47 2011 +0200 Filters: INTER -> INTERP. diff --git a/include/filters/GP_Resize.h b/include/filters/GP_Resize.h index 54acaed..05f80c7 100644 --- a/include/filters/GP_Resize.h +++ b/include/filters/GP_Resize.h @@ -47,8 +47,8 @@ #include "GP_Filter.h" typedef enum GP_InterpolationType { - GP_INTER_NN, /* Nearest Neighbour */ - GP_INTER_CUBIC, /* Bicubic */ + GP_INTERP_NN, /* Nearest Neighbour */ + GP_INTERP_CUBIC, /* Bicubic */ } GP_InterpolationType; void GP_FilterResize_Raw(GP_Context *src, GP_Context *res, diff --git a/libs/filters/GP_Resize.c b/libs/filters/GP_Resize.c index 6f944a6..192d5f5 100644 --- a/libs/filters/GP_Resize.c +++ b/libs/filters/GP_Resize.c @@ -214,10 +214,10 @@ void GP_FilterResize_Raw(GP_Context *src, GP_Context *res, GP_InterpolationType type) { switch (type) { - case GP_INTER_NN: + case GP_INTERP_NN: GP_FilterInterpolate_NN(src, res, callback); break; - case GP_INTER_CUBIC: + case GP_INTERP_CUBIC: GP_FilterInterpolate_Cubic(src, res, callback); break; } ----------------------------------------------------------------------- Summary of changes: include/filters/GP_Resize.h | 4 ++-- libs/filters/GP_Resize.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: 040f8cdfb686e243d75d7c4e27c36b495d76656f
by metan 24 Oct '11

24 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via 040f8cdfb686e243d75d7c4e27c36b495d76656f (commit) from fb50f1facaec877cd3b8a71f6d621648ebc0f451 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/040f8cdfb686e243d75d7c4e27c36b495d76… commit 040f8cdfb686e243d75d7c4e27c36b495d76656f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 24 17:46:32 2011 +0200 Added input driver desctructor + typedef. diff --git a/include/input/GP_InputDriverLinux.h b/include/input/GP_InputDriverLinux.h index ed70c15..ea5b370 100644 --- a/include/input/GP_InputDriverLinux.h +++ b/include/input/GP_InputDriverLinux.h @@ -31,7 +31,7 @@ #include <stdint.h> -struct GP_InputDriverLinux { +typedef struct GP_InputDriverLinux { /* fd */ int fd; @@ -51,11 +51,19 @@ struct GP_InputDriverLinux { int abs_press_max; uint8_t abs_flag; -}; +} GP_InputDriverLinux; +/* + * Initalize and allocate input driver. + */ struct GP_InputDriverLinux *GP_InputDriverLinuxOpen(const char *path); /* + * Close the fd, free memory. + */ +void GP_InputDriverLinuxClose(struct GP_InputDriverLinux *self); + +/* * Called when there are data ready on input device. * * May or may not generate GP_Event. diff --git a/libs/input/GP_InputDriverLinux.c b/libs/input/GP_InputDriverLinux.c index a0f4ddf..05557dd 100644 --- a/libs/input/GP_InputDriverLinux.c +++ b/libs/input/GP_InputDriverLinux.c @@ -142,6 +142,15 @@ struct GP_InputDriverLinux *GP_InputDriverLinuxOpen(const char *path) return ret; } +void GP_InputDriverLinuxClose(struct GP_InputDriverLinux *self) +{ + GP_DEBUG(1, "Closing input device"); + print_name(self->fd); + + close(self->fd); + free(self); +} + static void input_rel(struct GP_InputDriverLinux *self, struct input_event *ev) { GP_DEBUG(4, "Relative event"); ----------------------------------------------------------------------- Summary of changes: include/input/GP_InputDriverLinux.h | 12 ++++++++++-- libs/input/GP_InputDriverLinux.c | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: fb50f1facaec877cd3b8a71f6d621648ebc0f451
by metan 24 Oct '11

24 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via fb50f1facaec877cd3b8a71f6d621648ebc0f451 (commit) via d8cb24d4ac08ad588cda79f2a5c1e96e48587484 (commit) from 1a1eb5042ec3cb87352d5d8d3f051ba7f600a7ed (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/fb50f1facaec877cd3b8a71f6d621648ebc0… commit fb50f1facaec877cd3b8a71f6d621648ebc0f451 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 24 15:30:25 2011 +0000 Fixes for abs linux event driver. diff --git a/libs/input/GP_Event.c b/libs/input/GP_Event.c index e5beb2e..129f1ee 100644 --- a/libs/input/GP_Event.c +++ b/libs/input/GP_Event.c @@ -119,6 +119,8 @@ const char *GP_EventKeyName(enum GP_EventKeyValue key) return "RightButton"; case GP_BTN_MIDDLE: return "MiddleButton"; + case GP_BTN_PEN: + return "Pen"; default: return "Unknown"; }; @@ -151,6 +153,16 @@ static void dump_key(struct GP_Event *ev) } +static void dump_abs(struct GP_Event *ev) +{ + switch (ev->code) { + case GP_EV_ABS_POS: + printf("POSSITION %u %u %un", + ev->cursor_x, ev->cursor_y, ev->val.abs.pressure); + break; + } +} + void GP_EventDump(struct GP_Event *ev) { printf("EVENT (%u) ", (unsigned int)ev->time.tv_sec % 10000); @@ -163,8 +175,10 @@ void GP_EventDump(struct GP_Event *ev) dump_rel(ev); break; case GP_EV_ABS: - printf("EVENT ABSn"); + dump_abs(ev); break; + default: + printf("Unknown %un", ev->type); } } @@ -229,7 +243,7 @@ void GP_EventPushAbs(uint32_t x, uint32_t y, uint32_t pressure, { /* event header */ cur_state.type = GP_EV_ABS; - cur_state.code = GP_EV_REL_POS; + cur_state.code = GP_EV_ABS_POS; cur_state.val.abs.x = x; cur_state.val.abs.y = y; cur_state.val.abs.pressure = pressure; @@ -239,9 +253,11 @@ void GP_EventPushAbs(uint32_t x, uint32_t y, uint32_t pressure, set_time(time); - /* set global cursor */ - cur_state.cursor_x = x * screen_w / x_max; - cur_state.cursor_y = y * screen_h / y_max; + /* set global cursor, pressure == 0 is penup */ + if (pressure != 0) { + cur_state.cursor_x = x * screen_w / x_max; + cur_state.cursor_y = y * screen_h / y_max; + } /* put it into queue */ event_put(&cur_state); diff --git a/libs/input/GP_InputDriverLinux.c b/libs/input/GP_InputDriverLinux.c index 22138cd..a0f4ddf 100644 --- a/libs/input/GP_InputDriverLinux.c +++ b/libs/input/GP_InputDriverLinux.c @@ -144,7 +144,7 @@ struct GP_InputDriverLinux *GP_InputDriverLinuxOpen(const char *path) static void input_rel(struct GP_InputDriverLinux *self, struct input_event *ev) { - GP_DEBUG(3, "Relative event"); + GP_DEBUG(4, "Relative event"); switch (ev->code) { case REL_X: @@ -162,7 +162,7 @@ static void input_rel(struct GP_InputDriverLinux *self, struct input_event *ev) static void input_abs(struct GP_InputDriverLinux *self, struct input_event *ev) { - GP_DEBUG(3, "Absolute event"); + GP_DEBUG(4, "Absolute event"); switch (ev->code) { case ABS_X: @@ -184,7 +184,7 @@ static void input_abs(struct GP_InputDriverLinux *self, struct input_event *ev) static void input_key(struct GP_InputDriverLinux *self, struct input_event *ev) { - GP_DEBUG(3, "Key event"); + GP_DEBUG(4, "Key event"); (void) self; @@ -213,7 +213,7 @@ static void do_sync(struct GP_InputDriverLinux *self) static void input_syn(struct GP_InputDriverLinux *self, struct input_event *ev) { - GP_DEBUG(3, "Sync event"); + GP_DEBUG(4, "Sync event"); switch (ev->code) { case 0: @@ -229,27 +229,30 @@ int GP_InputDriverLinuxRead(struct GP_InputDriverLinux *self) struct input_event ev; int ret; - while ((ret = read(self->fd, &ev, sizeof(ev))) != -1) { - switch (ev.type) { - case EV_REL: - input_rel(self, &ev); - break; - case EV_ABS: - input_abs(self, &ev); - break; - case EV_KEY: - input_key(self, &ev); - break; - case EV_SYN: - input_syn(self, &ev); - break; - default: - GP_DEBUG(3, "Unhandled type %i", ev.type); - } - } + ret = read(self->fd, &ev, sizeof(ev)); if (ret == -1 && errno == EAGAIN) return 0; + if (ret < 1) + return -1; + + switch (ev.type) { + case EV_REL: + input_rel(self, &ev); + break; + case EV_ABS: + input_abs(self, &ev); + break; + case EV_KEY: + input_key(self, &ev); + break; + case EV_SYN: + input_syn(self, &ev); + break; + default: + GP_DEBUG(3, "Unhandled type %i", ev.type); + } + return 1; } diff --git a/tests/drivers/linux_input.c b/tests/drivers/linux_input.c index 04a0480..86b75a6 100644 --- a/tests/drivers/linux_input.c +++ b/tests/drivers/linux_input.c @@ -24,8 +24,6 @@ */ -#include <math.h> - #include <GP.h> #include <input/GP_InputDriverLinux.h> @@ -33,7 +31,7 @@ int main(int argc, char *argv[]) { struct GP_InputDriverLinux *drv; - GP_SetDebugLevel(10); + GP_SetDebugLevel(2); if (argc != 2) { printf("Usage: %s /dev/input/eventXn", argv[0]); @@ -50,14 +48,12 @@ int main(int argc, char *argv[]) GP_EventSetScreenSize(640, 480); for (;;) { - GP_InputDriverLinuxRead(drv); + while (GP_InputDriverLinuxRead(drv) >= 1); - while (GP_EventQueued()) { - GP_Event ev; + GP_Event ev; - GP_EventGet(&ev); + while (GP_EventGet(&ev)) GP_EventDump(&ev); - } usleep(1000); } http://repo.or.cz/w/gfxprim.git/commit/d8cb24d4ac08ad588cda79f2a5c1e96e4858… commit d8cb24d4ac08ad588cda79f2a5c1e96e48587484 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 24 15:27:42 2011 +0000 Fix the Set/Get/Reset Key not to touch out of the array. diff --git a/include/input/GP_Event.h b/include/input/GP_Event.h index 126c0c2..cb412f1 100644 --- a/include/input/GP_Event.h +++ b/include/input/GP_Event.h @@ -39,6 +39,8 @@ #define GP_EVENT_QUEUE_SIZE 32 +#define GP_EVENT_KEYMAP_BYTES 36 + enum GP_EventType { GP_EV_KEY = 1, /* key/button press event */ GP_EV_REL = 2, /* relative event */ @@ -204,6 +206,9 @@ enum GP_EventKeyValue { GP_BTN_FORWARD = 0x115, GP_BTN_BACK = 0x116, GP_BTN_TASK = 0x117, + + /* Touchscreen pen */ + GP_BTN_PEN = 0x14a, }; enum GP_EventRelCode { @@ -264,7 +269,7 @@ typedef struct GP_Event { * Bitmap of pressed keys including mouse buttons * accumulated for all input devices. */ - uint8_t keys_pressed[36]; + uint8_t keys_pressed[GP_EVENT_KEYMAP_BYTES]; } GP_Event; /* @@ -328,18 +333,27 @@ void GP_EventPush(uint16_t type, uint32_t code, int32_t value, static inline void GP_EventSetKey(struct GP_Event *ev, uint32_t key) { + if (key >= GP_EVENT_KEYMAP_BYTES * 8) + return; + ev->keys_pressed[(key)/8] |= 1<<((key)%8); } static inline int GP_EventGetKey(struct GP_Event *ev, uint32_t key) { + if (key >= GP_EVENT_KEYMAP_BYTES * 8) + return 0; + return !!(ev->keys_pressed[(key)/8] & (1<<((key)%8))); } static inline void GP_EventResetKey(struct GP_Event *ev, uint32_t key) { + if (key >= GP_EVENT_KEYMAP_BYTES * 8) + return; + ev->keys_pressed[(key)/8] &= ~(1<<((key)%8)); } ----------------------------------------------------------------------- Summary of changes: include/input/GP_Event.h | 16 ++++++++++++- libs/input/GP_Event.c | 26 +++++++++++++++++---- libs/input/GP_InputDriverLinux.c | 47 ++++++++++++++++++++----------------- tests/drivers/linux_input.c | 12 +++------ 4 files changed, 65 insertions(+), 36 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: 1a1eb5042ec3cb87352d5d8d3f051ba7f600a7ed
by metan 24 Oct '11

24 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via 1a1eb5042ec3cb87352d5d8d3f051ba7f600a7ed (commit) from cbea4b71a8151b445c662f50b12b50dccb7285c9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/1a1eb5042ec3cb87352d5d8d3f051ba7f600… commit 1a1eb5042ec3cb87352d5d8d3f051ba7f600a7ed Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 24 17:15:10 2011 +0200 Quick and dirty linux event input driver. diff --git a/include/input/GP_InputDriverLinux.h b/include/input/GP_InputDriverLinux.h new file mode 100644 index 0000000..ed70c15 --- /dev/null +++ b/include/input/GP_InputDriverLinux.h @@ -0,0 +1,67 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +/* + + Linux input device driver. + + */ + +#ifndef GP_INPUT_DRIVER_LINUX_H +#define GP_INPUT_DRIVER_LINUX_H + +#include <stdint.h> + +struct GP_InputDriverLinux { + /* fd */ + int fd; + + /* to store rel coordinates */ + int rel_x; + int rel_y; + + uint8_t rel_flag; + + /* to store abs coordinates */ + int abs_x; + int abs_y; + int abs_press; + + int abs_x_max; + int abs_y_max; + int abs_press_max; + + uint8_t abs_flag; +}; + +struct GP_InputDriverLinux *GP_InputDriverLinuxOpen(const char *path); + +/* + * Called when there are data ready on input device. + * + * May or may not generate GP_Event. + * + * Returns 0 on succes -1 on error and errno is set. + */ +int GP_InputDriverLinuxRead(struct GP_InputDriverLinux *self); + +#endif /* GP_INPUT_DRIVER_LINUX_H */ diff --git a/libs/input/GP_InputDriverLinux.c b/libs/input/GP_InputDriverLinux.c new file mode 100644 index 0000000..22138cd --- /dev/null +++ b/libs/input/GP_InputDriverLinux.c @@ -0,0 +1,255 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <errno.h> +#include <string.h> +#include <linux/input.h> + +#include "core/GP_Debug.h" + +#include "GP_Event.h" +#include "GP_InputDriverLinux.h" + +int get_version(int fd) +{ + int ver; + + if (ioctl(fd, EVIOCGVERSION, &ver)) + return -1; + + GP_DEBUG(2, "Input version %u.%u.%u", + ver>>16, (ver>>8)&0xff, ver&0xff); + + return 0; +} + +/* + * Returns size on success just as read() + */ +int get_name(int fd, char *buf, size_t buf_len) +{ + int ret; + + if ((ret = ioctl(fd, EVIOCGNAME(buf_len), buf)) <= 0) + return -1; + + return ret; +} + +void print_name(int fd) +{ + char name[64]; + + if (GP_GetDebugLevel() < 2) + return; + + if (get_name(fd, name, sizeof(name)) > 0) + GP_DEBUG(2, "Input device name '%s'", name); +} + +void try_load_callibration(struct GP_InputDriverLinux *self) +{ + long bit = 0; + int abs[5]; + + ioctl(self->fd, EVIOCGBIT(EV_ABS, EV_ABS), &bit); + + if (!bit) { + GP_DEBUG(3, "Not an absolute input device"); + return; + } + + if (!ioctl(self->fd, EVIOCGABS(ABS_X), abs)) { + GP_DEBUG(3, "ABS X = <%i,%i>", abs[1], abs[2]); + self->abs_x_max = abs[2]; + } + + if (!ioctl(self->fd, EVIOCGABS(ABS_Y), abs)) { + GP_DEBUG(3, "ABS Y = <%i,%i>", abs[1], abs[2]); + self->abs_y_max = abs[2]; + } + + if (!ioctl(self->fd, EVIOCGABS(ABS_PRESSURE), abs)) { + GP_DEBUG(3, "ABS P = <%i,%i>", abs[1], abs[2]); + self->abs_press_max = abs[2]; + } +} + +struct GP_InputDriverLinux *GP_InputDriverLinuxOpen(const char *path) +{ + int fd; + struct GP_InputDriverLinux *ret; + + GP_DEBUG(2, "Opening '%s'", path); + + fd = open(path, O_RDONLY | O_NONBLOCK); + + if (fd < 0) { + GP_DEBUG(1, "Failed to open '%s': %s", path, strerror(errno)); + return NULL; + } + + if (get_version(fd)) { + GP_DEBUG(1, "Failed ioctl(), not a input device?"); + return NULL; + } + + print_name(fd); + + ret = malloc(sizeof(struct GP_InputDriverLinux)); + + if (ret == NULL) { + GP_DEBUG(1, "Malloc failed :("); + close(fd); + return NULL; + } + + ret->fd = fd; + + ret->rel_x = 0; + ret->rel_y = 0; + ret->rel_flag = 0; + + ret->abs_x = 0; + ret->abs_y = 0; + ret->abs_press = 0; + ret->abs_flag = 0; + + try_load_callibration(ret); + + return ret; +} + +static void input_rel(struct GP_InputDriverLinux *self, struct input_event *ev) +{ + GP_DEBUG(3, "Relative event"); + + switch (ev->code) { + case REL_X: + self->rel_x = ev->value; + self->rel_flag = 1; + break; + case REL_Y: + self->rel_y = ev->value; + self->rel_flag = 1; + break; + default: + GP_DEBUG(3, "Unhandled code %i", ev->code); + } +} + +static void input_abs(struct GP_InputDriverLinux *self, struct input_event *ev) +{ + GP_DEBUG(3, "Absolute event"); + + switch (ev->code) { + case ABS_X: + self->abs_x = ev->value; + self->abs_flag = 1; + break; + case ABS_Y: + self->abs_y = ev->value; + self->abs_flag = 1; + break; + case ABS_PRESSURE: + self->abs_press = ev->value; + self->abs_flag = 1; + break; + default: + GP_DEBUG(3, "Unhandled code %i", ev->code); + } +} + +static void input_key(struct GP_InputDriverLinux *self, struct input_event *ev) +{ + GP_DEBUG(3, "Key event"); + + (void) self; + + GP_EventPushKey(ev->code, ev->value, NULL); +} + +static void do_sync(struct GP_InputDriverLinux *self) +{ + if (self->rel_flag) { + self->rel_flag = 0; + GP_EventPushRel(self->rel_x, self->rel_y, NULL); + self->rel_x = 0; + self->rel_y = 0; + } + + if (self->abs_flag) { + self->abs_flag = 0; + GP_EventPushAbs(self->abs_x, self->abs_y, self->abs_press, + self->abs_x_max, self->abs_y_max, + self->abs_press_max, NULL); + self->abs_x = 0; + self->abs_y = 0; + self->abs_press = 0; + } +} + +static void input_syn(struct GP_InputDriverLinux *self, struct input_event *ev) +{ + GP_DEBUG(3, "Sync event"); + + switch (ev->code) { + case 0: + do_sync(self); + break; + default: + GP_DEBUG(3, "Unhandled code %i", ev->code); + } +} + +int GP_InputDriverLinuxRead(struct GP_InputDriverLinux *self) +{ + struct input_event ev; + int ret; + + while ((ret = read(self->fd, &ev, sizeof(ev))) != -1) { + switch (ev.type) { + case EV_REL: + input_rel(self, &ev); + break; + case EV_ABS: + input_abs(self, &ev); + break; + case EV_KEY: + input_key(self, &ev); + break; + case EV_SYN: + input_syn(self, &ev); + break; + default: + GP_DEBUG(3, "Unhandled type %i", ev.type); + } + } + + if (ret == -1 && errno == EAGAIN) + return 0; + + return 1; +} diff --git a/tests/drivers/linux_input.c b/tests/drivers/linux_input.c new file mode 100644 index 0000000..04a0480 --- /dev/null +++ b/tests/drivers/linux_input.c @@ -0,0 +1,66 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + + /* + + */ + +#include <math.h> + +#include <GP.h> +#include <input/GP_InputDriverLinux.h> + +int main(int argc, char *argv[]) +{ + struct GP_InputDriverLinux *drv; + + GP_SetDebugLevel(10); + + if (argc != 2) { + printf("Usage: %s /dev/input/eventXn", argv[0]); + return 1; + } + + drv = GP_InputDriverLinuxOpen(argv[1]); + + if (drv == NULL) { + printf("Failed to open input devicen"); + return 1; + } + + GP_EventSetScreenSize(640, 480); + + for (;;) { + GP_InputDriverLinuxRead(drv); + + while (GP_EventQueued()) { + GP_Event ev; + + GP_EventGet(&ev); + GP_EventDump(&ev); + } + + usleep(1000); + } + + return 0; +} ----------------------------------------------------------------------- Summary of changes: .../{GP_InputDriverSDL.h => GP_InputDriverLinux.h} | 40 +++- libs/input/GP_InputDriverLinux.c | 255 ++++++++++++++++++++ .../GP_Loaders.h => tests/drivers/linux_input.c | 52 +++-- 3 files changed, 324 insertions(+), 23 deletions(-) copy include/input/{GP_InputDriverSDL.h => GP_InputDriverLinux.h} (71%) create mode 100644 libs/input/GP_InputDriverLinux.c copy include/loaders/GP_Loaders.h => tests/drivers/linux_input.c (74%) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: cbea4b71a8151b445c662f50b12b50dccb7285c9
by metan 23 Oct '11

23 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via cbea4b71a8151b445c662f50b12b50dccb7285c9 (commit) from 2f57806a0c4f164121638af4f28a43c73b3bf4c5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/cbea4b71a8151b445c662f50b12b50dccb72… commit cbea4b71a8151b445c662f50b12b50dccb7285c9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Oct 23 20:11:29 2011 +0000 Fixed the framebuffer tests. diff --git a/tests/Makefile b/tests/Makefile index e002663..cfeab1c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. -SUBDIRS=core SDL #loaders filters +SUBDIRS=core SDL drivers include $(TOPDIR)/include.mk diff --git a/tests/drivers/GP_Framebuffer.c b/tests/drivers/GP_Framebuffer.c deleted file mode 100644 index 61fc2d8..0000000 --- a/tests/drivers/GP_Framebuffer.c +++ /dev/null @@ -1,191 +0,0 @@ -/***************************************************************************** - * This file is part of gfxprim library. * - * * - * Gfxprim is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) any later version. * - * * - * Gfxprim is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with gfxprim; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, * - * Boston, MA 02110-1301 USA * - * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/ioctl.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <string.h> - -#include <linux/fb.h> -#include <linux/kd.h> -#include <linux/vt.h> - -#include "GP_Pixel.h" - -#include "GP_Framebuffer.h" - -/* - * Allocates and switches to newly allocated console. - */ -static int allocate_console(struct GP_Framebuffer *fb) -{ - struct vt_stat vts; - int fd, nr; - char buf[255]; - - /* allocate and switch to new console */ - fd = open("/dev/tty1", O_WRONLY); - - if (fd < 0) { - perror("opening console failed"); - return -1; - } - - if (ioctl(fd, VT_OPENQRY, &nr) < 0) { - perror("ioctl VT_OPENQRY"); - close(fd); - return -1; - } - - close(fd); - - snprintf(buf, sizeof(buf), "/dev/tty%i", nr); - fd = open(buf, O_RDWR); - - if (fd < 0) { - perror("opening console failed"); - close(fd); - return -1; - } - - if (ioctl(fd, VT_GETSTATE, &vts) == 0) - fb->last_con_nr = vts.v_active; - else - fb->last_con_nr = -1; - - if (ioctl(fd, VT_ACTIVATE, nr) < 0) { - perror("ioctl VT_ACTIVATE"); - close(fd); - return -1; - } - - if (ioctl(fd, VT_WAITACTIVE, nr) < 0) { - perror("ioctl VT_WAITACTIVE"); - close(fd); - return -1; - } - - /* turn off blinking cursor */ - if (ioctl(fd, KDSETMODE, KD_GRAPHICS) < 0) { - perror("ioctl KDSETMODE"); - close(fd); - } - - fb->con_nr = nr; - fb->con_fd = fd; - - return 0; -} - -GP_Framebuffer *GP_FramebufferInit(const char *path) -{ - GP_Framebuffer *fb = malloc(sizeof (GP_Framebuffer) + strlen(path) + 1); - struct fb_fix_screeninfo fscri; - struct fb_var_screeninfo vscri; - int fd; - - if (fb == NULL) - return NULL; - - if (allocate_console(fb)) - goto err1; - - - /* open and mmap framebuffer */ - fd = open(path, O_RDWR); - - if (fd < 0) { - perror("opening framebuffer failed"); - goto err2; - } - - if (ioctl(fd, FBIOGET_FSCREENINFO, &fscri) < 0) { - perror("ioctl FBIOGET_FSCREENINFO"); - goto err3; - } - - if (ioctl(fd, FBIOGET_VSCREENINFO, &vscri) < 0) { - perror("ioctl FBIOGET_VSCREENINFO"); - goto err3; - } - - fb->context.pixels = mmap(NULL, fscri.smem_len, - PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, - fd, 0); - - if (fb->context.pixels == MAP_FAILED) { - perror("mmaping framebuffer failed"); - goto err3; - } - - fb->fb_fd = fd; - fb->bsize = fscri.smem_len; - strcpy(fb->path, path); - - fb->context.w = vscri.xres; - fb->context.h = vscri.yres; - - fb->context.axes_swap = 0; - fb->context.x_swap = 0; - fb->context.y_swap = 0; - - fb->context.clip_w_min = 0; - fb->context.clip_h_min = 0; - fb->context.clip_w_max = fb->context.w - 1; - fb->context.clip_h_max = fb->context.h - 1; - - fb->context.bpp = vscri.bits_per_pixel; - fb->context.bytes_per_row = fscri.line_length; - - fb->context.pixel_type = GP_PIXEL_RGB565; - - return fb; -err3: - close(fd); -err2: - close(fb->con_fd); -err1: - free(fb); - return NULL; -} - -void GP_FramebufferExit(GP_Framebuffer *fb) -{ - /* unmap framebuffer */ - munmap(fb->context.pixels, fb->bsize); - close(fb->fb_fd); - - /* reset keyboard */ - ioctl(fb->con_fd, KDSETMODE, KD_TEXT); - - /* switch back console */ - if (fb->last_con_nr != -1) - ioctl(fb->con_fd, VT_ACTIVATE, fb->last_con_nr); - - close(fb->con_fd); - free(fb); -} diff --git a/tests/drivers/GP_Framebuffer.h b/tests/drivers/GP_Framebuffer.h deleted file mode 100644 index 0013f09..0000000 --- a/tests/drivers/GP_Framebuffer.h +++ /dev/null @@ -1,51 +0,0 @@ -/***************************************************************************** - * This file is part of gfxprim library. * - * * - * Gfxprim is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) any later version. * - * * - * Gfxprim is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with gfxprim; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, * - * Boston, MA 02110-1301 USA * - * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#ifndef GP_FRAMEBUFFER_H -#define GP_FRAMEBUFFER_H - -#include "GP_Context.h" - -typedef struct GP_Framebuffer { - GP_Context context; - uint32_t bsize; - int con_fd; - int con_nr; - int last_con_nr; - int fb_fd; - char path[]; -} GP_Framebuffer; - -/* - * Initalize framebuffer. - */ -GP_Framebuffer *GP_FramebufferInit(const char *path); - -/* - * Deinitalize framebuffer. - */ -void GP_FramebufferExit(GP_Framebuffer *fb); - -#endif /* GP_FRAMEBUFFER_H */ diff --git a/tests/drivers/tests/Makefile b/tests/drivers/Makefile similarity index 63% rename from tests/drivers/tests/Makefile rename to tests/drivers/Makefile index d6a017f..664900d 100644 --- a/tests/drivers/tests/Makefile +++ b/tests/drivers/Makefile @@ -1,9 +1,8 @@ -LDFLAGS=-L../ -L../../core/ -lGP_core -lGP_drivers - -INCLUDE=-I../ -I../../core/ +LDFLAGS=-L../../build/ -lGP -lpng -ldl +INCLUDE=-I../../include # Some warnings are triggered only with -O2 # thuss added here -CFLAGS=$(INCLUDE) -ggdb -W -Wall -O2 -lm +CFLAGS=$(INCLUDE) -ggdb -W -Wall -O2 SOURCES=$(wildcard *.c) TESTS=$(SOURCES:.c=) diff --git a/tests/drivers/tests/framebuffer_test.c b/tests/drivers/framebuffer_test.c similarity index 76% rename from tests/drivers/tests/framebuffer_test.c rename to tests/drivers/framebuffer_test.c index 028bd69..c5aceb9 100644 --- a/tests/drivers/tests/framebuffer_test.c +++ b/tests/drivers/framebuffer_test.c @@ -16,16 +16,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ /* - Framebuffer test. + Framebuffer test. 1. Draw to the framebuffer 2. Sleep @@ -36,7 +33,7 @@ #include <math.h> #include <GP.h> -#include <GP_Framebuffer.h> +#include <backends/GP_Framebuffer.h> static void draw(GP_Context *context, int x, int y, int l) { @@ -44,27 +41,33 @@ static void draw(GP_Context *context, int x, int y, int l) GP_Pixel red, blue, green; - GP_RGBToPixel(context, 255, 0, 0, &red); - GP_RGBToPixel(context, 0, 0, 255, &blue); - GP_RGBToPixel(context, 0, 255, 0, &green); + red = GP_RGBToContextPixel(255, 0, 0, context); + blue = GP_RGBToContextPixel(0, 0, 255, context); + green = GP_RGBToContextPixel(0, 255, 0, context); x2 = x + l/2; y2 = y + sqrt(2)/2 * l; x3 = x - l/2; y3 = y2; - GP_FillTriangle(context, x, y, x2, y2, x + l, y, red); - GP_FillTriangle(context, x, y, x3, y3, x - l, y, green); - GP_FillTriangle(context, x2, y2, x3, y3, x, y + sqrt(2) * l, blue); + GP_FillTriangle(context, x, y, x2, y2, x + l, y, red); + GP_FillTriangle(context, x, y, x3, y3, x - l, y, green); + GP_FillTriangle(context, x2, y2, x3, y3, x, y + sqrt(2) * l, blue); } int main(void) { - GP_Framebuffer *fb = GP_FramebufferInit("/dev/fb0"); + GP_Framebuffer *fb; GP_TextStyle style; - if (fb == NULL) + GP_SetDebugLevel(10); + + fb = GP_FramebufferInit("/dev/fb0"); + + if (fb == NULL) { + fprintf(stderr, "Failed to initalize framebuffern"); return 1; + } GP_DefaultTextStyle(&style); @@ -73,8 +76,8 @@ int main(void) GP_Pixel gray, black; - GP_RGBToPixel(&fb->context, 200, 200, 200, &gray); - GP_RGBToPixel(&fb->context, 0, 0, 0, &black); + gray = GP_RGBToContextPixel(200, 200, 200, &fb->context); + black = GP_RGBToContextPixel( 0, 0, 0, &fb->context); const char *text = "Framebuffer test"; diff --git a/tests/drivers/runtest.sh b/tests/drivers/runtest.sh new file mode 100755 index 0000000..ff2a001 --- /dev/null +++ b/tests/drivers/runtest.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +# Run dynamically linked test. +# + +PROG="$1" +shift + +echo "LD_LIBRARY_PATH=../../build/ ./$PROG $@" +LD_LIBRARY_PATH="../../build/" ./$PROG $@ diff --git a/tests/drivers/tests/sierpinsky.c b/tests/drivers/sierpinsky.c similarity index 86% rename from tests/drivers/tests/sierpinsky.c rename to tests/drivers/sierpinsky.c index b90fe60..c113e1e 100644 --- a/tests/drivers/tests/sierpinsky.c +++ b/tests/drivers/sierpinsky.c @@ -16,21 +16,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ /* - + Simple test for triangle drawing runtime. */ -#include "GP.h" -#include "GP_Framebuffer.h" +#include <GP.h> +#include <backends/GP_Framebuffer.h> #include <math.h> @@ -112,18 +109,24 @@ static void redraw(GP_Context *context) int main(void) { - GP_Framebuffer *fb = GP_FramebufferInit("/dev/fb0"); + GP_Framebuffer *fb; GP_Context *context; int i; - if (fb == NULL) + GP_SetDebugLevel(10); + + fb = GP_FramebufferInit("/dev/fb0"); + + if (fb == NULL) { + fprintf(stderr, "failed to initalize framebuffern"); return 1; + } context = &fb->context; - GP_ColorNameToPixel(context, GP_COL_GRAY_LIGHT, &gray); - GP_ColorNameToPixel(context, GP_COL_BLUE, &blue); - GP_ColorNameToPixel(context, GP_COL_BLACK, &black); + gray = GP_ColorToContextPixel(GP_COL_GRAY_LIGHT, context); + blue = GP_ColorToContextPixel(GP_COL_BLUE, context); + black = GP_ColorToContextPixel(GP_COL_BLACK, context); iter = 0; draw(context, context->w/2, context->h/2, l, iter); diff --git a/tests/drivers/tests/runtest.sh b/tests/drivers/tests/runtest.sh deleted file mode 100755 index 0a8e20e..0000000 --- a/tests/drivers/tests/runtest.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -# Run dynamically linked test. -# - -PROG="$1" -shift - -echo "LD_LIBRARY_PATH=../:../../core/ ./$PROG $@" -LD_LIBRARY_PATH="../:../../core/" ./$PROG $@ ----------------------------------------------------------------------- Summary of changes: tests/Makefile | 2 +- tests/drivers/GP_Framebuffer.c | 191 -------------------------- tests/drivers/GP_Framebuffer.h | 51 ------- tests/drivers/{tests => }/Makefile | 7 +- tests/drivers/{tests => }/framebuffer_test.c | 35 +++-- tests/{SDL => drivers}/runtest.sh | 2 +- tests/drivers/{tests => }/sierpinsky.c | 27 ++-- tests/drivers/tests/runtest.sh | 10 -- 8 files changed, 39 insertions(+), 286 deletions(-) delete mode 100644 tests/drivers/GP_Framebuffer.c delete mode 100644 tests/drivers/GP_Framebuffer.h rename tests/drivers/{tests => }/Makefile (63%) rename tests/drivers/{tests => }/framebuffer_test.c (76%) copy tests/{SDL => drivers}/runtest.sh (72%) rename tests/drivers/{tests => }/sierpinsky.c (86%) delete mode 100755 tests/drivers/tests/runtest.sh repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: 2f57806a0c4f164121638af4f28a43c73b3bf4c5
by metan 15 Oct '11

15 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via 2f57806a0c4f164121638af4f28a43c73b3bf4c5 (commit) from e5413870bee8686f02e4123c1db175ba61821220 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/2f57806a0c4f164121638af4f28a43c73b3b… commit 2f57806a0c4f164121638af4f28a43c73b3bf4c5 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Oct 15 23:41:18 2011 +0200 This one was actually correct before. diff --git a/libs/gfx/algo/Line.algo.h b/libs/gfx/algo/Line.algo.h index 3eccb3a..afc37dc 100644 --- a/libs/gfx/algo/Line.algo.h +++ b/libs/gfx/algo/Line.algo.h @@ -66,7 +66,7 @@ void FN_NAME(CONTEXT_T context, int x0, int y0, int x1, int y1, int error = deltax / 2; int y = y0, x; int ystep = (y0 < y1) ? 1 : -1; - for (x = x0; x < x1; x++) { + for (x = x0; x <= x1; x++) { if (steep) PUTPIXEL(context, y, x, pixval); ----------------------------------------------------------------------- Summary of changes: libs/gfx/algo/Line.algo.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: e5413870bee8686f02e4123c1db175ba61821220
by metan 15 Oct '11

15 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via e5413870bee8686f02e4123c1db175ba61821220 (commit) from 79941fab71a6136cc5ad405d77ff8fb3164b5ce9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/e5413870bee8686f02e4123c1db175ba6182… commit e5413870bee8686f02e4123c1db175ba61821220 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Oct 15 23:16:20 2011 +0200 Fix previous commit. diff --git a/libs/gfx/GP_HLine.c b/libs/gfx/GP_HLine.c index 720475c..c249f49 100644 --- a/libs/gfx/GP_HLine.c +++ b/libs/gfx/GP_HLine.c @@ -34,8 +34,8 @@ DEF_HLINE_BU_FN(GP_HLine_Raw_1BPP_LE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_W DEF_HLINE_BU_FN(GP_HLine_Raw_1BPP_BE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels1bpp) DEF_HLINE_BU_FN(GP_HLine_Raw_2BPP_LE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels2bpp) DEF_HLINE_BU_FN(GP_HLine_Raw_2BPP_BE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels2bpp) -DEF_HLINE_BU_FN(GP_HLine_Raw_4BPP_LE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels2bpp) -DEF_HLINE_BU_FN(GP_HLine_Raw_4BPP_BE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels2bpp) +DEF_HLINE_BU_FN(GP_HLine_Raw_4BPP_LE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels4bpp) +DEF_HLINE_BU_FN(GP_HLine_Raw_4BPP_BE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels4bpp) DEF_HLINE_FN(GP_HLine_Raw_8BPP, GP_Context *, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels8bpp) DEF_HLINE_FN(GP_HLine_Raw_16BPP, GP_Context *, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels16bpp) ----------------------------------------------------------------------- Summary of changes: libs/gfx/GP_HLine.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: 79941fab71a6136cc5ad405d77ff8fb3164b5ce9
by metan 15 Oct '11

15 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via 79941fab71a6136cc5ad405d77ff8fb3164b5ce9 (commit) from b8038ff42052c3ff217d4739e5501279936d0303 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/79941fab71a6136cc5ad405d77ff8fb3164b… commit 79941fab71a6136cc5ad405d77ff8fb3164b5ce9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Oct 15 20:17:46 2011 +0200 Back at the size - 1 for GP_*XYWH GP_*XYW and GP_*XYH. diff --git a/libs/gfx/GP_HLine.c b/libs/gfx/GP_HLine.c index 1abb073..720475c 100644 --- a/libs/gfx/GP_HLine.c +++ b/libs/gfx/GP_HLine.c @@ -34,8 +34,8 @@ DEF_HLINE_BU_FN(GP_HLine_Raw_1BPP_LE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_W DEF_HLINE_BU_FN(GP_HLine_Raw_1BPP_BE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels1bpp) DEF_HLINE_BU_FN(GP_HLine_Raw_2BPP_LE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels2bpp) DEF_HLINE_BU_FN(GP_HLine_Raw_2BPP_BE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels2bpp) -DEF_HLINE_BU_FN(GP_HLine_Raw_4BPP_LE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels4bpp) -DEF_HLINE_BU_FN(GP_HLine_Raw_4BPP_BE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels4bpp) +DEF_HLINE_BU_FN(GP_HLine_Raw_4BPP_LE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels2bpp) +DEF_HLINE_BU_FN(GP_HLine_Raw_4BPP_BE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels2bpp) DEF_HLINE_FN(GP_HLine_Raw_8BPP, GP_Context *, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels8bpp) DEF_HLINE_FN(GP_HLine_Raw_16BPP, GP_Context *, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels16bpp) @@ -55,7 +55,10 @@ void GP_HLineXXY_Raw(GP_Context *context, GP_Coord x0, GP_Coord x1, void GP_HLineXYW_Raw(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP_Pixel pixel) { - GP_HLineXXY_Raw(context, x, x + w, y, pixel); + if (w == 0) + return; + + GP_HLineXXY_Raw(context, x, x + w - 1, y, pixel); } void GP_HLineXXY(GP_Context *context, GP_Coord x0, GP_Coord x1, GP_Coord y, @@ -79,5 +82,8 @@ void GP_HLineXXY(GP_Context *context, GP_Coord x0, GP_Coord x1, GP_Coord y, void GP_HLineXYW(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP_Pixel pixel) { - GP_HLineXXY(context, x, x + w, y, pixel); + if (w == 0) + return; + + GP_HLineXXY(context, x, x + w - 1, y, pixel); } diff --git a/libs/gfx/GP_Rect.c b/libs/gfx/GP_Rect.c index f6a303e..5e8fbc7 100644 --- a/libs/gfx/GP_Rect.c +++ b/libs/gfx/GP_Rect.c @@ -37,10 +37,10 @@ void GP_RectXYXY_Raw(GP_Context *context, GP_Coord x0, GP_Coord y0, void GP_RectXYWH_Raw(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP_Size h, GP_Pixel pixel) { - GP_HLine_Raw(context, x, x + w, y, pixel); - GP_HLine_Raw(context, x, x + w, y + h, pixel); - GP_VLine_Raw(context, x, y, y + h, pixel); - GP_VLine_Raw(context, x + w, y, y + h, pixel); + if (w == 0 || h == 0) + return; + + GP_RectXYXY_Raw(context, x, y, x + w - 1, y + h - 1, pixel); } void GP_RectXYXY(GP_Context *context, GP_Coord x0, GP_Coord y0, @@ -57,7 +57,10 @@ void GP_RectXYXY(GP_Context *context, GP_Coord x0, GP_Coord y0, void GP_RectXYWH(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP_Size h, GP_Pixel pixel) { - GP_RectXYXY(context, x, y, x + w, y + h, pixel); + if (w == 0 || h == 0) + return; + + GP_RectXYXY(context, x, y, x + w - 1, y + h - 1, pixel); } void GP_FillRectXYXY_Raw(GP_Context *context, GP_Coord x0, GP_Coord y0, @@ -76,7 +79,10 @@ void GP_FillRectXYXY_Raw(GP_Context *context, GP_Coord x0, GP_Coord y0, void GP_FillRectXYWH_Raw(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP_Size h, GP_Pixel pixel) { - GP_FillRectXYXY_Raw(context, x, y, x + w, y + h, pixel); + if (w == 0 || h == 0) + return; + + GP_FillRectXYXY_Raw(context, x, y, x + w - 1, y + h - 1, pixel); } void GP_FillRectXYXY(GP_Context *context, GP_Coord x0, GP_Coord y0, @@ -93,5 +99,8 @@ void GP_FillRectXYXY(GP_Context *context, GP_Coord x0, GP_Coord y0, void GP_FillRectXYWH(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP_Size h, GP_Pixel pixel) { - GP_FillRectXYXY(context, x, y, x + w, y + h, pixel); + if (w == 0 || h == 0) + return; + + GP_FillRectXYXY(context, x, y, x + w - 1, y + h - 1, pixel); } diff --git a/libs/gfx/GP_VLine.c b/libs/gfx/GP_VLine.c index af9ad15..88cde1e 100644 --- a/libs/gfx/GP_VLine.c +++ b/libs/gfx/GP_VLine.c @@ -42,7 +42,10 @@ void GP_VLineXYY_Raw(GP_Context *context, GP_Coord x, GP_Coord y0, void GP_VLineXYH_Raw(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size h, GP_Pixel pixel) { - GP_VLineXYY(context, x, y, y + h, pixel); + if (h == 0) + return; + + GP_VLineXYY(context, x, y, y + h - 1, pixel); } void GP_VLineXYY(GP_Context *context, GP_Coord x, GP_Coord y0, @@ -66,5 +69,8 @@ void GP_VLineXYY(GP_Context *context, GP_Coord x, GP_Coord y0, void GP_VLineXYH(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size h, GP_Pixel pixel) { - GP_VLineXYY(context, x, y, y + h, pixel); + if (h == 0) + return; + + GP_VLineXYY(context, x, y, y + h - 1, pixel); } ----------------------------------------------------------------------- Summary of changes: libs/gfx/GP_HLine.c | 14 ++++++++++---- libs/gfx/GP_Rect.c | 23 ++++++++++++++++------- libs/gfx/GP_VLine.c | 10 ++++++++-- 3 files changed, 34 insertions(+), 13 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: b8038ff42052c3ff217d4739e5501279936d0303
by metan 15 Oct '11

15 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via b8038ff42052c3ff217d4739e5501279936d0303 (commit) via 831f6b2be47a611581e47f7616516bc70c9d91c7 (commit) from f6c5774e42d209fcc3bff4acb515739172dfdb97 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/b8038ff42052c3ff217d4739e5501279936d… commit b8038ff42052c3ff217d4739e5501279936d0303 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Oct 15 15:55:41 2011 +0200 Make the GP_Color API match the GP_Pixel API. diff --git a/include/core/GP_Color.h b/include/core/GP_Color.h index a636cd0..4e39e07 100644 --- a/include/core/GP_Color.h +++ b/include/core/GP_Color.h @@ -36,6 +36,9 @@ #include "GP_Context.h" #include "GP_Pixel.h" +/* + * Enumeration of color constants. + */ typedef enum GP_Color { GP_COL_INVALID = -1, GP_COL_BLACK, @@ -53,21 +56,67 @@ typedef enum GP_Color { } GP_Color; /* - * Converts Color to Pixel + * Converts GP_Color to GP_Pixel. + */ +GP_Pixel GP_ColorToPixel(GP_Color color, GP_PixelType pixel_type); + +/* + * Converts GP_Color to GP_Pixel. */ -GP_Pixel GP_ColorToPixel(GP_Context *context, GP_Color color); +static inline GP_Pixel GP_ColorToContextPixel(GP_Color color, + GP_Context *context) +{ + return GP_ColorToPixel(color, context->pixel_type); +} /* - * Converts Color name to Color. + * Converts Color name (eg. string) to GP_Color. */ GP_Color GP_ColorNameToColor(const char *color_name); +/* + * Converts GP_Color to color name. + * + * If color is not valid NULL is returned. + */ const char *GP_ColorToColorName(GP_Color color); /* * Converts Color name to Pixel. + * + * Returns true if conversion was successful false otherwise. */ -bool GP_ColorNameToPixel(GP_Context *context, const char *color_name, +bool GP_ColorNameToPixel(const char *color_name, GP_PixelType pixel_type, GP_Pixel *pixel); +/* + * Converts Color name to Pixel. + * + * Returns true if conversion was successful false otherwise. + */ +static inline bool GP_ColorNameContextToPixel(const char *color_name, + GP_PixelType pixel_type, + GP_Pixel *pixel) +{ + return GP_ColorNameToPixel(color_name, pixel_type, pixel); +} + +/* + * Loads all colors into array of GP_Pixel of size GP_COL_MAX. + * + * The colors are then used as pixels[GP_COL_XXX]; + */ +void GP_ColorLoadPixels(GP_Pixel pixels[], GP_PixelType pixel_type); + +/* + * Loads all colors into array of GP_Pixel of size GP_COL_MAX. + * + * The colors are then used as pixels[GP_COL_XXX]; + */ +static inline void GP_ColorLoadContextPixels(GP_Pixel pixels[], + GP_Context *context) +{ + GP_ColorLoadPixels(pixels, context->pixel_type); +} + #endif /* GP_COLOR_H */ diff --git a/libs/core/GP_Color.c b/libs/core/GP_Color.c index 672089e..bf055b2 100644 --- a/libs/core/GP_Color.c +++ b/libs/core/GP_Color.c @@ -19,16 +19,17 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ +#include <stdint.h> +#include <string.h> + #include "GP_Convert.h" #include "GP_Color.h" -#include <stdint.h> -#include <string.h> static char *color_names[] = { "Black", @@ -73,17 +74,18 @@ static uint8_t p8_colors[] = { 0xff, /* White */ }; -GP_Pixel GP_ColorToPixel(GP_Context *context, GP_Color col) +GP_Pixel GP_ColorToPixel(GP_Color color, GP_PixelType pixel_type) { - GP_ASSERT(col < GP_COL_MAX); - GP_ASSERT(col >= 0); + GP_ASSERT(color < GP_COL_MAX); + GP_ASSERT(color >= 0); - if (context->pixel_type == GP_PIXEL_P8) - return p8_colors[col]; + if (pixel_type == GP_PIXEL_P8) + return p8_colors[color]; - return GP_RGBToPixel(rgb888_colors[col][0], - rgb888_colors[col][1], - rgb888_colors[col][2], context->pixel_type); + return GP_RGBToPixel(rgb888_colors[color][0], + rgb888_colors[color][1], + rgb888_colors[color][2], + pixel_type); } GP_Color GP_ColorNameToColor(const char *color_name) @@ -97,23 +99,31 @@ GP_Color GP_ColorNameToColor(const char *color_name) return -1; } -const char *GP_ColorToColorName(GP_Color col) +const char *GP_ColorToColorName(GP_Color color) { - if (col < 0 || col >= GP_COL_MAX) + if (color < 0 || color >= GP_COL_MAX) return NULL; - return color_names[col]; + return color_names[color]; } -bool GP_ColorNameToPixel(GP_Context *context, const char *color_name, +bool GP_ColorNameToPixel(const char *color_name, GP_PixelType pixel_type, GP_Pixel *pixel) { - GP_Color col = GP_ColorNameToColor(color_name); + GP_Color color = GP_ColorNameToColor(color_name); - if (col == GP_COL_INVALID) + if (color == GP_COL_INVALID) return false; - *pixel = GP_ColorToPixel(context, col); + *pixel = GP_ColorToPixel(pixel_type, color); return true; } + +void GP_ColorLoadPixels(GP_Pixel pixels[], GP_PixelType pixel_type) +{ + unsigned int i; + + for (i = 0; i < GP_COL_MAX; i++) + pixels[i] = GP_ColorToPixel(i, pixel_type); +} diff --git a/tests/SDL/blittest.c b/tests/SDL/blittest.c index a62d381..be39c83 100644 --- a/tests/SDL/blittest.c +++ b/tests/SDL/blittest.c @@ -187,8 +187,8 @@ int main(int argc, char *argv[]) bitmap_conv = GP_ContextConvert(bitmap_raw, context.pixel_type); change_bitmap(); - black = GP_ColorToPixel(&context, GP_COL_BLACK); - white = GP_ColorToPixel(&context, GP_COL_WHITE); + black = GP_ColorToContextPixel(GP_COL_BLACK, &context); + white = GP_ColorToContextPixel(GP_COL_WHITE, &context); /* Set up the refresh timer */ timer = SDL_AddTimer(60, timer_callback, NULL); diff --git a/tests/SDL/fileview.c b/tests/SDL/fileview.c index d4ceeda..c01a7fc 100644 --- a/tests/SDL/fileview.c +++ b/tests/SDL/fileview.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -238,12 +238,12 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); /* Load colors suitable for the display */ - white_pixel = GP_ColorToPixel(&context, GP_COL_WHITE); - gray_pixel = GP_ColorToPixel(&context, GP_COL_GRAY_LIGHT); - dark_gray_pixel = GP_ColorToPixel(&context, GP_COL_GRAY_DARK); - black_pixel = GP_ColorToPixel(&context, GP_COL_BLACK); - red_pixel = GP_ColorToPixel(&context, GP_COL_RED); - blue_pixel = GP_ColorToPixel(&context, GP_COL_BLUE); + white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, &context); + gray_pixel = GP_ColorToContextPixel(GP_COL_GRAY_LIGHT, &context); + dark_gray_pixel = GP_ColorToContextPixel(GP_COL_GRAY_DARK, &context); + black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, &context); + red_pixel = GP_ColorToContextPixel(GP_COL_RED, &context); + blue_pixel = GP_ColorToContextPixel(GP_COL_BLUE, &context); redraw_screen(); SDL_Flip(display); diff --git a/tests/SDL/fonttest.c b/tests/SDL/fonttest.c index 91f42fc..602c526 100644 --- a/tests/SDL/fonttest.c +++ b/tests/SDL/fonttest.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -231,12 +231,12 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); /* Load colors suitable for the display */ - white_pixel = GP_ColorToPixel(&context, GP_COL_WHITE); - gray_pixel = GP_ColorToPixel(&context, GP_COL_GRAY_LIGHT); - dark_gray_pixel = GP_ColorToPixel(&context, GP_COL_GRAY_DARK); - black_pixel = GP_ColorToPixel(&context, GP_COL_BLACK); - red_pixel = GP_ColorToPixel(&context, GP_COL_RED); - blue_pixel = GP_ColorToPixel(&context, GP_COL_BLUE); + white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, &context); + gray_pixel = GP_ColorToContextPixel(GP_COL_GRAY_LIGHT, &context); + dark_gray_pixel = GP_ColorToContextPixel(GP_COL_GRAY_DARK, &context); + black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, &context); + red_pixel = GP_ColorToContextPixel(GP_COL_RED, &context); + blue_pixel = GP_ColorToContextPixel(GP_COL_BLUE, &context); redraw_screen(); SDL_Flip(display); diff --git a/tests/SDL/input.c b/tests/SDL/input.c index ebc7820..c420b09 100644 --- a/tests/SDL/input.c +++ b/tests/SDL/input.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -30,18 +30,13 @@ #include "GP.h" #include "GP_SDL.h" -/* The surface used as a display (in fact it is a software surface). */ SDL_Surface *display = NULL; GP_Context context; -/* Timer used for refreshing the display */ SDL_TimerID timer; - -/* An event used for signaling that the timer was triggered. */ SDL_UserEvent timer_event; -/* Values for color pixels in display format. */ -GP_Pixel black_pixel, red_pixel, green_pixel, blue_pixel, white_pixel; +GP_Pixel black_pixel, red_pixel, green_pixel, white_pixel; Uint32 timer_callback(__attribute__((unused)) Uint32 interval, __attribute__((unused)) void *param) @@ -51,17 +46,7 @@ Uint32 timer_callback(__attribute__((unused)) Uint32 interval, return 30; } -void draw_pixel(void) -{ -// GP_Color pixel, conv; - int x = random() % 320; - int y = random() % 240; - - - GP_PutPixel(&context, x, y, green_pixel); -} - -void draw_event(GP_Event *ev) +static void draw_event(GP_Event *ev) { if (ev->type != GP_EV_KEY) return; @@ -72,19 +57,7 @@ void draw_event(GP_Event *ev) SDL_Flip(display); } -void draw_pixels(void) -{ - SDL_LockSurface(display); - - /* Draw some pixels (exact number is not important). */ - int i; - for (i = 0; i < 30; i++) - draw_pixel(); - - SDL_UnlockSurface(display); -} - -void event_loop(void) +static void event_loop(void) { SDL_Event event; @@ -107,8 +80,12 @@ void event_loop(void) exit(0); break; case GP_BTN_LEFT: - GP_PutPixel(&context, ev.cursor_x, - ev.cursor_y, red_pixel); + GP_HLineXXY(&context, ev.cursor_x - 3, + ev.cursor_x + 3, + ev.cursor_y, red_pixel); + GP_VLineXYY(&context, ev.cursor_x, + ev.cursor_y - 3, + ev.cursor_y + 3, red_pixel); SDL_Flip(display); break; default: @@ -131,7 +108,7 @@ void event_loop(void) } } -int main(int argc, char **argv) +int main(int argc, char *argv[]) { int display_bpp = 0; @@ -150,7 +127,6 @@ int main(int argc, char **argv) return 1; } - /* Create a window with a software back surface */ display = SDL_SetVideoMode(480, 640, display_bpp, SDL_SWSURFACE); if (display == NULL) { fprintf(stderr, "Could not open display: %sn", SDL_GetError()); @@ -159,37 +135,20 @@ int main(int argc, char **argv) GP_EventSetScreenSize(480, 640); - /* Print basic information about the surface */ - printf("Display surface properties:n"); - printf(" width: %4d, height: %4d, pitch: %4dn", - display->w, display->h, display->pitch); - printf(" bits per pixel: %2d, bytes per pixel: %2dn", - display->format->BitsPerPixel, display->format->BytesPerPixel); - - /* Set up a clipping rectangle to test proper clipping of pixels */ - SDL_Rect clip_rect = {10, 10, 300, 220}; - SDL_SetClipRect(display, &clip_rect); - GP_SDL_ContextFromSurface(&context, display); - /* Load pixel values compatible with the display. */ - red_pixel = GP_ColorToPixel(&context, GP_COL_RED); - green_pixel = GP_ColorToPixel(&context, GP_COL_GREEN); - blue_pixel = GP_ColorToPixel(&context, GP_COL_BLUE); - white_pixel = GP_ColorToPixel(&context, GP_COL_WHITE); - black_pixel = GP_ColorToPixel(&context, GP_COL_BLACK); + red_pixel = GP_ColorToContextPixel(GP_COL_RED, &context); + green_pixel = GP_ColorToContextPixel(GP_COL_GREEN, &context); + white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, &context); + black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, &context); - /* Set up the refresh timer */ timer = SDL_AddTimer(30, timer_callback, NULL); if (timer == 0) { fprintf(stderr, "Could not set up timer: %sn", SDL_GetError()); goto fail; } - /* Enter the event loop */ event_loop(); - - /* We're done */ SDL_Quit(); return 0; diff --git a/tests/SDL/linetest.c b/tests/SDL/linetest.c index 245b1ce..1b01a3a 100644 --- a/tests/SDL/linetest.c +++ b/tests/SDL/linetest.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -124,8 +124,8 @@ int main(int argc, char **argv) GP_SDL_ContextFromSurface(&context, display); /* Load colors in display format */ - black = GP_ColorToPixel(&context, GP_COL_BLACK); - white = GP_ColorToPixel(&context, GP_COL_WHITE); + black = GP_ColorToContextPixel(GP_COL_BLACK, &context); + white = GP_ColorToContextPixel(GP_COL_WHITE, &context); /* Set up the refresh timer */ timer = SDL_AddTimer(30, timer_callback, NULL); diff --git a/tests/SDL/pixeltest.c b/tests/SDL/pixeltest.c index 7102074..6d7ccf0 100644 --- a/tests/SDL/pixeltest.c +++ b/tests/SDL/pixeltest.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -53,34 +53,25 @@ Uint32 timer_callback(__attribute__((unused)) Uint32 interval, void draw_pixel(void) { -// GP_Color pixel, conv; + GP_Pixel pixel; int x = random() % 320; int y = random() % 240; -// pixel = GP_GetPixel(&context, x, y); + pixel = GP_GetPixel(&context, x, y); - GP_PutPixel(&context, x, y, green_pixel); - - /* TODO: we cannot switch like this - we need either to convert blue - and others into Context format - at the very beginning, or make - a copy to convert it and match - agains what we get from GP_GetPixel - - if (pixel == blue) { - GP_PutPixel(&context, x, y, green); + if (pixel == blue_pixel) { + GP_PutPixel(&context, x, y, green_pixel); } - else if (pixel == red) { - GP_PutPixel(&context, x, y, white); + else if (pixel == red_pixel) { + GP_PutPixel(&context, x, y, white_pixel); } else { if (x < 160) { - GP_PutPixel(&context, x, y, blue); + GP_PutPixel(&context, x, y, blue_pixel); } else { - GP_PutPixel(&context, x, y, red); + GP_PutPixel(&context, x, y, red_pixel); } - } */ + } } void draw_pixels(void) @@ -153,10 +144,10 @@ int main(int argc, char **argv) GP_SDL_ContextFromSurface(&context, display); /* Load pixel values compatible with the display. */ - red_pixel = GP_ColorToPixel(&context, GP_COL_RED); - green_pixel = GP_ColorToPixel(&context, GP_COL_GREEN); - blue_pixel = GP_ColorToPixel(&context, GP_COL_BLUE); - white_pixel = GP_ColorToPixel(&context, GP_COL_WHITE); + red_pixel = GP_ColorToContextPixel(GP_COL_RED, &context); + green_pixel = GP_ColorToContextPixel(GP_COL_GREEN, &context); + blue_pixel = GP_ColorToContextPixel(GP_COL_BLUE, &context); + white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, &context); /* Set up the refresh timer */ timer = SDL_AddTimer(30, timer_callback, NULL); diff --git a/tests/SDL/randomshapetest.c b/tests/SDL/randomshapetest.c index 592d466..edc8554 100644 --- a/tests/SDL/randomshapetest.c +++ b/tests/SDL/randomshapetest.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -300,8 +300,8 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); - white = GP_ColorToPixel(&context, GP_COL_WHITE); - black = GP_ColorToPixel(&context, GP_COL_BLACK); + white = GP_ColorToContextPixel(GP_COL_WHITE, &context); + black = GP_ColorToContextPixel(GP_COL_BLACK, &context); /* Set up the refresh timer */ timer = SDL_AddTimer(60, timer_callback, NULL); diff --git a/tests/SDL/shapetest.c b/tests/SDL/shapetest.c index 3c61629..d270528 100644 --- a/tests/SDL/shapetest.c +++ b/tests/SDL/shapetest.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -507,13 +507,13 @@ int main(int argc, char ** argv) GP_SDL_ContextFromSurface(&context, display); /* Load colors compatible with the display */ - black = GP_ColorToPixel(&context, GP_COL_BLACK); - white = GP_ColorToPixel(&context, GP_COL_WHITE); - yellow = GP_ColorToPixel(&context, GP_COL_YELLOW); - green = GP_ColorToPixel(&context, GP_COL_GREEN); - red = GP_ColorToPixel(&context, GP_COL_RED); - gray = GP_ColorToPixel(&context, GP_COL_GRAY_LIGHT); - darkgray = GP_ColorToPixel(&context, GP_COL_GRAY_DARK); + black = GP_ColorToContextPixel(GP_COL_BLACK, &context); + white = GP_ColorToContextPixel(GP_COL_WHITE, &context); + yellow = GP_ColorToContextPixel(GP_COL_YELLOW, &context); + green = GP_ColorToContextPixel(GP_COL_GREEN, &context); + red = GP_ColorToContextPixel(GP_COL_RED, &context); + gray = GP_ColorToContextPixel(GP_COL_GRAY_LIGHT, &context); + darkgray = GP_ColorToContextPixel(GP_COL_GRAY_DARK, &context); /* Set up the refresh timer */ timer = SDL_AddTimer(60, timer_callback, NULL); diff --git a/tests/SDL/sierpinsky.c b/tests/SDL/sierpinsky.c index b2e6dd8..04ad559 100644 --- a/tests/SDL/sierpinsky.c +++ b/tests/SDL/sierpinsky.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -114,7 +114,8 @@ static void draw(int x, int y, int l, int iter) int paused = 0; -Uint32 timer_callback(Uint32 interval __attribute__ ((unused)), void *ptr __attribute__ ((unused))) +Uint32 timer_callback(Uint32 interval __attribute__ ((unused)), + void *ptr __attribute__ ((unused))) { if (paused) return TIMER_TICK; @@ -162,10 +163,10 @@ int main(void) display = SDL_GetVideoSurface(); context = GP_GetBackendVideoContext(); - black = GP_ColorToPixel(context, GP_COL_BLACK); - blue = GP_ColorToPixel(context, GP_COL_BLUE); - gray = GP_ColorToPixel(context, GP_COL_GRAY_LIGHT); - red = GP_ColorToPixel(context, GP_COL_RED); + black = GP_ColorToContextPixel(GP_COL_BLACK, context); + blue = GP_ColorToContextPixel(GP_COL_BLUE, context); + gray = GP_ColorToContextPixel(GP_COL_GRAY_LIGHT, context); + red = GP_ColorToContextPixel(GP_COL_RED, context); iter = 0; draw(display->w/2, display->h/2, l, iter); diff --git a/tests/SDL/subcontext.c b/tests/SDL/subcontext.c index b8f68c4..bbdfeae 100644 --- a/tests/SDL/subcontext.c +++ b/tests/SDL/subcontext.c @@ -31,7 +31,7 @@ #include "GP.h" #include "GP_SDL.h" -static GP_Pixel black, white, gray, red, green; +static GP_Pixel black, white, gray; SDL_Surface *display = NULL; GP_Context context, *sub_context; @@ -256,11 +256,9 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); - black = GP_ColorToPixel(&context, GP_COL_BLACK); - white = GP_ColorToPixel(&context, GP_COL_WHITE); - gray = GP_ColorToPixel(&context, GP_COL_GRAY_DARK); - red = GP_ColorToPixel(&context, GP_COL_RED); - green = GP_ColorToPixel(&context, GP_COL_GREEN); + black = GP_ColorToContextPixel(GP_COL_BLACK, &context); + white = GP_ColorToContextPixel(GP_COL_WHITE, &context); + gray = GP_ColorToContextPixel(GP_COL_GRAY_DARK, &context); sub_context = GP_ContextSubContext(&context, 100, 100, 440, 280); GP_Fill(sub_context, gray); diff --git a/tests/SDL/symbolstest.c b/tests/SDL/symbolstest.c index e7fd0a3..be96422 100644 --- a/tests/SDL/symbolstest.c +++ b/tests/SDL/symbolstest.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); - black = GP_ColorToPixel(&context, GP_COL_BLACK); + black = GP_ColorToContextPixel(GP_COL_BLACK, &context); /* Set up the refresh timer */ timer = SDL_AddTimer(60, timer_callback, NULL); diff --git a/tests/SDL/textaligntest.c b/tests/SDL/textaligntest.c index 0ecad33..507b560 100644 --- a/tests/SDL/textaligntest.c +++ b/tests/SDL/textaligntest.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -159,12 +159,12 @@ int main(void) GP_SDL_ContextFromSurface(&context, display); /* Load colors suitable for the display */ - black_pixel = GP_ColorToPixel(&context, GP_COL_BLACK); - red_pixel = GP_ColorToPixel(&context, GP_COL_RED); - blue_pixel = GP_ColorToPixel(&context, GP_COL_BLUE); - green_pixel = GP_ColorToPixel(&context, GP_COL_GREEN); - yellow_pixel = GP_ColorToPixel(&context, GP_COL_YELLOW); - darkgray_pixel = GP_ColorToPixel(&context, GP_COL_GRAY_DARK); + black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, &context); + red_pixel = GP_ColorToContextPixel(GP_COL_RED, &context); + blue_pixel = GP_ColorToContextPixel(GP_COL_BLUE, &context); + green_pixel = GP_ColorToContextPixel(GP_COL_GREEN, &context); + yellow_pixel = GP_ColorToContextPixel(GP_COL_YELLOW, &context); + darkgray_pixel = GP_ColorToContextPixel(GP_COL_GRAY_DARK, &context); redraw_screen(); SDL_Flip(display); diff --git a/tests/SDL/trianglefps.c b/tests/SDL/trianglefps.c index cf163bf..5eda430 100644 --- a/tests/SDL/trianglefps.c +++ b/tests/SDL/trianglefps.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -159,8 +159,8 @@ int main(int argc, char ** argv) GP_SDL_ContextFromSurface(&context, display); - white = GP_ColorToPixel(&context, GP_COL_WHITE); - black = GP_ColorToPixel(&context, GP_COL_BLACK); + white = GP_ColorToContextPixel(GP_COL_WHITE, &context); + black = GP_ColorToContextPixel(GP_COL_BLACK, &context); /* Set up the timer */ timer = SDL_AddTimer(1000, timer_callback, NULL); http://repo.or.cz/w/gfxprim.git/commit/831f6b2be47a611581e47f7616516bc70c9d… commit 831f6b2be47a611581e47f7616516bc70c9d91c7 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Oct 15 15:46:36 2011 +0200 Remove unneeded header dependencies. diff --git a/include/core/GP_Core.h b/include/core/GP_Core.h index b080db7..9bd927f 100644 --- a/include/core/GP_Core.h +++ b/include/core/GP_Core.h @@ -56,4 +56,7 @@ /* Debug and debug level */ #include "core/GP_Debug.h" +/* Color */ +#include "core/GP_Color.h" + #endif /* GP_CORE_H */ diff --git a/include/gfx/GP_Gfx.h b/include/gfx/GP_Gfx.h index 4639b1f..5ab2f03 100644 --- a/include/gfx/GP_Gfx.h +++ b/include/gfx/GP_Gfx.h @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -33,13 +33,9 @@ #define GP_GFX_H /* basic definitions and structures */ -#include "core/GP_Common.h" -#include "core/GP_Types.h" -#include "core/GP_Transform.h" #include "core/GP_Context.h" -#include "core/GP_WritePixel.h" #include "core/GP_GetPutPixel.h" -#include "core/GP_Color.h" +#include "core/GP_WritePixel.h" /* public drawing API */ #include "GP_Fill.h" ----------------------------------------------------------------------- Summary of changes: include/core/GP_Color.h | 57 ++++++++++++++++++++++++++++++++-- include/core/GP_Core.h | 3 ++ include/gfx/GP_Gfx.h | 8 +---- libs/core/GP_Color.c | 46 +++++++++++++++++----------- tests/SDL/blittest.c | 4 +- tests/SDL/fileview.c | 14 ++++---- tests/SDL/fonttest.c | 14 ++++---- tests/SDL/input.c | 71 +++++++++---------------------------------- tests/SDL/linetest.c | 6 ++-- tests/SDL/pixeltest.c | 37 ++++++++-------------- tests/SDL/randomshapetest.c | 6 ++-- tests/SDL/shapetest.c | 16 +++++----- tests/SDL/sierpinsky.c | 13 ++++---- tests/SDL/subcontext.c | 10 ++---- tests/SDL/symbolstest.c | 4 +- tests/SDL/textaligntest.c | 14 ++++---- tests/SDL/trianglefps.c | 6 ++-- 17 files changed, 168 insertions(+), 161 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: f6c5774e42d209fcc3bff4acb515739172dfdb97
by metan 15 Oct '11

15 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via f6c5774e42d209fcc3bff4acb515739172dfdb97 (commit) from aa38ffc5adc9cd8ed510838924a420eab3e64ce2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/f6c5774e42d209fcc3bff4acb515739172df… commit f6c5774e42d209fcc3bff4acb515739172dfdb97 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Oct 15 11:58:53 2011 +0200 Fix include. diff --git a/include/filters/GP_Point.h b/include/filters/GP_Point.h index 8ef935b..b5e7d50 100644 --- a/include/filters/GP_Point.h +++ b/include/filters/GP_Point.h @@ -29,7 +29,7 @@ #ifndef GP_POINT_H #define GP_POINT_H -#include <GP_Context.h> +#include "core/GP_Context.h" /* * Brightness filter. ----------------------------------------------------------------------- Summary of changes: include/filters/GP_Point.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0