December 2012 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: c7b776f3628256d94d62b176ccf72743f832fa45
by metan 20 Dec '12

20 Dec '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 c7b776f3628256d94d62b176ccf72743f832fa45 (commit) from b91ac3947efd9ef282fb01e5152b3190f5f1352e (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/c7b776f3628256d94d62b176ccf72743f832… commit c7b776f3628256d94d62b176ccf72743f832fa45 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 17:30:00 2012 +0100 spiv: Add directory traversal code. diff --git a/demos/spiv/image_list.c b/demos/spiv/image_list.c index 390275f..8ed726a 100644 --- a/demos/spiv/image_list.c +++ b/demos/spiv/image_list.c @@ -20,7 +20,13 @@ * * *****************************************************************************/ +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <dirent.h> #include <stdlib.h> +#include <errno.h> +#include <string.h> #include <core/GP_Debug.h> @@ -35,29 +41,129 @@ struct image_list { /* path to the currently loaded image */ char path[1024]; int path_loaded:1; + + /* directory handling */ + int in_dir:1; + + int cur_file; + int max_file; + struct dirent **dir_files; }; +static int dir_cmp(const struct dirent **a, const struct dirent **b) +{ + return strcasecmp((*a)->d_name, (*b)->d_name); +} + +static int dir_filter(const struct dirent *d) +{ + /* Ignore some filenames */ + if (!strcmp(d->d_name, ".")) + return 0; + + if (!strcmp(d->d_name, "..")) + return 0; + + GP_DEBUG(4, "Adding file '%s'", d->d_name); + + + return 1; +} + +static void try_load_dir(struct image_list *self) +{ + struct stat sb; + const char *path = self->args[self->cur_arg]; + + if (stat(path, &sb)) { + GP_WARN("Failed to stat '%s': %s", path, strerror(errno)); + return; + } + + if (!(sb.st_mode & S_IFDIR)) + return; + + GP_DEBUG(1, "Loading directory '%s' content.", path); + + int ret = scandir(path, &self->dir_files, dir_filter, dir_cmp); + + if (self->max_file == -1) { + GP_WARN("Failed to scandir '%s': %s", path, strerror(errno)); + return; + } + + self->max_file = ret; + self->cur_file = 0; + self->in_dir = 1; +} + +static void exit_dir(struct image_list *self) +{ + int i; + + GP_DEBUG(1, "Freeing directory '%s' content.", + self->args[self->cur_arg]); + + for (i = 0; i < self->max_file; i++) + free(self->dir_files[i]); + + free(self->dir_files); + + self->in_dir = 0; +} + static void next_img(struct image_list *self) { + if (self->in_dir) { + if (++self->cur_file == self->max_file) { + exit_dir(self); + } else { + self->path_loaded = 0; + return; + } + } + if (++self->cur_arg == self->max_arg) self->cur_arg = 0; + + try_load_dir(self); self->path_loaded = 0; } static void prev_img(struct image_list *self) { + if (self->in_dir) { + if (self->cur_file-- == 0) { + exit_dir(self); + } else { + self->path_loaded = 0; + return; + } + } + if (self->cur_arg == 0) self->cur_arg = self->max_arg - 1; else self->cur_arg--; + try_load_dir(self); + self->path_loaded = 0; } static void load_path(struct image_list *self) { - snprintf(self->path, sizeof(self->path), "%s", self->args[self->cur_arg]); + if (self->in_dir) { + //TODO: eliminate double / + snprintf(self->path, sizeof(self->path), "%s/%s", + self->args[self->cur_arg], + self->dir_files[self->cur_file]->d_name); + + } else { + snprintf(self->path, sizeof(self->path), "%s", + self->args[self->cur_arg]); + } self->path_loaded = 1; } @@ -92,10 +198,15 @@ struct image_list *image_list_create(const char *args[]) self->cur_arg = 0; self->path_loaded = 0; + + self->dir_files = 0; + self->in_dir = 0; self->max_arg = 0; while (args[++self->max_arg] != NULL); + try_load_dir(self); + return self; } ----------------------------------------------------------------------- Summary of changes: demos/spiv/image_list.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 112 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: b91ac3947efd9ef282fb01e5152b3190f5f1352e
by metan 20 Dec '12

20 Dec '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 b91ac3947efd9ef282fb01e5152b3190f5f1352e (commit) via 208c6b8986ccb87c14f2c2d8eb88eb123d99a22b (commit) via 64d17b5956bac389cd3ea3ca2b56a8b9051f2f9f (commit) from 75c90b1ae9699e0076e8006a9818a076cd345d95 (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/b91ac3947efd9ef282fb01e5152b3190f5f1… commit b91ac3947efd9ef282fb01e5152b3190f5f1352e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 17:22:35 2012 +0100 doc: Fix previous changes in Makefile. diff --git a/doc/Makefile b/doc/Makefile index eb86df8..b87a688 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -23,16 +23,12 @@ all: toolcheck examples.html $(PAGES) api.html # Check if we have all the needed tools # toolcheck: - @echo "Checking if documentation tools are present..." @if [ -z `which asciidoc 2>/dev/null` ] ; then - echo "Could not find 'asciidoc'" ; exit 127 ; fi + echo "ERROR: Could not find 'asciidoc'" ; exit 127 ; fi @if [ ! -d "/usr/share/graphviz" ] ; then - echo "Could not find 'graphviz'" ; exit 127 ; fi - @if [ ! -e "/usr/lib/graphviz/python/gv.py" ] ; then - echo "Found 'graphviz' but not Python bindings" ; exit 127 ; fi + echo "ERROR: Could not find 'graphviz'" ; exit 127 ; fi @if [ -z `which latex 2>/dev/null` ] ; then - echo "Could not find 'latex'" ; exit 127 ; fi - @echo " ...seems okay" + echo "ERROR: Could not find 'latex'" ; exit 127 ; fi # # Create page for each part of API description http://repo.or.cz/w/gfxprim.git/commit/208c6b8986ccb87c14f2c2d8eb88eb123d99… commit 208c6b8986ccb87c14f2c2d8eb88eb123d99a22b Merge: 64d17b5 75c90b1 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 17:18:32 2012 +0100 Merge ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/64d17b5956bac389cd3ea3ca2b56a8b9051f… commit 64d17b5956bac389cd3ea3ca2b56a8b9051f2f9f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 16:19:37 2012 +0100 spiv: Fix debug message in image cache. diff --git a/demos/spiv/image_cache.c b/demos/spiv/image_cache.c index 924c392..00712c9 100644 --- a/demos/spiv/image_cache.c +++ b/demos/spiv/image_cache.c @@ -239,14 +239,14 @@ int image_cache_put(struct image_cache *self, GP_Context *ctx, const char *path, return 1; } - GP_DEBUG(2, "Adding image '%s:%10li:%10li' size %zu", - img->path, img->cookie1, img->cookie2, size); - img->ctx = ctx; img->cookie1 = cookie1; img->cookie2 = cookie2; img->elevated = 0; strcpy(img->path, path); + + GP_DEBUG(2, "Adding image '%s:%10li:%10li' size %zu", + img->path, img->cookie1, img->cookie2, size); add_img(self, img, size); ----------------------------------------------------------------------- Summary of changes: demos/spiv/image_cache.c | 6 +++--- doc/Makefile | 10 +++------- 2 files changed, 6 insertions(+), 10 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: 75c90b1ae9699e0076e8006a9818a076cd345d95
by bluebear 20 Dec '12

