February 2012 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: 7b23123f57a91074e51df400c9a0a8bee83c69e0
by metan 27 Feb '12

27 Feb '12

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, master has been updated via 7b23123f57a91074e51df400c9a0a8bee83c69e0 (commit) from a9486419936ccda09e41e401ae9481915aeb8ec8 (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/7b23123f57a91074e51df400c9a0a8bee83c… commit 7b23123f57a91074e51df400c9a0a8bee83c69e0 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Feb 27 13:35:58 2012 +0000 input: Another round of abs event fixes. diff --git a/include/input/GP_InputDriverLinux.h b/include/input/GP_InputDriverLinux.h index 4f7283f..56aef23 100644 --- a/include/input/GP_InputDriverLinux.h +++ b/include/input/GP_InputDriverLinux.h @@ -50,7 +50,8 @@ typedef struct GP_InputDriverLinux { int abs_y_max; int abs_press_max; - uint8_t abs_flag:1; + uint8_t abs_flag_x:1; + uint8_t abs_flag_y:1; uint8_t abs_pen_flag:1; } GP_InputDriverLinux; diff --git a/libs/input/GP_Event.c b/libs/input/GP_Event.c index e223ab3..fb8c7d8 100644 --- a/libs/input/GP_Event.c +++ b/libs/input/GP_Event.c @@ -253,11 +253,16 @@ void GP_EventPushAbs(uint32_t x, uint32_t y, uint32_t pressure, set_time(time); - /* set global cursor, pressure == 0 is penup */ - if (pressure != 0) { + /* + * Set global cursor, the packet could be partial, eg. update only x or + * only y. In such case x_max or y_max is zero. + */ + + if (x_max != 0) cur_state.cursor_x = x * (screen_w - 1) / x_max; + + if (y_max != 0) cur_state.cursor_y = y * (screen_h - 1) / 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 f140d9e..fe514c1 100644 --- a/libs/input/GP_InputDriverLinux.c +++ b/libs/input/GP_InputDriverLinux.c @@ -138,8 +138,9 @@ struct GP_InputDriverLinux *GP_InputDriverLinuxOpen(const char *path) ret->abs_x = 0; ret->abs_y = 0; ret->abs_press = 0; - ret->abs_flag = 0; - ret->abs_pen_flag = 0; + ret->abs_flag_x = 0; + ret->abs_flag_y = 0; + ret->abs_pen_flag = 1; try_load_callibration(ret); @@ -180,17 +181,16 @@ static void input_abs(struct GP_InputDriverLinux *self, struct input_event *ev) switch (ev->code) { case ABS_X: self->abs_x = ev->value; - self->abs_flag = 1; + self->abs_flag_x = 1; GP_DEBUG(4, "ABS X %i", ev->value); break; case ABS_Y: self->abs_y = ev->value; - self->abs_flag = 1; + self->abs_flag_y = 1; GP_DEBUG(4, "ABS Y %i", ev->value); break; case ABS_PRESSURE: self->abs_press = ev->value; - self->abs_flag = 1; break; default: GP_DEBUG(3, "Unhandled code %i", ev->code); @@ -224,26 +224,40 @@ static void do_sync(struct GP_InputDriverLinux *self) self->rel_y = 0; } - if (self->abs_flag) { - self->abs_flag = 0; - - if (self->abs_x > self->abs_x_max) - self->abs_x = self->abs_x_max; - - if (self->abs_y > self->abs_y_max) - self->abs_y = self->abs_y_max; + if (self->abs_flag_x || self->abs_flag_y) { + uint32_t x = 0, y = 0, x_max = 0, y_max = 0; + + if (self->abs_flag_x) { + /* clipping */ + if (self->abs_x > self->abs_x_max) + self->abs_x = self->abs_x_max; - if (self->abs_x < 0) - self->abs_x = 0; + if (self->abs_x < 0) + self->abs_x = 0; + + x = self->abs_x; + x_max = self->abs_x_max; + + self->abs_flag_x = 0; + } + + if (self->abs_flag_y) { + /* clipping */ + if (self->abs_y > self->abs_y_max) + self->abs_y = self->abs_y_max; - if (self->abs_y < 0) - self->abs_y = 0; + if (self->abs_y < 0) + self->abs_y = 0; + + y = self->abs_y; + y_max = self->abs_y_max; + + self->abs_flag_y = 0; + } - GP_EventPushAbs(self->abs_x, self->abs_y, self->abs_press, - self->abs_x_max, self->abs_y_max, + GP_EventPushAbs(x, y, self->abs_press, x_max, y_max, self->abs_press_max, NULL); - self->abs_x = 0; - self->abs_y = 0; + self->abs_press = 0; if (self->abs_pen_flag) { ----------------------------------------------------------------------- Summary of changes: include/input/GP_InputDriverLinux.h | 3 +- libs/input/GP_Event.c | 11 +++++-- libs/input/GP_InputDriverLinux.c | 56 ++++++++++++++++++++++------------- 3 files changed, 45 insertions(+), 25 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 master updated: a9486419936ccda09e41e401ae9481915aeb8ec8
by metan 26 Feb '12

26 Feb '12

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, master has been updated via a9486419936ccda09e41e401ae9481915aeb8ec8 (commit) via 778ffdcb824b9141f5f6f13de981ed62827cab52 (commit) from 36e390ff64ddb40ea5c6cc58ed6e74db02252b09 (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/a9486419936ccda09e41e401ae9481915aeb… commit a9486419936ccda09e41e401ae9481915aeb8ec8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 23:23:11 2012 +0000 input: Fix a few problems with absolute input device. diff --git a/include/input/GP_InputDriverLinux.h b/include/input/GP_InputDriverLinux.h index ea5b370..4f7283f 100644 --- a/include/input/GP_InputDriverLinux.h +++ b/include/input/GP_InputDriverLinux.h @@ -45,12 +45,13 @@ typedef struct GP_InputDriverLinux { 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; + uint8_t abs_flag:1; + uint8_t abs_pen_flag:1; } GP_InputDriverLinux; /* diff --git a/libs/input/GP_InputDriverLinux.c b/libs/input/GP_InputDriverLinux.c index 05557dd..f140d9e 100644 --- a/libs/input/GP_InputDriverLinux.c +++ b/libs/input/GP_InputDriverLinux.c @@ -82,17 +82,20 @@ void try_load_callibration(struct GP_InputDriverLinux *self) } if (!ioctl(self->fd, EVIOCGABS(ABS_X), abs)) { - GP_DEBUG(3, "ABS X = <%i,%i>", abs[1], abs[2]); + GP_DEBUG(3, "ABS X = <%i,%i> Fuzz %i Flat %i", + abs[1], abs[2], abs[3], abs[4]); 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]); + GP_DEBUG(3, "ABS Y = <%i,%i> Fuzz %i Flat %i", + abs[1], abs[2], abs[3], abs[4]); 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]); + GP_DEBUG(3, "ABS P = <%i,%i> Fuzz %i Flat %i", + abs[1], abs[2], abs[3], abs[4]); self->abs_press_max = abs[2]; } } @@ -136,6 +139,7 @@ struct GP_InputDriverLinux *GP_InputDriverLinuxOpen(const char *path) ret->abs_y = 0; ret->abs_press = 0; ret->abs_flag = 0; + ret->abs_pen_flag = 0; try_load_callibration(ret); @@ -177,10 +181,12 @@ static void input_abs(struct GP_InputDriverLinux *self, struct input_event *ev) case ABS_X: self->abs_x = ev->value; self->abs_flag = 1; + GP_DEBUG(4, "ABS X %i", ev->value); break; case ABS_Y: self->abs_y = ev->value; self->abs_flag = 1; + GP_DEBUG(4, "ABS Y %i", ev->value); break; case ABS_PRESSURE: self->abs_press = ev->value; @@ -194,8 +200,17 @@ 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(4, "Key event"); - - (void) self; + + /* + * We need to postpone btn touch down until + * we read new coordinates for cursor. + */ + if (ev->code == BTN_TOUCH) { + if (ev->value == 0) + self->abs_pen_flag = 1; + else + return; + } GP_EventPushKey(ev->code, ev->value, NULL); } @@ -211,12 +226,30 @@ static void do_sync(struct GP_InputDriverLinux *self) if (self->abs_flag) { self->abs_flag = 0; + + if (self->abs_x > self->abs_x_max) + self->abs_x = self->abs_x_max; + + if (self->abs_y > self->abs_y_max) + self->abs_y = self->abs_y_max; + + if (self->abs_x < 0) + self->abs_x = 0; + + if (self->abs_y < 0) + self->abs_y = 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; + + if (self->abs_pen_flag) { + GP_EventPushKey(BTN_TOUCH, 1, NULL); + self->abs_pen_flag = 0; + } } } http://repo.or.cz/w/gfxprim.git/commit/778ffdcb824b9141f5f6f13de981ed62827c… commit 778ffdcb824b9141f5f6f13de981ed62827cab52 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 22:46:16 2012 +0000 input: Fix Absolute event to cursor overflow. diff --git a/libs/input/GP_Event.c b/libs/input/GP_Event.c index 01afef2..e223ab3 100644 --- a/libs/input/GP_Event.c +++ b/libs/input/GP_Event.c @@ -255,8 +255,8 @@ void GP_EventPushAbs(uint32_t x, uint32_t y, uint32_t pressure, /* 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; + cur_state.cursor_x = x * (screen_w - 1) / x_max; + cur_state.cursor_y = y * (screen_h - 1) / y_max; } /* put it into queue */ ----------------------------------------------------------------------- Summary of changes: include/input/GP_InputDriverLinux.h | 5 ++- libs/input/GP_Event.c | 4 +- libs/input/GP_InputDriverLinux.c | 43 ++++++++++++++++++++++++++++++---- 3 files changed, 43 insertions(+), 9 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 master updated: 36e390ff64ddb40ea5c6cc58ed6e74db02252b09
by metan 25 Feb '12

25 Feb '12

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, master has been updated via 36e390ff64ddb40ea5c6cc58ed6e74db02252b09 (commit) from f204dcfe752e123a63561b343553d0defc555bc5 (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/36e390ff64ddb40ea5c6cc58ed6e74db0225… commit 36e390ff64ddb40ea5c6cc58ed6e74db02252b09 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 20:42:25 2012 +0100 build: Use python-config (this fixes build for python 2.7 and 3.0) diff --git a/config.mk b/config.mk index f17232b..676922c 100644 --- a/config.mk +++ b/config.mk @@ -4,7 +4,7 @@ CFLAGS+=-I$(TOPDIR)/include/ # path to local module directory PYLIBSDIR=$(TOPDIR)/pylib -PYTHON_INCLUDE=/usr/include/python2.6 +PYTHON_INCLUDE=`python-config --include` # To test with other python versions (example): #PYTHON_BIN=${TOPDIR}/virtualpy2.4/bin/python ----------------------------------------------------------------------- Summary of changes: config.mk | 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 master updated: f204dcfe752e123a63561b343553d0defc555bc5
by metan 25 Feb '12

25 Feb '12

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, master has been updated via f204dcfe752e123a63561b343553d0defc555bc5 (commit) via f0ab60cffc42320eec3a382b41cf2c2cd39cc185 (commit) via d1663ce40262b937f7ce441166b1a25ee192675b (commit) via 87e8a9fd81c221077bae24acffeb3cabda7bd0ea (commit) via 9201450e2ccac1ed1d663661cb35eb4f54b3e92a (commit) via 728d939d4eb86089c8c09a13c6e7b8694a067d2c (commit) via 2f2ccc529e4ea63e975e7815f0259f2ff3711deb (commit) via 56312f60da9d1cd165f522489a4c8b1821ec2820 (commit) via 2465d9f19ff464a62ca5a8488188cf234eac2fc0 (commit) via e345fda1e7684c1869952e03d5cf6b88b8116499 (commit) via 42ef30f3b79bde06f2081ce92ff3b141771a5051 (commit) via 6e75cff5b5c5a6cd6986304f3a75aecf6fd05010 (commit) via cd95c746b36256361430395355e7f6f308f36b44 (commit) via 14fc5c33518764dfb5a938c5aa5a38ce4810badf (commit) via 1815d235fb569edde9ce1a16bc0df773cbd6e51b (commit) via 045bf5ca3eb9490641721f1fe995da9b2f7995ff (commit) via ae9991521c625c6e992a7f41e776a4df5f26e27c (commit) via 688f686e2af5d8b93644a133b5d78306f75ba33b (commit) via 6e374f36d66099a2b22f2159f8e01f29a5b6e93b (commit) via 292cb728884ef43f466027f5a5b7425db253c844 (commit) via 3b82597d1e2542af499e250d84f34d98721833e7 (commit) via 258d6567abfed2915878ef6464514ab612139120 (commit) via d495753c9dc9129b0511b3dc59e0fff2884c3e2b (commit) via 4ec758f1d45d859fbf84bff6e8a314c1192f3b68 (commit) via ba3602872b1b7c717a0c82d4937380feee6240d0 (commit) via 83704e9f8be3359c9be0b4c2a9569b5aa4aa0812 (commit) via bee9bc07dfddc0a717246842c29b79cbaa26ab24 (commit) via 31d264d14f9777dd0e934fedb2b0af0665a0b3f7 (commit) via 0aed5090e5722d19b06bf91f6652923b1127a2c9 (commit) via 96cff89699672066b2a8f18043d8455a46add474 (commit) via 41a2719db7086efe7c888a3acc2807295bcef640 (commit) via d6538118cb90b513bbe82c90f7aa5c23b051050b (commit) via 85343b9e91ec90b29ea7cd3b568376154bd2b3df (commit) via 39401ddcc823b061542a35fd3020a5de5cf182be (commit) via ed8672e72135a52839ca300b6e1253ae9cecad1a (commit) via 3fb898da008ec9e178806abe426fe79a28caa294 (commit) via 2255767fb838329bd6c40f7b813763f652ac400f (commit) via 3088a1c77b7ad67a580c40f65d8e9d84d218ba3d (commit) via 4e3bac15c5bd717e954cb7c431a12b6583691347 (commit) via 33609c5ab7aabd7b13a1d013cb849e2ef21ddb32 (commit) via ca726c8da26dfd21e5abd6f197ab3473b5133695 (commit) via 88080e9a2b9c406de4214a878cc42bc478785132 (commit) via 1832d27ef46a9075db864ed0c5dee236ce1ac940 (commit) via ca4d1e00c41ace34e8db1f806204fe0aa36dc0d9 (commit) via 967e802a258863e45da3f143f66d298cb5201824 (commit) via 61a39f1c06288ddae8c94a7c1c2e363d14619839 (commit) via 0f2c026b6360e700cf3f1a87d0031a5760523886 (commit) via 79e7ced60aec15842bb5c7c8620b69d5a2689f1b (commit) via ce520ce10439ac3e63d5819e136ee623d5531206 (commit) via 7a8c83f1ad322edbb2043c40fe8d653cdad0a881 (commit) via ac154bd7aed285ba0abd85c0ba30ffe6d913b0b9 (commit) via 5827000a1971b8ffd2a91f01bbd65da6e4779e9e (commit) via ab8476d63945f607819a2e3b2fdd998f90fb8fb7 (commit) via 0c4bfea569c5fc142b2b2dfe88eae6fb1af1bb4c (commit) via 79c70696f823e96d2c85d07035fefc109f62db7d (commit) via d028c5b88bfbe818f650dac41671b7dc74fab584 (commit) via 133b310ce8ca4adc61f14648dee634a00d5cf077 (commit) via 75272ddef49127d165aa2e041fcb49f5bdf437dd (commit) via 3428c6433249fc771dc355438cd47d7d3abfd70d (commit) via 116c09aa2a1efd689e4c2a66ad11d55988374983 (commit) via 9fb8ec2881f24724d6fe71bbfecb7524e95053a7 (commit) via 22d47ec8e304affafa567d890965992088bd08a6 (commit) via 64ec17d6274119e321accf352b452b0a4d664097 (commit) via 040d6abf67aeacd29d59f99b9c991ae60e1f664c (commit) via 3cca227bd9d97802da766c2feca0bb537c038b16 (commit) via 2a44791a84f6aa540897532ea8a0e0d2e4e5ae10 (commit) via 7d61d1587e55d2634695e2f3b87e8a278e730b0c (commit) via 6f26bf8d5bdee13bca518a15e5c22f6604adae78 (commit) via 1f50377122afb02f1e82197f29a309342856e77b (commit) via 2393f81c77be4ef152fb92bdbb3c0afab32b460f (commit) from d59f5e243f22d8a2e91c2fb6a818503dafc75487 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .gitignore | 5 +- Makefile | 7 +- build/Makefile | 2 + config.mk | 13 +++ configure | 1 + demos/py_simple/gravplots_AA.py | 111 ++++++++++++++++++++ demos/py_simple/plot.py | 85 +++++++++++++++ demos/py_simple/runpytest.sh | 9 ++ demos/py_simple/sinplots_AA.py | 59 +++++++++++ include/core/GP_Common.h | 18 +++- include/core/GP_Core.h | 11 ++- include/core/GP_Counter.h | 4 +- include/core/GP_Pixel.h | 7 +- include/core/Makefile | 2 +- lib.mk | 4 +- tests/core/GP_Blit.test.c => libs/core/GP_Common.c | 11 +- libs/core/GP_Context.c | 1 + pylib/Makefile | 1 + pylib/bin/generate_collected_tests.py | 2 +- pylib/bin/generate_file.py | 2 +- pylib/gfxprim/Makefile | 4 + pylib/gfxprim/__init__.py | 21 +++- pylib/gfxprim/backends/C.py | 3 + pylib/gfxprim/backends/Makefile | 10 ++ pylib/gfxprim/backends/__init__.py | 47 ++++++++ pylib/gfxprim/backends/_extend_backend.py | 30 ++++++ pylib/gfxprim/backends/_extend_context.py | 8 ++ pylib/gfxprim/backends/backends.i | 48 +++++++++ pylib/gfxprim/core/C.py | 3 + pylib/gfxprim/core/Makefile | 8 ++ pylib/gfxprim/core/__init__.py | 39 +++++++ pylib/gfxprim/core/_extend_context.py | 60 +++++++++++ pylib/gfxprim/core/core.i | 106 +++++++++++++++++++ pylib/gfxprim/filters/C.py | 3 + pylib/gfxprim/filters/Makefile | 9 ++ pylib/gfxprim/filters/__init__.py | 26 +++++ pylib/gfxprim/filters/filters.i | 26 +++++ pylib/gfxprim/gfx/C.py | 3 + pylib/gfxprim/gfx/Makefile | 9 ++ pylib/gfxprim/gfx/__init__.py | 27 +++++ pylib/gfxprim/gfx/gfx.i | 37 +++++++ {libs => pylib/gfxprim}/loaders/Makefile | 9 +- pylib/gfxprim/loaders/__init__.py | 24 ++++ pylib/gfxprim/loaders/_extend_context.py | 41 +++++++ pylib/gfxprim/loaders/loaders.i | 35 ++++++ pylib/gfxprim/silence_swig_warnings.mk | 4 + pylib/gfxprim/text/C.py | 3 + pylib/gfxprim/text/Makefile | 9 ++ pylib/gfxprim/text/__init__.py | 27 +++++ pylib/gfxprim/text/text.i | 23 ++++ pylib/gfxprim/utils.py | 64 +++++++++++ pylib/{gfxprim => gp_codegen}/README | 0 pylib/{gfxprim => gp_codegen}/__init__.py | 0 pylib/{gfxprim => gp_codegen}/gfxprimconfig.py | 6 +- pylib/{gfxprim => gp_codegen}/pixelsize.py | 0 pylib/{gfxprim => gp_codegen}/pixeltype.py | 2 +- pylib/{gfxprim => gp_codegen}/render_utils.py | 14 ++- pylib/{gfxprim => gp_codegen}/test_collection.py | 2 +- pylib/{gfxprim => }/pylint.conf | 0 pywrap.mk | 36 +++++++ 60 files changed, 1139 insertions(+), 42 deletions(-) create mode 100755 demos/py_simple/gravplots_AA.py create mode 100755 demos/py_simple/plot.py create mode 100755 demos/py_simple/runpytest.sh create mode 100755 demos/py_simple/sinplots_AA.py copy tests/core/GP_Blit.test.c => libs/core/GP_Common.c (91%) create mode 100644 pylib/gfxprim/Makefile create mode 100644 pylib/gfxprim/backends/C.py create mode 100644 pylib/gfxprim/backends/Makefile create mode 100644 pylib/gfxprim/backends/__init__.py create mode 100644 pylib/gfxprim/backends/_extend_backend.py create mode 100644 pylib/gfxprim/backends/_extend_context.py create mode 100644 pylib/gfxprim/backends/backends.i create mode 100644 pylib/gfxprim/core/C.py create mode 100644 pylib/gfxprim/core/Makefile create mode 100644 pylib/gfxprim/core/__init__.py create mode 100644 pylib/gfxprim/core/_extend_context.py create mode 100644 pylib/gfxprim/core/core.i create mode 100644 pylib/gfxprim/filters/C.py create mode 100644 pylib/gfxprim/filters/Makefile create mode 100644 pylib/gfxprim/filters/__init__.py create mode 100644 pylib/gfxprim/filters/filters.i create mode 100644 pylib/gfxprim/gfx/C.py create mode 100644 pylib/gfxprim/gfx/Makefile create mode 100644 pylib/gfxprim/gfx/__init__.py create mode 100644 pylib/gfxprim/gfx/gfx.i copy {libs => pylib/gfxprim}/loaders/Makefile (50%) create mode 100644 pylib/gfxprim/loaders/__init__.py create mode 100644 pylib/gfxprim/loaders/_extend_context.py create mode 100644 pylib/gfxprim/loaders/loaders.i create mode 100644 pylib/gfxprim/silence_swig_warnings.mk create mode 100644 pylib/gfxprim/text/C.py create mode 100644 pylib/gfxprim/text/Makefile create mode 100644 pylib/gfxprim/text/__init__.py create mode 100644 pylib/gfxprim/text/text.i create mode 100644 pylib/gfxprim/utils.py rename pylib/{gfxprim => gp_codegen}/README (100%) copy pylib/{gfxprim => gp_codegen}/__init__.py (100%) rename pylib/{gfxprim => gp_codegen}/gfxprimconfig.py (93%) rename pylib/{gfxprim => gp_codegen}/pixelsize.py (100%) rename pylib/{gfxprim => gp_codegen}/pixeltype.py (97%) rename pylib/{gfxprim => gp_codegen}/render_utils.py (91%) rename pylib/{gfxprim => gp_codegen}/test_collection.py (97%) rename pylib/{gfxprim => }/pylint.conf (100%) create mode 100644 pywrap.mk 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 pywrap updated: f204dcfe752e123a63561b343553d0defc555bc5
by metan 25 Feb '12

25 Feb '12

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, pywrap has been updated via f204dcfe752e123a63561b343553d0defc555bc5 (commit) from f0ab60cffc42320eec3a382b41cf2c2cd39cc185 (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/f204dcfe752e123a63561b343553d0defc55… commit f204dcfe752e123a63561b343553d0defc555bc5 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 19:41:04 2012 +0100 demos: Simple python function plotter. diff --git a/demos/py_simple/plot.py b/demos/py_simple/plot.py new file mode 100755 index 0000000..96ce3e3 --- /dev/null +++ b/demos/py_simple/plot.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python +import gfxprim.core as core +import gfxprim.backends as backends +import gfxprim.gfx as gfx +import sys +from math import * + +W = 640 +H = 480 +EPS = 0.05 + +env = {} +env['sin'] = sin +env['cos'] = cos +env['sqrt'] = sqrt + +def compute(func, x, y_min, y_max): + env['x'] = x + try: + ret = eval(func, env) + except ZeroDivisionError, d: + return -1 + + return - H * ret / (y_max - y_min) + (H * y_max) / (y_max - y_min) + +def x_to_x(x, x_min, x_max): + return (x_max - x_min) * x / W + x_min + +class plotter(object): + def __init__(self, func, x_min, x_max, y_min, y_max): + self.x = 0.0 + self.y = compute(func, x_to_x(self.x, x_min, x_max), y_min, y_max) + self.y_min = y_min + self.y_max = y_max + self.x_min = x_min + self.x_max = x_max + self.func = func + def next(self): + x = x_to_x(self.x + 1, self.x_min, self.x_max) + new_y = compute(self.func, x, self.y_min, self.y_max) + + inc = 1.0 + + while (abs(new_y - self.y) > 1 and inc > EPS): + x = x_to_x(self.x + inc, self.x_min, self.x_max) + new_y = compute(self.func, x, self.y_min, self.y_max) + inc /= 2 + + self.x += inc + self.y = new_y + + print self.x, self.y + + +def main(): + bk = backends.BackendSDLInit(W, H, 0, 0, "Plot AA") + assert bk + print bk + print "Modify source for parameters," + print "Kill to terminate ;-)" + print "Usage: function x_min x_max y_min y_max" + black = bk.context.RGBToPixel(0, 0, 0) + + x_min = float(sys.argv[2]) + x_max = float(sys.argv[3]) + y_min = float(sys.argv[4]) + y_max = float(sys.argv[5]) + p = plotter(sys.argv[1], x_min, x_max, y_min, y_max) + + r = 255 + g = 0 + b = 0 + + while p.x < W: + x = int((p.x + 0.5) * 0x100) + y = int((p.y + 0.5) * 0x100) + gfx.PutPixelAA(bk.context, x, y, bk.context.RGBToPixel(int(r), int(g), int(b))) + bk.Flip() + p.next() + + while True: + pass + +if __name__ == '__main__': + main() ----------------------------------------------------------------------- Summary of changes: demos/py_simple/plot.py | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) create mode 100755 demos/py_simple/plot.py 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 pywrap updated: f0ab60cffc42320eec3a382b41cf2c2cd39cc185
by metan 25 Feb '12

25 Feb '12

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, pywrap has been updated via f0ab60cffc42320eec3a382b41cf2c2cd39cc185 (commit) from d1663ce40262b937f7ce441166b1a25ee192675b (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/f0ab60cffc42320eec3a382b41cf2c2cd39c… commit f0ab60cffc42320eec3a382b41cf2c2cd39cc185 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 16:19:03 2012 +0100 pywrap: Fix swig warnings, one was real, the rest is silenced. diff --git a/pylib/gfxprim/backends/Makefile b/pylib/gfxprim/backends/Makefile index 66f7833..4d2649e 100644 --- a/pylib/gfxprim/backends/Makefile +++ b/pylib/gfxprim/backends/Makefile @@ -6,3 +6,5 @@ LDLIBS+=-lGP_backends -lSDL include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk include $(TOPDIR)/post.mk + +include ../silence_swig_warnings.mk diff --git a/pylib/gfxprim/backends/backends.i b/pylib/gfxprim/backends/backends.i index 1592509..4785281 100644 --- a/pylib/gfxprim/backends/backends.i +++ b/pylib/gfxprim/backends/backends.i @@ -3,6 +3,7 @@ %{ #include "GP_Backend.h" #include "GP_Backends.h" +#include "core/GP_Debug.h" %} #define __attribute__(X) diff --git a/pylib/gfxprim/core/Makefile b/pylib/gfxprim/core/Makefile index 5d655a8..0ee5e15 100644 --- a/pylib/gfxprim/core/Makefile +++ b/pylib/gfxprim/core/Makefile @@ -4,3 +4,5 @@ LIBNAME=core include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk include $(TOPDIR)/post.mk + +include ../silence_swig_warnings.mk diff --git a/pylib/gfxprim/filters/Makefile b/pylib/gfxprim/filters/Makefile index b1faad7..a7f3dbe 100644 --- a/pylib/gfxprim/filters/Makefile +++ b/pylib/gfxprim/filters/Makefile @@ -5,3 +5,5 @@ INCLUDE=core include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk include $(TOPDIR)/post.mk + +include ../silence_swig_warnings.mk diff --git a/pylib/gfxprim/gfx/Makefile b/pylib/gfxprim/gfx/Makefile index e8ba808..69a74e4 100644 --- a/pylib/gfxprim/gfx/Makefile +++ b/pylib/gfxprim/gfx/Makefile @@ -5,3 +5,5 @@ INCLUDE=core include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk include $(TOPDIR)/post.mk + +include ../silence_swig_warnings.mk diff --git a/pylib/gfxprim/loaders/Makefile b/pylib/gfxprim/loaders/Makefile index 41a94ed..791fc74 100644 --- a/pylib/gfxprim/loaders/Makefile +++ b/pylib/gfxprim/loaders/Makefile @@ -5,3 +5,5 @@ INCLUDE=core include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk include $(TOPDIR)/post.mk + +include ../silence_swig_warnings.mk diff --git a/pylib/gfxprim/silence_swig_warnings.mk b/pylib/gfxprim/silence_swig_warnings.mk new file mode 100644 index 0000000..38916e0 --- /dev/null +++ b/pylib/gfxprim/silence_swig_warnings.mk @@ -0,0 +1,4 @@ +# +# Turn off warnings generated bugs in swig implementation +# +CFLAGS+=-Wno-missing-field-initializers -Wno-unused-parameter diff --git a/pylib/gfxprim/text/Makefile b/pylib/gfxprim/text/Makefile index cebfb3c..1f097e6 100644 --- a/pylib/gfxprim/text/Makefile +++ b/pylib/gfxprim/text/Makefile @@ -5,3 +5,5 @@ INCLUDE=core include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk include $(TOPDIR)/post.mk + +include ../silence_swig_warnings.mk ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/backends/Makefile | 2 ++ pylib/gfxprim/backends/backends.i | 1 + pylib/gfxprim/core/Makefile | 2 ++ pylib/gfxprim/filters/Makefile | 2 ++ pylib/gfxprim/gfx/Makefile | 2 ++ pylib/gfxprim/loaders/Makefile | 2 ++ pylib/gfxprim/silence_swig_warnings.mk | 4 ++++ pylib/gfxprim/text/Makefile | 2 ++ 8 files changed, 17 insertions(+), 0 deletions(-) create mode 100644 pylib/gfxprim/silence_swig_warnings.mk 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 pywrap updated: d1663ce40262b937f7ce441166b1a25ee192675b
by metan 25 Feb '12

25 Feb '12

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, pywrap has been updated via d1663ce40262b937f7ce441166b1a25ee192675b (commit) from 87e8a9fd81c221077bae24acffeb3cabda7bd0ea (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/d1663ce40262b937f7ce441166b1a25ee192… commit d1663ce40262b937f7ce441166b1a25ee192675b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 16:03:05 2012 +0100 build: Fix dependencies in the main Makefile. diff --git a/Makefile b/Makefile index 531d666..7c5480f 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,10 @@ SUBDIRS=include libs tests pylib demos build include post.mk libs: include - -tests: libs -demos: libs +build: libs +tests: build +pylib: build +demos: build distclean: ifdef VERBOSE diff --git a/build/Makefile b/build/Makefile index 1b39ee3..8a7ec11 100644 --- a/build/Makefile +++ b/build/Makefile @@ -3,6 +3,8 @@ LIB_OBJECTS=$(shell ./get_objs.sh) all: libGP.a libGP.so libGP.so.0 .PHONY: libGP.a libGP.so libGP.so.0 +rebuild: all + clean: ifdef VERBOSE rm -f libGP.a libGP.so libGP.so.0 diff --git a/config.mk b/config.mk index 889944f..f17232b 100644 --- a/config.mk +++ b/config.mk @@ -15,3 +15,10 @@ PYTHON=PYTHONPATH=$$PYTHONPATH:${PYLIBSDIR} ${PYTHON_BIN} -Werror SWIGOPTS=-Wextra -w322,314 -I/usr/include/ SWIG=swig + +# +# If set to yes, rebuilds libGP* after typing make +# in any of the libs/*/ directories that are linked +# to libGP*. +# +REBUILD_LIBGP=yes diff --git a/lib.mk b/lib.mk index 1eceafa..c801e07 100644 --- a/lib.mk +++ b/lib.mk @@ -43,10 +43,12 @@ endif else # BUILDLIB = no +include $(TOPDIR)/config.mk +ifeq ($(REBUILD_LIBGP),yes) ALL+=rebuild_lib rebuild_lib: @$(MAKE) --no-print-directory -C $(TOPDIR)/build/ - +endif endif ----------------------------------------------------------------------- Summary of changes: Makefile | 7 ++++--- build/Makefile | 2 ++ config.mk | 7 +++++++ lib.mk | 4 +++- 4 files changed, 16 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 pywrap updated: 87e8a9fd81c221077bae24acffeb3cabda7bd0ea
by metan 25 Feb '12

25 Feb '12

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, pywrap has been updated via 87e8a9fd81c221077bae24acffeb3cabda7bd0ea (commit) from 9201450e2ccac1ed1d663661cb35eb4f54b3e92a (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/87e8a9fd81c221077bae24acffeb3cabda7b… commit 87e8a9fd81c221077bae24acffeb3cabda7bd0ea Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 15:40:35 2012 +0100 build: make clean removes compiled *.pyc files too. diff --git a/pylib/gfxprim/Makefile b/pylib/gfxprim/Makefile index 71ce926..3032f62 100644 --- a/pylib/gfxprim/Makefile +++ b/pylib/gfxprim/Makefile @@ -1,3 +1,4 @@ TOPDIR=../.. SUBDIRS=core loaders backends gfx filters text +CLEAN+=*.pyc include $(TOPDIR)/post.mk diff --git a/pywrap.mk b/pywrap.mk index 014393a..d53041e 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -33,4 +33,4 @@ endif # VERBOSE endif # ifneq ($(SWIG),) -CLEAN+=$(SWIG_C) $(SWIG_PY) $(SWIG_LIB) +CLEAN+=$(SWIG_C) $(SWIG_PY) $(SWIG_LIB) *.pyc ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/Makefile | 1 + pywrap.mk | 2 +- 2 files changed, 2 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 pywrap updated: 9201450e2ccac1ed1d663661cb35eb4f54b3e92a
by metan 25 Feb '12

25 Feb '12

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, pywrap has been updated via 9201450e2ccac1ed1d663661cb35eb4f54b3e92a (commit) via d59f5e243f22d8a2e91c2fb6a818503dafc75487 (commit) from 728d939d4eb86089c8c09a13c6e7b8694a067d2c (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/9201450e2ccac1ed1d663661cb35eb4f54b3… commit 9201450e2ccac1ed1d663661cb35eb4f54b3e92a Merge: 728d939 d59f5e2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 15:30:21 2012 +0100 Merge branch 'master' into pywrap ----------------------------------------------------------------------- Summary of changes: Makefile | 21 +-------------------- 1 files changed, 1 insertions(+), 20 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 master updated: d59f5e243f22d8a2e91c2fb6a818503dafc75487
by metan 25 Feb '12

25 Feb '12

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, master has been updated via d59f5e243f22d8a2e91c2fb6a818503dafc75487 (commit) from 90bea6f18d4e4562f63f196e9029fe2603793e83 (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/d59f5e243f22d8a2e91c2fb6a818503dafc7… commit d59f5e243f22d8a2e91c2fb6a818503dafc75487 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Feb 25 15:27:49 2012 +0100 build: make clean all seems to work now, use at your own risk. diff --git a/Makefile b/Makefile index d180dd5..531d666 100644 --- a/Makefile +++ b/Makefile @@ -1,31 +1,12 @@ TOPDIR=. -SUBDIRS=include libs tests pylib demos +SUBDIRS=include libs tests pylib demos build include post.mk -# -# Make sure tests are build after library and -# rebuild library before entering test just -# to be extra safe. -# -.PHONY: build - libs: include tests: libs demos: libs -build: - @$(MAKE) --no-print-directory -C build clean - @$(MAKE) --no-print-directory -C build - -clean: -ifdef VERBOSE - $(MAKE) -C build clean -else - @echo "DIR /build" - @$(MAKE) --no-print-directory -C build clean -endif - distclean: ifdef VERBOSE rm config.h config.gen.mk ----------------------------------------------------------------------- Summary of changes: Makefile | 21 +-------------------- 1 files changed, 1 insertions(+), 20 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