20 Dec '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 75c90b1ae9699e0076e8006a9818a076cd345d95 (commit) from 94726f09c80a120c03ee251338f2a2800bdaa076 (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/75c90b1ae9699e0076e8006a9818a076cd34… commit 75c90b1ae9699e0076e8006a9818a076cd345d95 Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Thu Dec 20 17:17:19 2012 +0100 'make doc' checks for necessary tools. diff --git a/doc/Makefile b/doc/Makefile index eef29cd..eb86df8 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -15,7 +15,24 @@ GENIMAGES=discrete_linear_1D_convolution_alg1 discrete_linear_1D_convolution_alg PAGES=$(subst .txt,.html,$(SOURCES)) PAGES+=$(subst .txt,.html,$(EXAMPLE_SOURCES)) -all: examples.html $(PAGES) api.html +.PHONY: toolcheck clean + +all: toolcheck examples.html $(PAGES) api.html + +# +# Check if we have all the needed tools +# +toolcheck: + @echo "Checking if documentation tools are present..." + @if [ -z `which asciidoc 2>/dev/null` ] ; then + echo "Could not find 'asciidoc'" ; exit 127 ; fi + @if [ ! -d "/usr/share/graphviz" ] ; then + echo "Could not find 'graphviz'" ; exit 127 ; fi + @if [ ! -e "/usr/lib/graphviz/python/gv.py" ] ; then + echo "Found 'graphviz' but not Python bindings" ; exit 127 ; fi + @if [ -z `which latex 2>/dev/null` ] ; then + echo "Could not find 'latex'" ; exit 127 ; fi + @echo " ...seems okay" # # Create page for each part of API description ----------------------------------------------------------------------- Summary of changes: doc/Makefile | 19 ++++++++++++++++++- 1 files changed, 18 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: 94726f09c80a120c03ee251338f2a2800bdaa076
by metan 20 Dec '12

20 Dec '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 94726f09c80a120c03ee251338f2a2800bdaa076 (commit) from 951e4bf59ad725f05fce1600e8da2ca8f4a8f8c0 (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/94726f09c80a120c03ee251338f2a2800bda… commit 94726f09c80a120c03ee251338f2a2800bdaa076 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 15:53:05 2012 +0100 doc: Add clear bitendian definition. diff --git a/doc/.gitignore b/doc/.gitignore index 4b4703c..670b96a 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -9,3 +9,7 @@ discrete_linear_convolution_alg2.png laplacian_edge_sharpening.png laplacian_kernel.png +bit-endian-be-1bit.png +bit-endian-be-2bits.png +bit-endian-le-1bit.png +bit-endian-le-2bits.png diff --git a/doc/README b/doc/README index ae93336..400ede1 100644 --- a/doc/README +++ b/doc/README @@ -2,4 +2,5 @@ This directory contains asciidoc documentation. The html pages are generated by typing 'make'. -In order to do that asciidoc and source-highlight, latex and dvipng must be installed. +In order to do that asciidoc and source-highlight, latex and dvipng and +graphviz must be installed. diff --git a/doc/gen.txt b/doc/gen.txt index 28b438d..949f585 100644 --- a/doc/gen.txt +++ b/doc/gen.txt @@ -38,13 +38,98 @@ per pixel. It also contains suffix that is a string used as a suffix for functions that manipulates with this pixel size. The 'bit_endian' determines direction of bits in bitmaps and graymaps (i.e. -most significant bit left or right). It can be either 'BE' or 'LE'. - -Note that different pixels can share the same pixel size as for certain types -of operations the function doesn't depend on actual arrangements of the color -channels in pixel (i.e. Get/Put Pixel, Rotate buffer 90 degrees, etc...). - -TODO: Which bit endian is which? +most significant bit left or right). It can be either 'BE' or 'LE'. To avoid +confusion following two figures describes bits layout in 1 bit and 2 bits +grayscale bitmaps. The rectangles in the figures represents bytes as they are +in the buffer. The start of the image (i.e. topleft corner and coodinate 0,0) +is on the left side. The numbers describes position of the bit in the byte (as +seen by shifts and bitmask from within C language implementation). + +BE +~~ + +["graphviz", "bit-endian-be-1bit.png"] +------------------------------------------------------------------------------ +digraph bit_endian { + node [shape = record]; + rankdir = LR; + + node0 [label = "{<e> ...}"]; + node1 [label = "{7 | 6 | 5 | 4 | 3 | 2 | 1 | <e> 0}"]; + node2 [label = "{ 7 | 6 | 5 | 4 | 3 | 2 | 1 | <e> 0}"]; + node3 [label = "{ 7 | 6 | 5 | 4 | 3 | 2 | 1 | <e> 0}"]; + node4 [label = "{ ...}"]; + + node0:e -> node1:b; + node1:e -> node2:b; + node2:e -> node3:b; + node3:e -> node4:b; +} +------------------------------------------------------------------------------ + +["graphviz", "bit-endian-be-2bits.png"] +------------------------------------------------------------------------------ +digraph bit_endian { + node [shape = record]; + rankdir = LR; + + node0 [label = "{<e> ...}"]; + node1 [label = "{7 6 | 5 4 | 3 2 | <e> 1 0}"]; + node2 [label = "{ 7 6 | 5 4 | 3 2 | <e> 1 0}"]; + node3 [label = "{ 7 6 | 5 4 | 3 2 | <e> 1 0}"]; + node4 [label = "{ ...}"]; + + node0:e -> node1:b; + node1:e -> node2:b; + node2:e -> node3:b; + node3:e -> node4:b; +} +------------------------------------------------------------------------------ + +LE +~~ + +["graphviz", "bit-endian-le-1bit.png"] +------------------------------------------------------------------------------ +digraph bit_endian { + node [shape = record]; + rankdir = LR; + + node0 [label = "{<e> ...}"]; + node1 [label = "{0 | 1 | 2 | 3 | 4 | 5 | 6 | <e> 7}"]; + node2 [label = "{ 0 | 1 | 2 | 3 | 4 | 5 | 6 | <e> 7}"]; + node3 [label = "{ 0 | 1 | 2 | 3 | 4 | 5 | 6 | <e> 7}"]; + node4 [label = "{ ...}"]; + + node0:e -> node1:b; + node1:e -> node2:b; + node2:e -> node3:b; + node3:e -> node4:b; +} +------------------------------------------------------------------------------ + +["graphviz", "bit-endian-le-2bits.png"] +------------------------------------------------------------------------------ +digraph bit_endian { + node [shape = record]; + rankdir = LR; + + node0 [label = "<e> ..."]; + node1 [label = "{0 1 | 2 3 | 4 5 | <e> 6 7}"]; + node2 [label = "{ 0 1 | 2 3 | 4 5 | <e> 6 7}"]; + node3 [label = "{ 0 1 | 2 3 | 4 5 | <e> 6 7}"]; + node4 [label = "{ ...}"]; + + node0:e -> node1:b; + node1:e -> node2:b; + node2:e -> node3:b; + node3:e -> node4:b; +} +------------------------------------------------------------------------------ + +NOTE: Different pixels can share the same pixel size as for certain types + of operations the function doesn't depend on actual arrangements of the + color channels in pixel (i.e. Get/Put Pixel, Rotate buffer 90 degrees, etc...). TODO: Rename size to bpp? ----------------------------------------------------------------------- Summary of changes: doc/.gitignore | 4 ++ doc/README | 3 +- doc/gen.txt | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 98 insertions(+), 8 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: 951e4bf59ad725f05fce1600e8da2ca8f4a8f8c0
by metan 20 Dec '12

20 Dec '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 951e4bf59ad725f05fce1600e8da2ca8f4a8f8c0 (commit) via ddbd27fd085cc515d61fdae1a159922090eb327b (commit) from 3a66b0d92c78955b31e8b825f3b2049ffdf3487a (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/951e4bf59ad725f05fce1600e8da2ca8f4a8… commit 951e4bf59ad725f05fce1600e8da2ca8f4a8f8c0 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 13:46:29 2012 +0100 demos: spiv: Move image listing code into separate file. diff --git a/demos/spiv/Makefile b/demos/spiv/Makefile index f533179..95e7560 100644 --- a/demos/spiv/Makefile +++ b/demos/spiv/Makefile @@ -8,7 +8,7 @@ LDLIBS+=-lrt `$(TOPDIR)/gfxprim-config --libs --libs-backends` APPS=spiv -spiv: cpu_timer.o image_cache.o +spiv: cpu_timer.o image_cache.o image_list.o include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk diff --git a/demos/spiv/image_list.c b/demos/spiv/image_list.c new file mode 100644 index 0000000..390275f --- /dev/null +++ b/demos/spiv/image_list.c @@ -0,0 +1,110 @@ +/***************************************************************************** + * 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-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <stdlib.h> + +#include <core/GP_Debug.h> + +#include "image_list.h" + +struct image_list { + /* list we got from the app */ + const char **args; + unsigned int cur_arg; + unsigned int max_arg; + + /* path to the currently loaded image */ + char path[1024]; + int path_loaded:1; +}; + +static void next_img(struct image_list *self) +{ + if (++self->cur_arg == self->max_arg) + self->cur_arg = 0; + + self->path_loaded = 0; +} + +static void prev_img(struct image_list *self) +{ + if (self->cur_arg == 0) + self->cur_arg = self->max_arg - 1; + else + self->cur_arg--; + + self->path_loaded = 0; +} + +static void load_path(struct image_list *self) +{ + snprintf(self->path, sizeof(self->path), "%s", self->args[self->cur_arg]); + + self->path_loaded = 1; +} + +const char *image_list_move(struct image_list *self, int direction) +{ + GP_DEBUG(2, "Moving list by %i", direction); + + int i; + + for (i = 0; i < direction; i++) + next_img(self); + + for (i = 0; i > direction; i--) + prev_img(self); + + return image_list_img_path(self); +} + +struct image_list *image_list_create(const char *args[]) +{ + struct image_list *self; + + GP_DEBUG(1, "Creating image list"); + + self = malloc(sizeof(struct image_list)); + + if (self == NULL) + return NULL; + + self->args = args; + self->cur_arg = 0; + + self->path_loaded = 0; + + self->max_arg = 0; + while (args[++self->max_arg] != NULL); + + return self; +} + +const char *image_list_img_path(struct image_list *self) +{ + if (!self->path_loaded) + load_path(self); + + GP_DEBUG(2, "Returning path '%s'", self->path); + + return self->path; +} diff --git a/demos/spiv/image_list.h b/demos/spiv/image_list.h new file mode 100644 index 0000000..e7b299a --- /dev/null +++ b/demos/spiv/image_list.h @@ -0,0 +1,50 @@ +/***************************************************************************** + * 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-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + + /* + + Image list. + + */ + +#ifndef __IMAGE_LIST_H__ +#define __IMAGE_LIST_H__ + +struct image_list; + +/* + * Takes NULL-terminated array of paths as parameter + */ +struct image_list *image_list_create(const char *args[]); + +/* + * Returns path to the current image. + */ +const char *image_list_img_path(struct image_list *self); + +/* + * Moves the current image direction images and returns pointer to current + * path. + */ +const char *image_list_move(struct image_list *self, int direction); + +#endif /* __IMAGE_LIST_H__ */ diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index 7c3dd20..82a8e75 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -37,6 +37,7 @@ #include <input/GP_InputDriverLinux.h> #include "image_cache.h" +#include "image_list.h" #include "cpu_timer.h" static GP_Pixel black_pixel; @@ -325,7 +326,7 @@ GP_Context *load_resized_image(struct loader_params *params, GP_Size w, GP_Size cpu_timer_stop(&timer); } -// img->gamma = GP_GammaAcquire(img->pixel_type, 2.2); +// img->gamma = GP_GammaAcquire(img->pixel_type, 0.45); cpu_timer_start(&timer, "Resampling"); callback.priv = "Resampling Image"; @@ -637,7 +638,7 @@ int main(int argc, char *argv[]) int opt, debug_level = 0; int shift_flag; GP_PixelType emul_type = GP_PIXEL_UNKNOWN; - + struct loader_params params = { .img_path = NULL, @@ -730,21 +731,16 @@ int main(int argc, char *argv[]) GP_Fill(context, black_pixel); GP_BackendFlip(backend); - int argf = optind; - int argn = argf; + + struct image_list *list = image_list_create((const char**)argv + optind); params.show_progress_once = 1; - show_image(&params, argv[argf]); + show_image(&params, image_list_img_path(list)); for (;;) { /* wait for event or a timeout */ - if (wait_for_event(sleep_sec * 1000)) { - argn++; - if (argn >= argc) - argn = argf; - - show_image(&params, argv[argn]); - } + if (wait_for_event(sleep_sec * 1000)) + show_image(&params, image_list_move(list, 1)); /* Read and parse events */ GP_Event ev; @@ -809,7 +805,7 @@ int main(int argc, char *argv[]) } params.show_progress_once = 1; - show_image(&params, argv[argn]); + show_image(&params, image_list_img_path(list)); break; case GP_KEY_LEFT_BRACE: if (params.resampling_method == 0) @@ -826,13 +822,13 @@ int main(int argc, char *argv[]) } params.show_progress_once = 1; - show_image(&params, argv[argn]); + show_image(&params, image_list_img_path(list)); break; case GP_KEY_L: params.use_low_pass = !params.use_low_pass; params.show_progress_once = 1; - show_image(&params, argv[argn]); + show_image(&params, image_list_img_path(list)); break; case GP_KEY_D: image_cache_drop(params.img_resized_cache); @@ -847,45 +843,26 @@ int main(int argc, char *argv[]) return 0; break; case GP_KEY_PAGE_UP: - argn+=10; - //TODO - if (argn >= argc) - argn = argf; - params.show_progress_once = 1; - show_image(&params, argv[argn]); + show_image(&params, image_list_move(list, 10)); break; case GP_KEY_PAGE_DOWN: - argn-=10; - //TODO - if (argn < argf) - argn = argc - 1 ; - params.show_progress_once = 1; - show_image(&params, argv[argn]); + show_image(&params, image_list_move(list, -10)); break; next: case GP_KEY_RIGHT: case GP_KEY_UP: case GP_KEY_SPACE: - argn++; - if (argn >= argc) - argn = argf; - params.show_progress_once = 1; - show_image(&params, argv[argn]); + show_image(&params, image_list_move(list, 1)); break; prev: case GP_KEY_BACKSPACE: case GP_KEY_LEFT: case GP_KEY_DOWN: - argn--; - - if (argn < argf) - argn = argc - 1; - params.show_progress_once = 1; - show_image(&params, argv[argn]); + show_image(&params, image_list_move(list, -1)); break; case GP_KEY_1: resize_backend(&params, 1, shift_flag); http://repo.or.cz/w/gfxprim.git/commit/ddbd27fd085cc515d61fdae1a159922090eb… commit ddbd27fd085cc515d61fdae1a159922090eb327b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 13:16:51 2012 +0100 build: configure: The -lXext should be in LDFLAGS. diff --git a/configure b/configure index a13f914..db5733f 100755 --- a/configure +++ b/configure @@ -255,7 +255,7 @@ if __name__ == '__main__': [header_exists, "X11/Xlib.h"], "", "-lX11", ["backends"]], ["X_SHM", "MIT-SHM X Extension", - [header_exists, "X11/extensions/XShm.h"], "-lXext", "", ["backends"]], + [header_exists, "X11/extensions/XShm.h"], "", "-lXext", ["backends"]], ["freetype", "A high-quality and portable font engine", [header_exists, "ft2build.h"], "", "`freetype-config --libs`", ["core"]], ----------------------------------------------------------------------- Summary of changes: configure | 2 +- demos/spiv/Makefile | 2 +- .../framework/tst_msg.c => demos/spiv/image_list.c | 122 +++++++++++--------- demos/spiv/{cpu_timer.h => image_list.h} | 30 +++--- demos/spiv/spiv.c | 53 +++------ 5 files changed, 100 insertions(+), 109 deletions(-) copy tests/framework/tst_msg.c => demos/spiv/image_list.c (53%) copy demos/spiv/{cpu_timer.h => image_list.h} (77%) 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: 3a66b0d92c78955b31e8b825f3b2049ffdf3487a
by bluebear 18 Dec '12

18 Dec '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 3a66b0d92c78955b31e8b825f3b2049ffdf3487a (commit) via 9176505d3276942f16192b028d57ca9571c81797 (commit) from 57c57c59cd6ce43a4df21a9309cdbb7cd5e1bf16 (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/3a66b0d92c78955b31e8b825f3b2049ffdf3… commit 3a66b0d92c78955b31e8b825f3b2049ffdf3487a Merge: 9176505 57c57c5 Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Tue Dec 18 22:59:03 2012 +0100 Merge branch 'master' of ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/9176505d3276942f16192b028d57ca9571c8… commit 9176505d3276942f16192b028d57ca9571c81797 Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Tue Dec 18 22:58:16 2012 +0100 First stab at analytic line clipping. diff --git a/include/gfx/GP_LineClip.h b/include/gfx/GP_LineClip.h new file mode 100644 index 0000000..32ad6af --- /dev/null +++ b/include/gfx/GP_LineClip.h @@ -0,0 +1,31 @@ +/***************************************************************************** + * 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-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#ifndef GP_LINECLIP_H +#define GP_LINECLIP_H + +int GP_LineClip(int *px0, int *py0, int *px1, int *py1, int xmax, int ymax); + +#endif diff --git a/libs/gfx/GP_Line.gen.c.t b/libs/gfx/GP_Line.gen.c.t index edc5382..668d89f 100644 --- a/libs/gfx/GP_Line.gen.c.t +++ b/libs/gfx/GP_Line.gen.c.t @@ -36,6 +36,7 @@ #include "gfx/GP_VLine.h" #include "gfx/GP_HLine.h" #include "gfx/GP_Line.h" +#include "gfx/GP_LineClip.h" /* * The classical Bresenham line drawing algorithm. @@ -48,6 +49,14 @@ void GP_Line_Raw_{{ ps.suffix }}(GP_Context *context, int x0, int y0, int x1, int y1, GP_Pixel pixval) { + if (!GP_LineClip(&x0, &y0, &x1, &y1, context->w - 1, context->h - 1)) + return; + + GP_ASSERT(x0 >= 0 && x0 <= (int) context->w-1); + GP_ASSERT(x1 >= 0 && x1 <= (int) context->w-1); + GP_ASSERT(y0 >= 0 && y0 <= (int) context->h-1); + GP_ASSERT(y1 >= 0 && y1 <= (int) context->h-1); + /* special cases: vertical line, horizontal line, single point */ if (x0 == x1) { if (y0 == y1) { @@ -93,10 +102,10 @@ void GP_Line_Raw_{{ ps.suffix }}(GP_Context *context, int x0, int y0, for (x = x0; x <= x1; x++) { if (steep) - GP_PutPixel_Raw_Clipped_{{ ps.suffix }}(context, y, x, + GP_PutPixel_Raw_{{ ps.suffix }}(context, y, x, pixval); else - GP_PutPixel_Raw_Clipped_{{ ps.suffix }}(context, x, y, + GP_PutPixel_Raw_{{ ps.suffix }}(context, x, y, pixval); error -= deltay; diff --git a/libs/gfx/GP_LineClip.c b/libs/gfx/GP_LineClip.c new file mode 100644 index 0000000..6a1f76e --- /dev/null +++ b/libs/gfx/GP_LineClip.c @@ -0,0 +1,129 @@ +/***************************************************************************** + * 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 "core/GP_Common.h" +#include "core/GP_Types.h" +#include "gfx/GP_LineClip.h" + +int GP_LineClip(int *px0, int *py0, int *px1, int *py1, int xmax, int ymax) +{ + float x0 = (float) *px0; + float y0 = (float) *py0; + float x1 = (float) *px1; + float y1 = (float) *py1; + + /* horizontal and vertical line are special cases */ + if (y0 == y1) { + + /* orient the line from left to right */ + if (x1 < x0) { + GP_SWAP(x0, x1); + GP_SWAP(y0, y1); + } + + /* check if it is not completely outside */ + if (x1 < 0 || x0 > xmax || y0 < 0 || y0 > ymax) + return 0; + + x0 = GP_MAX(x0, 0); + x1 = GP_MIN(x1, xmax); + goto give_result; + } + if (x0 == x1) { + + /* orient the line from top to down */ + if (x1 < x0) { + GP_SWAP(x0, x1); + GP_SWAP(y0, y1); + } + + /* check if it is not completely outside */ + if (y1 < 0 || y0 > ymax || x0 < 0 || x0 > xmax) + return 0; + + /* clip it to the valid range */ + y0 = GP_MAX(y0, 0); + y1 = GP_MIN(y1, ymax); + goto give_result; + } + + /* orient the line from left to right */ + if (x1 < x0) { + GP_SWAP(x0, x1); + GP_SWAP(y0, y1); + } + + if (x1 < 0 || x0 > xmax || (y0 < 0 && y1 < 0) || (y0 > ymax && y1 > ymax)) { + + /* the line lies completely outside the rectangle */ + return 0; + } + + float dx = (float)(x1 - x0); + float dy = (float)(y1 - y0); + float dyx = dy/dx; + float dxy = dx/dy; + + /* clip the line against the left and right side of the rectangle */ + if (x0 < 0) { + y0 = y0 - x0*dyx; + x0 = 0; + } + if (x1 > xmax) { + x1 = xmax; + y1 = y0 + (x1-x0)*dyx; + } + + if (y0 < 0.0f) { + x0 = x0 - y0*dxy; + y0 = 0.0f; + } else if (y0 > ymax) { + x0 = x0 + (ymax-y0)*dxy; + y0 = ymax; + } + + if (y1 < 0.0f) { + x1 = x1 - y1*dxy; + y1 = 0.0f; + } + else if (y1 > ymax) { + x1 = x1 - (y1 - ymax)*dxy; + y1 = ymax; + } + + if (x0 < 0 || x0 > xmax || x1 < 0 || x1 > xmax) { + + /* the line misses the clip rectangle around the corner */ + return 0; + } + +give_result: + + *px0 = (int) x0; + *py0 = (int) y0; + *px1 = (int) x1; + *py1 = (int) y1; + return 1; +} ----------------------------------------------------------------------- Summary of changes: .../GP_TextStyle.c => include/gfx/GP_LineClip.h | 17 +-- libs/gfx/GP_Line.gen.c.t | 13 ++- include/core/GP_Core.h => libs/gfx/GP_LineClip.c | 154 +++++++++++++------- 3 files changed, 120 insertions(+), 64 deletions(-) copy libs/text/GP_TextStyle.c => include/gfx/GP_LineClip.h (85%) copy include/core/GP_Core.h => libs/gfx/GP_LineClip.c (50%) 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: 57c57c59cd6ce43a4df21a9309cdbb7cd5e1bf16
by metan 18 Dec '12

18 Dec '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 57c57c59cd6ce43a4df21a9309cdbb7cd5e1bf16 (commit) via 78c4f27c1460b40d07c59ab79a5050601756cf40 (commit) from 6339f5f64899ddc8158072a7354703eb71ef2e49 (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/57c57c59cd6ce43a4df21a9309cdbb7cd5e1… commit 57c57c59cd6ce43a4df21a9309cdbb7cd5e1bf16 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 18 19:20:58 2012 +0100 doc: backends: Update X11 API. diff --git a/doc/backends.txt b/doc/backends.txt index d760daf..5ee7e78 100644 --- a/doc/backends.txt +++ b/doc/backends.txt @@ -81,16 +81,27 @@ pixel type to match given surface). For example usage see 'SDL' glue link:example_SDL_glue.html[example]. -X server +X Server ~~~~~~~~ [source,c] ------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <backends/GP_X11.h> + enum GP_BackendX11Flags { - /* - * When set, w and h is ignored and root window is used - */ - GP_X11_USE_ROOT_WIN = 0x01, + /* When set, w and h is ignored and root window is used */ + GP_X11_USE_ROOT_WIN = 0x01, + + /* Create new borderless window above the root window */ + GP_X11_CREATE_ROOT_WIN = 0x02, + + /* Start fullscreen */ + GP_X11_FULLSCREEN = 0x04, + + /* Do not use MIT SHM even if available */ + GP_X11_DISABLE_SHM = 0x08, }; GP_Backend *GP_BackendX11Init(const char *display, int x, int y, @@ -106,8 +117,33 @@ time). This backend feeds key events into global input queue. -Note this is experimental version of X11 backend and will be changed to support -more windows at a time. +TODO: X11 backend will be changed to support more windows at a time. + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <backends/GP_X11.h> + +/* + * Returns non-zero if backend is X11 backend + */ +int GP_BackendIsX11(GP_Backend *self); + +/* + * Changes full screen mode. + * + * 0 = off + * 1 = on + * 2 = toggle + */ +void GP_BackendX11RequestFullscreen(GP_Backend *self, int mode); +------------------------------------------------------------------------------- + +The 'GP_BackendIsX11' functions allows us to detect if we are running using +X11 backend. + +The 'GP_BackendX11RequestFullscreen' can toggle fullscreen mode at runtime. Overall init function ~~~~~~~~~~~~~~~~~~~~~ http://repo.or.cz/w/gfxprim.git/commit/78c4f27c1460b40d07c59ab79a5050601756… commit 78c4f27c1460b40d07c59ab79a5050601756cf40 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 18 19:11:04 2012 +0100 doc: pixels: Add basic docs for pixel. diff --git a/doc/Makefile b/doc/Makefile index cc981fb..eef29cd 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,7 +1,7 @@ SOURCES=general.txt context.txt loaders.txt filters.txt basic_types.txt drawing_api.txt backends.txt gamma.txt grabbers.txt environment_variables.txt debug.txt core.txt api.txt input.txt - gen.txt + gen.txt pixels.txt EXAMPLE_SOURCES=$(wildcard example_*.txt) diff --git a/doc/api.txt b/doc/api.txt index cee4d1a..69d460a 100644 --- a/doc/api.txt +++ b/doc/api.txt @@ -11,6 +11,10 @@ Cyril Hrubis <metan(a)ucw.cz> + Describes functions and macros in library core. + +. link:pixels.html[Pixel Types] + + + Describes pixel types. + + . link:debug.html[Debug Messages] + Interface to debug layer. diff --git a/doc/pixels.txt b/doc/pixels.txt new file mode 100644 index 0000000..b226453 --- /dev/null +++ b/doc/pixels.txt @@ -0,0 +1,87 @@ +Pixel Description +----------------- + +This pages describes library core functions for handling pixels. + +Pixel Type +~~~~~~~~~~ + +Pixels are described by a pixel type, which is enumeration type. The enum is +defined at the generated 'GP_Pixel.gen.h' header and must contain at least +following members: + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <core/GP_Pixel.h> + +typedef enum GP_PixelType { + GP_PIXEL_UNKNOWN, + GP_PIXEL_xRGB8888, + GP_PIXEL_RGBA8888, + GP_PIXEL_RGB888, + GP_PIXEL_BGR888, + GP_PIXEL_G1, + GP_PIXEL_G2, + GP_PIXEL_G4, + GP_PIXEL_G8, + GP_PIXEL_MAX, +} GP_PixelType; + +------------------------------------------------------------------------------- + +Each pixel type has accompanying record in global array of pixel types +declared as follows: + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <core/GP_Pixel.h> + +typedef struct { + char name[8]; /* Channel name */ + uint8_t offset; /* Offset in bits */ + uint8_t size; /* Bit-size */ +} GP_PixelTypeChannel; + +typedef struct { + GP_PixelType type; /* Number of the type */ + const char name[16]; /* Name */ + uint8_t size; /* Size in bits */ + GP_BIT_ENDIAN bit_endian; /* Order of pixels in a byte */ + uint8_t numchannels; /* Number of channels */ + /* String describing the bit-representaton (as in "RRRRRGGGGGGBBBBB")*/ + const char bitmap[GP_PIXEL_BITS + 1]; + /* Individual channels */ + const GP_PixelTypeChannel channels[GP_PIXELTYPE_MAX_CHANNELS]; +} GP_PixelTypeDescription; + +extern const GP_PixelTypeDescription const GP_PixelTypes[]; + +const char *GP_PixelTypeName(GP_PixelType type); + +uint32_t GP_PixelSize(GP_PixelType type); +------------------------------------------------------------------------------- + +There are also pixel matching functions that returns pixel type given RGB +channel masks or sizes and offsets: + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <core/GP_Pixel.h> + +GP_PixelType GP_PixelRGBMatch(GP_Pixel rmask, GP_Pixel gmask, + GP_Pixel bmask, GP_Pixel amask, + uint8_t bits_per_pixel); + +GP_PixelType GP_PixelRGBLookup(uint32_t rsize, uint32_t roff, + uint32_t gsize, uint32_t goff, + uint32_t bsize, uint32_t boff, + uint32_t asize, uint32_t aoff, + uint8_t bits_per_pixel); +------------------------------------------------------------------------------- + ----------------------------------------------------------------------- Summary of changes: doc/Makefile | 2 +- doc/api.txt | 4 ++ doc/backends.txt | 50 ++++++++++++++++++++++++++---- doc/pixels.txt | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 135 insertions(+), 8 deletions(-) create mode 100644 doc/pixels.txt 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: 6339f5f64899ddc8158072a7354703eb71ef2e49
by metan 18 Dec '12

18 Dec '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 6339f5f64899ddc8158072a7354703eb71ef2e49 (commit) from 15959b401d7f06790ed593ba0515b9502fce9502 (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/6339f5f64899ddc8158072a7354703eb71ef… commit 6339f5f64899ddc8158072a7354703eb71ef2e49 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 18 18:42:47 2012 +0100 doc: input: further fixes. diff --git a/doc/input.txt b/doc/input.txt index cdb7cc9..35ff473 100644 --- a/doc/input.txt +++ b/doc/input.txt @@ -53,7 +53,7 @@ typedef struct GP_Event { } GP_Event; ------------------------------------------------------------------------------- -The GP_Event structure is basic block that describes input event (i.e. key was +The 'GP_Event' structure describes an input event (i.e. key was pressed/released, mouse was moved, window was resized by user). [source,c] @@ -70,9 +70,9 @@ enum GP_EventType { The event 'type' determines highlevel nature of the event. * Key events covers keyboard button presses, mouse buttons, etc. -* Relative events covers mostly mouse coordinates +* Relative events covers mouse coordinates, mouse wheel, etc. * Absolute events covers touchscreens and tablets -* System events are used mostly for propagating window close and window +* System events are used for propagating window close and window resize events * Values greater than 'GP_EV_MAX' are free for user events @@ -137,16 +137,16 @@ struct GP_EventSys { }; ------------------------------------------------------------------------------- -The event value is a union that could hold different information. The right -format of the data is known from the 'type' and 'code'. For some types of the -events it's not used at all. +The event 'value' is a union that could hold different information. The right +format of the data is known from the 'type' and 'code'. Some types of the +events has no value at all. * The relative coordinates are used for 'GP_EV_REL_POS' and absolute coordinates for 'GP_EV_ABS_POS'. * The key event value is used for keypresses, additionally it holds the key value mapped to ASCII if conversion is applicable otherwise it's set to - zero. You should consult the header 'input/GP_Event.h' for comprehensive + zero. You should consult the header 'input/GP_Event.h' for the comprehensive list of key values. * And finally the system event is used with 'GP_EV_SYS_RESIZE' and informs you @@ -199,7 +199,7 @@ by ev pointer. void GP_EventDump(struct GP_Event *ev); ------------------------------------------------------------------------------- -Dumps event in human-readable format into the 'stdout'. +The 'GP_EventDump' dumps event in human-readable format into the 'stdout'. [source,c] ------------------------------------------------------------------------------- @@ -215,8 +215,6 @@ void GP_EventSetScreenCursor(uint32_t x, uint32_t y); Sets screen size and pointer position, which is needed for calculating the 'cursor_x' and 'cursor_y' coordinates. -void GP_EventPushRel(int32_t rx, int32_t ry, struct timeval *time); - [source,c] ------------------------------------------------------------------------------- #include <GP.h> @@ -224,6 +222,12 @@ void GP_EventPushRel(int32_t rx, int32_t ry, struct timeval *time); #include <input/GP_Event.h> /* + * Pushes relative event. + */ +void GP_EventPushRel(int32_t rx, int32_t ry, struct timeval *time); + + +/* * Produces relative event that moves to the point x, y */ void GP_EventPushRelTo(uint32_t x, uint32_t y, struct timeval *time); ----------------------------------------------------------------------- Summary of changes: doc/input.txt | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 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: 15959b401d7f06790ed593ba0515b9502fce9502
by metan 18 Dec '12

18 Dec '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 15959b401d7f06790ed593ba0515b9502fce9502 (commit) from 4439632f9d4310733582659f9463f979de583b4a (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/15959b401d7f06790ed593ba0515b9502fce… commit 15959b401d7f06790ed593ba0515b9502fce9502 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 18 18:33:36 2012 +0100 doc: input: Clarify wording in few cases. diff --git a/doc/input.txt b/doc/input.txt index 6a85ebf..cdb7cc9 100644 --- a/doc/input.txt +++ b/doc/input.txt @@ -11,10 +11,11 @@ is created only together with graphics driver, this is the case for example for X Window backends or SDL backends. The basic structure is roughly modeled after Linux kernel input API. The main -difference is that events that belongs together are delivered together. For -example mouse coordinates are bundled in one event. +difference is that events that belongs together are delivered together (the +kernel input API sends one event for each value i.e. x or y coordinate and has +sync event that finalizes the changes in the values). -For example usage see backend link:example_input.html[example]. +For example usage see input events link:example_input.html[example]. Event Structure Description ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -156,12 +157,12 @@ The 'dev_id' is not used at the moment and may be removed. The timeval structure 'time' holds time when the event was created (or received by GFXprim input driver). -The 'cursor_x' and 'cursor_y' holds pointer coodinates merged from all input -sources. +The 'cursor_x' and 'cursor_y' holds current pointer coodinates. (All relative +and absolute events are mixed together to compute current cursor position.) The 'key_pressed' is bitflag array of currently pressed keys which is useful -for using keys as modificators. The array holds most of the standard keyboard -keys and mouse buttons. +for using keys as modificators. The array always holds state of the standard +keyboard keys and mouse buttons. Event API ~~~~~~~~~ ----------------------------------------------------------------------- Summary of changes: doc/input.txt | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 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: 4439632f9d4310733582659f9463f979de583b4a
by metan 18 Dec '12

18 Dec '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 4439632f9d4310733582659f9463f979de583b4a (commit) via 0aced3a1a7a5e7031959a0ef904974ed1a06c4a4 (commit) from 5f214b37219110e2e9051b3bfffbbd65498002b7 (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/4439632f9d4310733582659f9463f979de58… commit 4439632f9d4310733582659f9463f979de583b4a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 18 17:05:08 2012 +0100 doc: Add basic docs for templating engine. diff --git a/doc/Makefile b/doc/Makefile index f72b8c3..cc981fb 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,6 +1,7 @@ SOURCES=general.txt context.txt loaders.txt filters.txt basic_types.txt drawing_api.txt backends.txt gamma.txt grabbers.txt - environment_variables.txt debug.txt core.txt api.txt input.txt + environment_variables.txt debug.txt core.txt api.txt input.txt + gen.txt EXAMPLE_SOURCES=$(wildcard example_*.txt) diff --git a/doc/gen.txt b/doc/gen.txt new file mode 100644 index 0000000..28b438d --- /dev/null +++ b/doc/gen.txt @@ -0,0 +1,103 @@ +Templating Engine +----------------- + +The GFXprim uses python templating engine to generate code for different pixel +types. This is documentation to the engine internals. + +GFXprim Config +~~~~~~~~~~~~~~ + +The configuration which describes pixel layout could be found in root GFXprim +directory under name 'gfxprim_config.py' which is used to create objects +described below. + +Main Objects +~~~~~~~~~~~~ + +Pixel Size +^^^^^^^^^^ + +[source,python] +------------------------------------------------------------------------------- +class PixelSize(object): + self.size = size + + self.suffix = suffix + + self.bit_endian = bit_endian + + def needs_bit_endian(self): + ... + +------------------------------------------------------------------------------- + +The Pixel Size object represents pixel as a continous block of data. + +The 'size' is size in bits and is sometimes called bpp which stands for bits +per pixel. It also contains suffix that is a string used as a suffix for +functions that manipulates with this pixel size. + +The 'bit_endian' determines direction of bits in bitmaps and graymaps (i.e. +most significant bit left or right). It can be either 'BE' or 'LE'. + +Note that different pixels can share the same pixel size as for certain types +of operations the function doesn't depend on actual arrangements of the color +channels in pixel (i.e. Get/Put Pixel, Rotate buffer 90 degrees, etc...). + +TODO: Which bit endian is which? + +TODO: Rename size to bpp? + +Pixel Type +^^^^^^^^^^ + +[source,python] +------------------------------------------------------------------------------- +class PixelType(object): + self.name = name + self.chanslist = chanslist + self.chans = dict() # { chan_name: (offset, size) } + self.pixelsize = pixelsize # bits per pixel + + def is_palette(self): + ... + + def is_unknown(self): + ... + + def is_rgb(self): + ... + + def is_gray(self): + ... + + def is_alpha(self): + ... + +------------------------------------------------------------------------------- + +This object represents pixel type which describes the sizes and arrangements of +channels in a pixel. Note that it carries an instance of pixel size described +above. + +The chanslist is a list of triplets describing individual channels as +[('chan_name', 'bit_offset', 'bit_size') ] where 'chan_name' is usually one of +R, G, B, V (value, used for grayscale), A (opacity). + +Templating language +~~~~~~~~~~~~~~~~~~~ + +GFXprim uses http://jinja.pocoo.org/[Jinja] templating engine with a few +objects added into the environment. + +Added are python buildins: + +* 'int' +* 'float' +* 'round' +* 'len' + +And most importantly objects generated from the configuration files: + +* 'pixelsizes' list of all pixel size objects +* 'pixeltypes' list of all pixel type objects http://repo.or.cz/w/gfxprim.git/commit/0aced3a1a7a5e7031959a0ef904974ed1a06… commit 0aced3a1a7a5e7031959a0ef904974ed1a06c4a4 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 18 15:44:52 2012 +0100 backends: x11: Add fullscreen and disable SHM opts diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index 79de755..7c3dd20 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -339,6 +339,15 @@ GP_Context *load_resized_image(struct loader_params *params, GP_Size w, GP_Size // GP_FilterEdgeSharpening(img, img, 0.2, NULL); cpu_timer_stop(&timer); +/* + if (params->rat > 1.5) { + cpu_timer_start(&timer, "Sharpening"); + callback.priv = "Sharpening"; + GP_FilterEdgeSharpening(i1, i1, 0.1, &callback); + cpu_timer_stop(&timer); + } +*/ + /* Free low passed context if needed */ GP_ContextFree(res); @@ -764,6 +773,10 @@ int main(int argc, char *argv[]) continue; switch (ev.val.key.key) { + case GP_KEY_F: + if (GP_BackendIsX11(backend)) + GP_BackendX11RequestFullscreen(backend, 2); + break; case GP_KEY_I: params.show_info = !params.show_info; diff --git a/include/backends/GP_X11.h b/include/backends/GP_X11.h index 6d10928..a196a31 100644 --- a/include/backends/GP_X11.h +++ b/include/backends/GP_X11.h @@ -26,14 +26,17 @@ #include "GP_Backend.h" enum GP_BackendX11Flags { - /* - * When set, w and h is ignored and root window is used - */ + /* When set, w and h is ignored and root window is used */ GP_X11_USE_ROOT_WIN = 0x01, - /* - * Create new borderless window above the root window. - */ + + /* Create new borderless window above the root window */ GP_X11_CREATE_ROOT_WIN = 0x02, + + /* Start fullscreen */ + GP_X11_FULLSCREEN = 0x04, + + /* Do not use MIT SHM even if available */ + GP_X11_DISABLE_SHM = 0x08, }; @@ -52,4 +55,18 @@ GP_Backend *GP_BackendX11Init(const char *display, int x, int y, const char *caption, enum GP_BackendX11Flags flags); +/* + * Returns non-zero if backend is X11 backend + */ +int GP_BackendIsX11(GP_Backend *self); + +/* + * Changes full screen mode. + * + * 0 = off + * 1 = on + * 2 = toggle + */ +void GP_BackendX11RequestFullscreen(GP_Backend *self, int mode); + #endif /* BACKENDS_GP_X11_H */ diff --git a/libs/backends/GP_BackendInit.c b/libs/backends/GP_BackendInit.c index bef0dba..e9a809c 100644 --- a/libs/backends/GP_BackendInit.c +++ b/libs/backends/GP_BackendInit.c @@ -138,7 +138,10 @@ static void backend_x11_help(FILE *help, const char *err) "ROOT_WIN - starts the backend in the root windown" " (w and h, if set, are ignored)n" "CREATE_ROOT - starts the backend in newly createdn" - " root window (w and h, if set, are ignored)n"); + " root window (w and h, if set, are ignored)n" + "DISABLE_SHM - disable MIT SHM even if availablen" + "FS - start fullscreenn"); + } static int x11_params_to_flags(const char *param, GP_Size *w, GP_Size *h, @@ -154,6 +157,16 @@ static int x11_params_to_flags(const char *param, GP_Size *w, GP_Size *h, return 0; } + if (!strcasecmp(param, "DISABLE_SHM")) { + *flags |= GP_X11_DISABLE_SHM; + return 0; + } + + if (!strcasecmp(param, "FS")) { + *flags |= GP_X11_FULLSCREEN; + return 0; + } + /* * Accepts only string with format "intxint" or "intXint" */ diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index e543d48..aaa363f 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -727,6 +727,57 @@ static void create_window(struct x11_priv *x11, int x, int y, XMapWindow(x11->dpy, x11->win); } +#ifndef _NET_WM_STATE_ADD +# define _NET_WM_STATE_ADD 1 +#endif /* _NET_WM_STATE_ADD */ + +#ifndef _NET_WM_STATE_REMOVE +# define _NET_WM_STATE_REMOVE 0 +#endif /* _NET_WM_STATE_REMOVE */ + +/* Send NETWM message, most modern Window Managers should understand */ +static void request_fullscreen(struct GP_Backend *self, int mode) +{ + struct x11_priv *x11 = GP_BACKEND_PRIV(self); + + if (mode < 0 || mode > 2) { + GP_WARN("Invalid fullscreen mode = %u", mode); + return; + } + + GP_DEBUG(2, "Requesting fullscreen mode = %u", mode); + + Atom wm_state, fullscreen; + + wm_state = XInternAtom(x11->dpy, "_NET_WM_STATE", True); + fullscreen = XInternAtom(x11->dpy, "_NET_WM_STATE_FULLSCREEN", True); + + if (wm_state == None || fullscreen == None) { + GP_WARN("Failed to create _NET_WM_* atoms"); + return; + } + + XEvent ev; + + memset(&ev, 0, sizeof(ev)); + + ev.type = ClientMessage; + ev.xclient.window = x11->win; + ev.xclient.message_type = wm_state; + ev.xclient.format = 32; + ev.xclient.data.l[0] = mode; + ev.xclient.data.l[1] = fullscreen; + ev.xclient.data.l[2] = 0; + ev.xclient.data.l[3] = 1; + + if (!XSendEvent(x11->dpy, XDefaultRootWindow(x11->dpy), False, SubstructureNotifyMask, &ev)) { + GP_WARN("Failed to send _NET_WM_STATE_FULLSCREEN event"); + return; + } + + XFlush(x11->dpy); +} + GP_Backend *GP_BackendX11Init(const char *display, int x, int y, unsigned int w, unsigned int h, const char *caption, @@ -771,10 +822,13 @@ GP_Backend *GP_BackendX11Init(const char *display, int x, int y, GP_DEBUG(1, "Failed to create window"); goto err1; } - + + if (flags & GP_X11_FULLSCREEN) + request_fullscreen(backend, 1); + backend->context = NULL; - if (create_shm_ximage(backend, w, h)) + if ((flags & GP_X11_DISABLE_SHM) || create_shm_ximage(backend, w, h)) if (create_ximage(backend, w, h)) goto err1; @@ -800,6 +854,11 @@ err0: return NULL; } +void GP_BackendX11RequestFullscreen(GP_Backend *self, int mode) +{ + return request_fullscreen(self, mode); +} + #else #include "GP_Backend.h" @@ -814,4 +873,11 @@ GP_Backend *GP_BackendX11Init(const char *GP_UNUSED(display), return NULL; } +void GP_BackendX11RequestFullscreen(GP_Backend *GP_UNUSED(self), int mode); + #endif /* HAVE_LIBX11 */ + +int GP_BackendIsX11(GP_Backend *self) +{ + return !strcmp(self->name, "X11"); +} ----------------------------------------------------------------------- Summary of changes: demos/spiv/spiv.c | 13 +++++ doc/Makefile | 3 +- doc/gen.txt | 103 ++++++++++++++++++++++++++++++++++++++++ include/backends/GP_X11.h | 29 +++++++++-- libs/backends/GP_BackendInit.c | 15 +++++- libs/backends/GP_X11.c | 70 ++++++++++++++++++++++++++- 6 files changed, 223 insertions(+), 10 deletions(-) create mode 100644 doc/gen.txt 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