- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch master updated: 11237152b73f0794cd98e0de4c20ce180ac19535
by metan 06 Apr '13

06 Apr '13

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 11237152b73f0794cd98e0de4c20ce180ac19535 (commit) via 6cdc1275dfebee03fcc18a35db7097d9bc81bac2 (commit) via e6bba64ea14e9b8beb74ead24a54a61be48afacf (commit) from 33fd79bc8b7affb6ba6c72092670f4821ea29979 (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/11237152b73f0794cd98e0de4c20ce180ac1… commit 11237152b73f0794cd98e0de4c20ce180ac19535 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 21:54:07 2013 +0200 demos: py_simple: Add font style example. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/font_style.py b/demos/py_simple/font_style.py new file mode 100755 index 0000000..47d8e2c --- /dev/null +++ b/demos/py_simple/font_style.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python + +import sys + +import gfxprim.core as core +import gfxprim.gfx as gfx +import gfxprim.backends as backends +import gfxprim.input as input +import gfxprim.text as text + +def redraw(win): + c = win.context + + black = c.RGBToPixel(0, 0, 0) + white = c.RGBToPixel(0xff, 0xff, 0xff) + + c.gfx.Fill(black) + + align = text.C.ALIGN_CENTER | text.C.VALIGN_CENTER + style = text.TextStyle(text.DefaultProportionalFont, 0, 0, 1, 1, 1) + + spacing = 20 + y = 20 + + while y < c.h: + y += text.TextHeight(style) + spacing + c.text.Text(style, c.w//2, y, align, white, black, "Lorem Ipsum Dolor Sit Amet.") + + style.pixel_xspace += 1 + style.pixel_yspace += 1 + style.pixel_xmul += 1 + style.pixel_ymul += 1 + + win.Flip() + + +def main(): + # Create X11 window + win = backends.BackendX11Init(None, 0, 0, 800, 600, "Fonts", 0) + assert(win) + + redraw(win) + + # Event loop + while True: + ev = win.WaitEvent() + + if (ev.type == input.EV_KEY and ev.val.val == input.KEY_ESC): + sys.exit(0) + elif (ev.type == input.EV_SYS): + if (ev.code == input.EV_SYS_QUIT): + sys.exit(0) + if (ev.code == input.EV_SYS_RESIZE): + win.ResizeAck() + redraw(win) + +if __name__ == '__main__': + main() http://repo.or.cz/w/gfxprim.git/commit/6cdc1275dfebee03fcc18a35db7097d9bc81… commit 6cdc1275dfebee03fcc18a35db7097d9bc81bac2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 21:52:57 2013 +0200 pywrap: text: Add wrappers for GP_TextStyle. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/text/__init__.py b/pylib/gfxprim/text/__init__.py index 85b149a..2561900 100644 --- a/pylib/gfxprim/text/__init__.py +++ b/pylib/gfxprim/text/__init__.py @@ -12,7 +12,7 @@ from . import C def _init(module): "Extend context with text submodule" - + from ..utils import extend, add_swig_getmethod, add_swig_setmethod from ..core import Context as _context @@ -34,7 +34,9 @@ def _init(module): '^GP_[A-Z0-9_]*$', ] import_members(c_text, C, include=const_regexes, sub=strip_GP) - + + import_members(c_text, module, sub=strip_GP) + for name in ['Text']: extend_submodule(TextSubmodule, name, c_text.__getattribute__('GP_' + name)) diff --git a/pylib/gfxprim/text/text.i b/pylib/gfxprim/text/text.i index 49335bc..485c31c 100644 --- a/pylib/gfxprim/text/text.i +++ b/pylib/gfxprim/text/text.i @@ -4,6 +4,7 @@ %{ #include "text/GP_Text.h" #include "text/GP_Font.h" +#include "core/GP_Debug.h" %} %import ../core/core.i @@ -14,5 +15,31 @@ %include "GP_Font.h" %include "GP_DefaultFont.h" %include "GP_TextMetric.h" -%include "GP_TextStyle.h" +/* GP_TextStyle wrappers */ +%extend GP_TextStyle { + ~GP_TextStyle() { + GP_DEBUG(2, "[wrapper] GP_TextStyleFree (%p)", $self); + free($self); + } + GP_TextStyle(const struct GP_FontFace *font, int xspace, int yspace, + int xmul, int ymul, int spacing) { + GP_TextStyle *style = malloc(sizeof(GP_TextStyle)); + + GP_DEBUG(2, "[wrapper] GP_TextStyleAlloc (%p)", style); + + if (style == NULL) + return NULL; + + style->font = font; + style->pixel_xspace = xspace; + style->pixel_yspace = yspace; + style->pixel_xmul = xmul; + style->pixel_ymul = ymul; + style->char_xspace = spacing; + + return style; + } +} + +%include "GP_TextStyle.h" http://repo.or.cz/w/gfxprim.git/commit/e6bba64ea14e9b8beb74ead24a54a61be48a… commit e6bba64ea14e9b8beb74ead24a54a61be48afacf Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 21:25:21 2013 +0200 lib: text: Assert that style->font is not NULL. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/text/GP_TextMetric.c b/libs/text/GP_TextMetric.c index 45371fe..26b26f8 100644 --- a/libs/text/GP_TextMetric.c +++ b/libs/text/GP_TextMetric.c @@ -108,6 +108,16 @@ static unsigned int first_glyph_width(const GP_TextStyle *style, int c) return multiply_width(style, glyph->advance_x - glyph->bearing_x); } +static const GP_TextStyle *assert_style(const GP_TextStyle *style) +{ + if (style == NULL) + style = &GP_DefaultStyle; + + GP_ASSERT(style->font != NULL); + + return style; +} + /* * Returns text width. * @@ -129,8 +139,7 @@ unsigned int GP_TextWidth(const GP_TextStyle *style, const char *str) { unsigned int i, len; - if (style == NULL) - style = &GP_DefaultStyle; + style = assert_style(style); if (str == NULL || str[0] == '0') return 0; @@ -158,8 +167,7 @@ unsigned int GP_TextWidth(const GP_TextStyle *style, const char *str) */ GP_Size GP_TextMaxWidth(const GP_TextStyle *style, unsigned int len) { - if (style == NULL) - style = &GP_DefaultStyle; + style = assert_style(style); if (len == 0) return 0; @@ -174,9 +182,8 @@ GP_Size GP_TextMaxWidth(const GP_TextStyle *style, unsigned int len) GP_Size GP_TextMaxStrWidth(const GP_TextStyle *style, const char *str, unsigned int len) { - if (style == NULL) - style = &GP_DefaultStyle; - + style = assert_style(style); + if (len == 0 || str == NULL) return 0; @@ -193,9 +200,8 @@ static unsigned int multiply_height(const GP_TextStyle *style, unsigned int h) GP_Size GP_TextHeight(const GP_TextStyle *style) { - if (style == NULL) - style = &GP_DefaultStyle; - + style = assert_style(style); + unsigned int height = style->font->ascend + style->font->descend; return multiply_height(style, height); @@ -203,17 +209,14 @@ GP_Size GP_TextHeight(const GP_TextStyle *style) GP_Size GP_TextAscent(const GP_TextStyle *style) { - if (style == NULL) - style = &GP_DefaultStyle; + style = assert_style(style); - return multiply_height(style, style->font->ascend); } GP_Size GP_TextDescent(const GP_TextStyle *style) { - if (style == NULL) - style = &GP_DefaultStyle; + style = assert_style(style); return multiply_height(style, style->font->descend); } ----------------------------------------------------------------------- Summary of changes: demos/py_simple/font_style.py | 58 ++++++++++++++++++++++++++++++++++++++++ libs/text/GP_TextMetric.c | 33 ++++++++++++---------- pylib/gfxprim/text/__init__.py | 6 +++- pylib/gfxprim/text/text.i | 29 +++++++++++++++++++- 4 files changed, 108 insertions(+), 18 deletions(-) create mode 100755 demos/py_simple/font_style.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 master updated: 33fd79bc8b7affb6ba6c72092670f4821ea29979
by metan 06 Apr '13

06 Apr '13

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 33fd79bc8b7affb6ba6c72092670f4821ea29979 (commit) via 6985e59261da38f230870a3b036c2dd9d8f0413b (commit) from db503b06e3e5829268f9a75bbb38ceedf15e86c8 (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/33fd79bc8b7affb6ba6c72092670f4821ea2… commit 33fd79bc8b7affb6ba6c72092670f4821ea29979 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 20:22:26 2013 +0200 demos: py_simple: Add X11 multiple windows example. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/x11_windows.py b/demos/py_simple/x11_windows.py index ec72e02..04cfee2 100755 --- a/demos/py_simple/x11_windows.py +++ b/demos/py_simple/x11_windows.py @@ -6,9 +6,20 @@ import gfxprim.core as core import gfxprim.gfx as gfx import gfxprim.backends as backends import gfxprim.input as input +import gfxprim.text as text -def redraw(bk): - bk.context.gfx.Fill(bk.context.RGBToPixel(0, 0, 0)) +def redraw(bk, id): + c = bk.context + + black = c.RGBToPixel(0, 0, 0) + white = c.RGBToPixel(0xff, 0xff, 0xff) + + c.gfx.Fill(black) + + align = text.C.ALIGN_CENTER | text.C.VALIGN_CENTER + + c.text.Text(None, c.w//2, c.h//2, align, white, black, "{} - {}x{}".format(id, c.w, c.h)) + bk.Flip() def parse_events(bk, id): @@ -29,16 +40,19 @@ def parse_events(bk, id): elif (ev.type == input.EV_SYS): if (ev.code == input.EV_SYS_QUIT): sys.exit(0) + if (ev.code == input.EV_SYS_RESIZE): + bk.ResizeAck() + redraw(bk, id) def main(): # Create X11 windows - win1 = backends.BackendX11Init(None, 0, 0, 100, 100, "Win 1", 0) - win2 = backends.BackendX11Init(None, 0, 0, 100, 100, "Win 2", 0) + win1 = backends.BackendX11Init(None, 0, 0, 200, 100, "Win 1", 0) + win2 = backends.BackendX11Init(None, 0, 0, 200, 100, "Win 2", 0) assert(win1) assert(win2) - redraw(win1) - redraw(win2) + redraw(win1, "win1") + redraw(win2, "win2") # Event loop while True: http://repo.or.cz/w/gfxprim.git/commit/6985e59261da38f230870a3b036c2dd9d8f0… commit 6985e59261da38f230870a3b036c2dd9d8f0413b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 20:21:42 2013 +0200 pywrap: Fix text module wrappers. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/gfx/__init__.py b/pylib/gfxprim/gfx/__init__.py index f7fe741..2b8d310 100644 --- a/pylib/gfxprim/gfx/__init__.py +++ b/pylib/gfxprim/gfx/__init__.py @@ -5,15 +5,11 @@ Use as in "import gfxprim.gfx; context_foo.gfx.Line(...)" """ # Import the SWIG wrapper - from . import c_gfx - # Constants module - from . import C - def _init(module): "Extend Context with gfx submodule" @@ -21,7 +17,6 @@ def _init(module): from ..core import Context as _context # New Context submodule - class GfxSubmodule(object): def __init__(self, ctx): self.ctx = ctx diff --git a/pylib/gfxprim/text/__init__.py b/pylib/gfxprim/text/__init__.py index a24cb69..85b149a 100644 --- a/pylib/gfxprim/text/__init__.py +++ b/pylib/gfxprim/text/__init__.py @@ -1,27 +1,42 @@ -from . import text_c +""" +Module extending the Context class with .text submodule and its text drawing functions. +Use as in "import gfxprim.text; context_foo.text.Text(...)" +""" + +# Import the SWIG wrapper +from . import c_text + +# Constants module from . import C def _init(module): + "Extend context with text submodule" + + from ..utils import extend, add_swig_getmethod, add_swig_setmethod + from ..core import Context as _context + + # New Context submodule + class TextSubmodule(object): + def __init__(self, ctx): + self.ctx = ctx + self.C = C + + _context._submodules['text'] = TextSubmodule # Imports from the SWIG module + from ..utils import import_members, extend_submodule import re def strip_GP(s): return re.sub('^GP_', '', s) - # Import constants from the SWIG module - from ..utils import import_members - const_regexes = ['^GP_[A-Z0-9_]*$'] - import_members(text_c, C, include=const_regexes, sub=strip_GP) - - # Import functions from the SWIG module - import_members(text_c, module, sub=strip_GP, - exclude=const_regexes + [ - '.*_Raw', - '^w+_swigregister$', - '^gfxprim$', - '^cvar$', - '^_w+$']) + const_regexes = [ + '^GP_[A-Z0-9_]*$', + ] + import_members(c_text, C, include=const_regexes, sub=strip_GP) + + for name in ['Text']: + extend_submodule(TextSubmodule, name, c_text.__getattribute__('GP_' + name)) _init(locals()) del _init diff --git a/pylib/gfxprim/text/text.i b/pylib/gfxprim/text/text.i index fe40996..49335bc 100644 --- a/pylib/gfxprim/text/text.i +++ b/pylib/gfxprim/text/text.i @@ -1,5 +1,5 @@ %include "../common.i" -%module(package="gfxprim.text") text_c +%module(package="gfxprim.text") c_text %{ #include "text/GP_Text.h" ----------------------------------------------------------------------- Summary of changes: demos/py_simple/x11_windows.py | 26 ++++++++++++++++++----- pylib/gfxprim/gfx/__init__.py | 5 ---- pylib/gfxprim/text/__init__.py | 43 +++++++++++++++++++++++++++------------- pylib/gfxprim/text/text.i | 2 +- 4 files changed, 50 insertions(+), 26 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: db503b06e3e5829268f9a75bbb38ceedf15e86c8
by metan 06 Apr '13

06 Apr '13

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 db503b06e3e5829268f9a75bbb38ceedf15e86c8 (commit) from 568fac5397101c3c4e2a4895ec9dc2375761909a (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/db503b06e3e5829268f9a75bbb38ceedf15e… commit db503b06e3e5829268f9a75bbb38ceedf15e86c8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 17:27:21 2013 +0200 pywrap: backends: Add rest of the function to backend class. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/x11_windows.py b/demos/py_simple/x11_windows.py new file mode 100755 index 0000000..ec72e02 --- /dev/null +++ b/demos/py_simple/x11_windows.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python + +import sys + +import gfxprim.core as core +import gfxprim.gfx as gfx +import gfxprim.backends as backends +import gfxprim.input as input + +def redraw(bk): + bk.context.gfx.Fill(bk.context.RGBToPixel(0, 0, 0)) + bk.Flip() + +def parse_events(bk, id): + + print("------ Window {} -------".format(id)) + + while True: + ev = bk.GetEvent() + + if (ev == None): + print("--------------------------") + return + + input.EventDump(ev) + + if (ev.type == input.EV_KEY and ev.val.val == input.KEY_ESC): + sys.exit(0) + elif (ev.type == input.EV_SYS): + if (ev.code == input.EV_SYS_QUIT): + sys.exit(0) + +def main(): + # Create X11 windows + win1 = backends.BackendX11Init(None, 0, 0, 100, 100, "Win 1", 0) + win2 = backends.BackendX11Init(None, 0, 0, 100, 100, "Win 2", 0) + assert(win1) + assert(win2) + + redraw(win1) + redraw(win2) + + # Event loop + while True: + win1.Wait() + + if (win1.EventsQueued()): + parse_events(win1, "win1") + + if (win2.EventsQueued()): + parse_events(win2, "win2") + +if __name__ == '__main__': + main() diff --git a/pylib/gfxprim/backends/_extend_backend.py b/pylib/gfxprim/backends/_extend_backend.py index b1fab72..adaf96a 100644 --- a/pylib/gfxprim/backends/_extend_backend.py +++ b/pylib/gfxprim/backends/_extend_backend.py @@ -32,14 +32,13 @@ def extend_backend(_backend): @extend(_backend) def PollEvent(self): "Poll the backend for events." - ev = c_input.GP_Event(); + ev = c_input.GP_Event() if c_backends.GP_BackendPollEvent(self, ev) != 0: return ev return None - @extend(_backend) def Wait(self): "Waits for backend." @@ -48,13 +47,28 @@ def extend_backend(_backend): @extend(_backend) def WaitEvent(self): "Waits for backend event." - ev = c_input.GP_Event(); + ev = c_input.GP_Event() c_backends.GP_BackendWaitEvent(self, ev) return ev @extend(_backend) + def GetEvent(self): + "Removes event from the top of the backend event queue." + ev = c_input.GP_Event() + + if c_backends.GP_BackendGetEvent(self, ev) != 0: + return ev + + return None + + @extend(_backend) + def EventsQueued(self): + "Returns the number of events queued in the backend event queue." + return c_backends.GP_BackendEventsQueued(self) + + @extend(_backend) def SetCaption(self, caption): "Set backend window caption (if possible)" return c_backends.GP_BackendSetCaption(self, caption) @@ -63,3 +77,8 @@ def extend_backend(_backend): def Resize(self, w, h): "Resize backend window (if possible)" return c_backends.GP_BackendResize(self, w, h) + + @extend(_backend) + def ResizeAck(self): + "Acknowledge backend resize." + return c_backends.GP_BackendResizeAck(self) ----------------------------------------------------------------------- Summary of changes: demos/py_simple/x11_windows.py | 54 +++++++++++++++++++++++++++++ pylib/gfxprim/backends/_extend_backend.py | 25 ++++++++++++-- 2 files changed, 76 insertions(+), 3 deletions(-) create mode 100755 demos/py_simple/x11_windows.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 master updated: 568fac5397101c3c4e2a4895ec9dc2375761909a
by metan 06 Apr '13

06 Apr '13

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 568fac5397101c3c4e2a4895ec9dc2375761909a (commit) via 7fe5da4df935e00826c20e00ed95b46b7dcb7c74 (commit) from 33c5dac98c86347f2f58363fe76fe1aa69cee5c1 (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/568fac5397101c3c4e2a4895ec9dc2375761… commit 568fac5397101c3c4e2a4895ec9dc2375761909a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 14:29:30 2013 +0200 doc: Update backend docs. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/backends.txt b/doc/backends.txt index 2d1398a..481a425 100644 --- a/doc/backends.txt +++ b/doc/backends.txt @@ -54,10 +54,7 @@ You can't initialize more than one backend at a time, which is inherited 'SDL' limitation. If you call the initialization for a second time, you will get a pointer to already running backend. -This driver feeds input events into global input event queue (see input docs -for details). - -If w, h and/or bpp are zero SDL tries to do a guess, most of the time wrong +If w, h and/or bpp are zero 'SDL' tries to do a guess, most of the time wrong for w and h though. The caption is window caption. @@ -73,14 +70,15 @@ window resizable. int GP_ContextFromSurface(GP_Context *c, const SDL_Surface *surf); ------------------------------------------------------------------------------- -This function allows you to mix 'SDL' and 'GFXprim' code. The functions -initializes the context from 'SDL' surface using the pixel buffer from surface -as pixel buffer for the context. +This function allows you to mix 'SDL' and 'GFXprim' code. + +It initializes a 'GFXprim' context from the 'SDL' surface using the pixel +buffer from surface as pixel buffer for the context. -Function returns zero on succes and non-zero on failure (There is no GFXprim -pixel type to match given surface). +Function returns zero on success and non-zero on failure (i.e. there is no +'GFXprim' pixel type to match given surface). -For example usage see 'SDL' glue link:example_SDL_glue.html[example]. +For example usage see the link:example_SDL_glue.html[SDL glue example]. X Server ~~~~~~~~ @@ -116,14 +114,15 @@ Returns pointer to initialized X11 backend or in case of failure 'NULL'. When display is 'NULL' default display is used (which is what you want most of the time). -This backend feeds key events into global input queue. - This backends supports multiple windows. Each time you call the initialization -rutine new backend structure is returned. All backend instances share the xlib +routine new backend structure is returned. All backend instances share the Xlib connection so you need to wait or poll only on one of them. Each backend, on the other hand, has its own input queue. -TIP: See mutliple windows link:example_x11_windows.html[example]. +TIP: See multiple windows link:example_x11_windows.html[example]. + +GP_BackendIsX11 +^^^^^^^^^^^^^^^ [source,c] ------------------------------------------------------------------------------- @@ -135,6 +134,20 @@ TIP: See mutliple windows link:example_x11_windows.html[example]. * Returns non-zero if backend is X11 backend */ int GP_BackendIsX11(GP_Backend *self); +------------------------------------------------------------------------------- + +The 'GP_BackendIsX11()' returns non-zero if backend is X11 backend, zero +otherwise. + + +GP_BackendX11RequestFullscreen +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <backends/GP_X11.h> /* * Changes full screen mode. @@ -146,11 +159,11 @@ int GP_BackendIsX11(GP_Backend *self); 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. +It will most likely generate resize event. See the 'GP_BackendResizeAck()' bellow. + + Overall init function ~~~~~~~~~~~~~~~~~~~~~ @@ -176,15 +189,14 @@ initialized backend is returned otherwise 'NULL' is returned and some helpful information should be printed into the passed help 'FILE'. -Drawing Backend API +General Backend API ~~~~~~~~~~~~~~~~~~~ -The drawing backend API consist of structure with callbacks. Every backend -initialization yields pointer to this structure. Although is possible to call -these pointers directly it's not recommended and everybody should rather use -backend inline functions instead. - -The backend API consist GP_Backend structure and of several functions: +The backend API consist of a structure with callbacks. Every backend +initialization yields this structure. Although is possible to call these +pointers directly it's not recommended and everybody should rather use backend +inline functions instead as they provide more convenient API and do additional +sanity checks on parameters. [source,c] ------------------------------------------------------------------------------- @@ -195,7 +207,7 @@ typdef struct GP_Backend { const char *name; /* - * Pointer to context app should draw to. + * Pointer to context APP should draw to. */ GP_Context *context; @@ -208,8 +220,12 @@ typdef struct GP_Backend { }; ------------------------------------------------------------------------------- -The file descriptor 'fd' is either set to -1 (in case of SDL that shadows it) -or to a backend connection file descriptor usable for 'select()' or 'poll()'. +The file descriptor 'fd' is either set to -1 (in case of SDL that does not +export it) or to a backend connection file descriptor usable for 'select()' or +'poll()'. + +GP_BackendExit +^^^^^^^^^^^^^^ [source,c] ------------------------------------------------------------------------------- @@ -220,16 +236,21 @@ or to a backend connection file descriptor usable for 'select()' or 'poll()'. void GP_BackendExit(GP_Backend *backend); ------------------------------------------------------------------------------- -Calls an backend exit callback. Resets the display, keyboard, etc. state back. +Calls an backend exit callback. Restores the display, keyboard, etc. state +back. -WARNING: It's very important to call this functions on application exit. If you +WARNING: It's important to call this functions on application exit. If you doesn't do so, the state of the display, resolution etc. may not be - reset back to its original state. This includes program crashes and - iterruptions. Also this function may not be signal-async-safe, it's - better to set signal hanlers that calls it on SEGFAULT and SIGBUS + restored back to its original state. This includes program crashes and + interruptions. Also this function may not be signal-async-safe, it's + better to set signal handlers that calls it on SEGFAULT and SIGBUS as this usually works and not doing so may leave non-working system with black display or non-responding keyboard. + +GP_BackendFlip +^^^^^^^^^^^^^^ + [source,c] ------------------------------------------------------------------------------- #include <backends/GP_Backend.h> @@ -239,7 +260,12 @@ WARNING: It's very important to call this functions on application exit. If you GP_BackendFlip(GP_Backend *backend); ------------------------------------------------------------------------------- -Flips a screen. Updates rectangle for a buffered backends. +Flips a screen. Blits backend buffer to the screen or window if the backend is +buffered. + + +GP_BackendUpdateRect +^^^^^^^^^^^^^^^^^^^^ [source,c] ------------------------------------------------------------------------------- @@ -252,7 +278,11 @@ void GP_BackendUpdateRect(GP_Backend *backend, GP_Coord x1, GP_Coord y1); ------------------------------------------------------------------------------- -Updates particular rectangle for a buffered backends. +Updates particular rectangle in case backend is buffered. + + +GP_BackendPoll +^^^^^^^^^^^^^^ [source,c] ------------------------------------------------------------------------------- @@ -263,11 +293,25 @@ Updates particular rectangle for a buffered backends. void GP_BackendPoll(GP_Backend *backend); ------------------------------------------------------------------------------- -Polls for backend events. For backends that do not expose file descriptor -(namely SDL) this should be called repeatedly. For other backend it may be -called either repeatedly or when data are ready on file-descriptor. +Polls for backend events. + +The poll only reads events from event source (i.e. X11 socket, Linux evdev +file descriptor), process them and may place new event into the backend event +queue. + +This call returns immediately after queued events (from X11 socket, etc.) were +processed. -This call returns immediately after queued backend events were processed. +For backends that do not expose file descriptor (namely SDL) this should be +called repeatedly. For other backends it may be called either repeatedly or +when data are ready on file-descriptor. + +If the backend is the only source of events in your application, you should +consider using the 'GP_BackendWait()' or 'GP_BackendEventWait()' described +bellow. + +GP_BackendPollEvent +^^^^^^^^^^^^^^^^^^^ [source,c] ------------------------------------------------------------------------------- @@ -275,21 +319,65 @@ This call returns immediately after queued backend events were processed. /* or */ #include <GP.h> -void GP_BackendWait(GP_Backend *backend); +int GP_BackendPollEvent(GP_Backend *self, GP_Event *ev); +------------------------------------------------------------------------------- + +Combines the 'GP_BackendPoll()' with 'GP_BackendGetEvent()'. + +If there are any events in the backend event queue, the top event is removed +from the queue and copied into the memory pointed by 'ev' and the call returns +immediately. + +If backend event queue is empty 'GP_BackendPoll()' is called. Then again the +backend event queue is checked and if an event is found it's removed from the +queue and copied into the 'ev'. + +Returns non-zero if event was copied into the memory pointed by 'ev', zero +otherwise. + +.Example 'GP_BackendPollEvent()' usage. +[source,c] +------------------------------------------------------------------------------- + /* Called either repeatedly or when data are ready on backend fd */ + + GP_Event ev; + + while (GP_BackendPollEvent(backend, &ev) { + + /* process events */ + + } +------------------------------------------------------------------------------- + + +GP_BackendWait +^^^^^^^^^^^^^^ + +[source,c] +------------------------------------------------------------------------------- +#include <backends/GP_Backend.h> +/* or */ +#include <GP.h> + +void GP_BackendWait(GP_Backend *self); ------------------------------------------------------------------------------- Blocks until backend event arrives. [NOTE] -Events recieved by backend are not necessarily translated into the input +Events received by backend are not necessarily translated into the input events. [WARNING] -Using GP_BackendWait() in multithreaded program will most likely cause +Using GP_BackendWait() in multi-threaded program will most likely cause deadlocks. As the backend data structures and connection is guarded by a lock any other backend function (called from different thread while GP_BackendWait() is blocking) will lock until GP_BackendWait() returns (i.e. -event was recieved). +event was received). + + +GP_BackendWaitEvent +^^^^^^^^^^^^^^^^^^^ [source,c] ------------------------------------------------------------------------------- @@ -297,11 +385,36 @@ event was recieved). /* or */ #include <GP.h> -int GP_BackendSetCaption(GP_Backend *backend, const char *caption) +void GP_BackendWaitEvent(GP_Backend *self, GP_Event *ev); ------------------------------------------------------------------------------- -Sets backend caption. On success zero is returned. On failure (backend doesn't -support caption, operation failed) non zero is returned. +Combines the 'GP_BackendWait()' with 'GP_BackendGetEvent()'. + +If there are any events in the backend event queue, the top event is removed +from the queue and copied into the memory pointed by 'ev' and the call returns +immediately. + +If backend event queue is empty 'GP_BackendWait()' is called until there are +any events in the backend event queue. Then the top event is removed from the +queue and the call returns. + +.Example 'GP_BackendWaitEvent()' usage. +[source,c] +------------------------------------------------------------------------------- + /* This is the main program loop */ + GP_Event ev; + + for (;;) { + GP_BackendWaitEvent(backend, &ev); + + /* process events */ + + } +------------------------------------------------------------------------------- + + +GP_BackendEventsQueued +^^^^^^^^^^^^^^^^^^^^^^ [source,c] ------------------------------------------------------------------------------- @@ -309,15 +422,15 @@ support caption, operation failed) non zero is returned. /* or */ #include <GP.h> -int GP_BackendResize(GP_Backend *backend, uint32_t w, uint32_t h); +unsigned int GP_BackendEventsQueued(GP_Backend *self); ------------------------------------------------------------------------------- -Resize backend, if supported. On success zero is returned and backend is -resized, otherwise (if resize failed, or is not supported) non-zero is -returned. If backend size already matches w and h, nothing is done. +Returns number of events queued in the backend event queue. + -Note that backend->context pointer may change upon calling this function and -at least backend->context->pixels pointer will change. + +GP_BackendGetEvent +^^^^^^^^^^^^^^^^^^ [source,c] ------------------------------------------------------------------------------- @@ -325,15 +438,22 @@ at least backend->context->pixels pointer will change. /* or */ #include <GP.h> -int GP_BackendResizeAck(GP_Backend *self); +int GP_BackendGetEvent(GP_Backend *self, GP_Event *ev); ------------------------------------------------------------------------------- -If backend is resizeable by user interaction (for example X Window) you will -get resize event for each change of window size, however the backend context -will not be resized untill you call this function. This is usefull in -multithreaded application where one threads waits for events and others draws -into the buffer so you can stop the drawing threads before the backend context -size change. +In case there are any events queued, the top event is removed from the queue, +copied into the event structure that is passed as argument and non-zero is +returned. + +If there are no events queued the call returns immediately with zero return +value. + +TIP: For more information on events see link:input.html[input events] + documentation. + + +GP_BackendSetCaption +^^^^^^^^^^^^^^^^^^^^ [source,c] ------------------------------------------------------------------------------- @@ -341,10 +461,16 @@ size change. /* or */ #include <GP.h> -unsigned int GP_BackendEventsQueued(GP_Backend *self); +int GP_BackendSetCaption(GP_Backend *backend, const char *caption) ------------------------------------------------------------------------------- -Returns number of events queued in the backend event queue. +Sets backend caption. On success zero is returned. On failure (backend doesn't +support caption, operation failed) non zero is returned. + + + +GP_BackendResize +^^^^^^^^^^^^^^^^ [source,c] ------------------------------------------------------------------------------- @@ -352,14 +478,35 @@ Returns number of events queued in the backend event queue. /* or */ #include <GP.h> -int GP_BackendGetEvent(GP_Backend *self, GP_Event *ev); +int GP_BackendResize(GP_Backend *backend, uint32_t w, uint32_t h); ------------------------------------------------------------------------------- -In case there are any events queued, the top event is removed from the queue, -copied into the event structure that is passed as argument and non-zero is -returned. +Requests backend resize. If backend resize is supported and the resize request +was successful (i.e. X server allowed us to resize the window) the resize +event will be send and should be handled in your event loop. You must respond +to it by the 'GP_BackendResizeAck()' described bellow. + +NOTE: The backend->context pointer may change upon calling this function and + at least backend->context->pixels pointer will change. + + +GP_BackendResizeAck +^^^^^^^^^^^^^^^^^^^ + +[source,c] +------------------------------------------------------------------------------- +#include <backends/GP_Backend.h> +/* or */ +#include <GP.h> + +int GP_BackendResizeAck(GP_Backend *self); +------------------------------------------------------------------------------- + +If backend is resizable by user interaction (for example X Window) you will +get resize event for each change of window size, however the backend context +will not be resized until you call this function. This is useful in +multi-threaded application where one threads waits for events and others draws +into the buffer so you can stop the drawing threads before the backend context +size change. -If there are no events queued the call returns immediately with zero return -value. -TIP: For more information see link:input.html[input events] documentation. http://repo.or.cz/w/gfxprim.git/commit/7fe5da4df935e00826c20e00ed95b46b7dcb… commit 7fe5da4df935e00826c20e00ed95b46b7dcb7c74 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 13:35:31 2013 +0200 libs: backends: Fix warning message. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/backends/GP_Backend.c b/libs/backends/GP_Backend.c index c31f29e..9d80d55 100644 --- a/libs/backends/GP_Backend.c +++ b/libs/backends/GP_Backend.c @@ -61,14 +61,14 @@ void GP_BackendUpdateRectXYXY(GP_Backend *backend, GP_Coord w = backend->context->w; if (x1 >= w) { - GP_WARN("Invalid x coordinate %i, clipping to %u", x1, w - 1); + GP_WARN("Too large x coordinate %i, clipping to %u", x1, w - 1); x1 = w - 1; } GP_Coord h = backend->context->h; if (y1 >= h) { - GP_WARN("Invalid x coordinate %i, clipping to %u", y1, h - 1); + GP_WARN("Too large y coordinate %i, clipping to %u", y1, h - 1); y1 = h - 1; } ----------------------------------------------------------------------- Summary of changes: doc/backends.txt | 281 +++++++++++++++++++++++++++++++++----------- libs/backends/GP_Backend.c | 4 +- 2 files changed, 216 insertions(+), 69 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: 33c5dac98c86347f2f58363fe76fe1aa69cee5c1
by metan 05 Apr '13

05 Apr '13

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 33c5dac98c86347f2f58363fe76fe1aa69cee5c1 (commit) from cc28051e9be2f576b732fc9a59b6174c96edcfab (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/33c5dac98c86347f2f58363fe76fe1aa69ce… commit 33c5dac98c86347f2f58363fe76fe1aa69cee5c1 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 1 23:30:25 2013 +0200 spiv: Map keypad + and - to zoom. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index d4f305f..5a92232 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -1044,10 +1044,12 @@ int main(int argc, char *argv[]) case GP_KEY_9: resize_backend(&params, 9, shift_flag); break; + case GP_KEY_KP_PLUS: case GP_KEY_DOT: params.show_progress_once = 1; zoom_mul(&params, 1.5); break; + case GP_KEY_KP_MINUS: case GP_KEY_COMMA: params.show_progress_once = 1; zoom_mul(&params, 1/1.5); ----------------------------------------------------------------------- Summary of changes: demos/spiv/spiv.c | 2 ++ 1 files changed, 2 insertions(+), 0 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: cc28051e9be2f576b732fc9a59b6174c96edcfab
by metan 01 Apr '13

01 Apr '13

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 cc28051e9be2f576b732fc9a59b6174c96edcfab (commit) from 9bb885ab0d280b9cb36180fe21147f24ace5b672 (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/cc28051e9be2f576b732fc9a59b6174c96ed… commit cc28051e9be2f576b732fc9a59b6174c96edcfab Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 1 17:50:07 2013 +0200 demos: py_simple: Add grabbers example. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/cam_view.py b/demos/py_simple/cam_view.py new file mode 100755 index 0000000..4159609 --- /dev/null +++ b/demos/py_simple/cam_view.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python + +from sys import exit +from time import sleep + +import gfxprim.core as core +import gfxprim.backends as backends +import gfxprim.input as input +import gfxprim.grabbers as grabbers + +def main(): + # Open grabber (i.e. web camera) + grabber = grabbers.GrabberV4L2Init("/dev/video0", 320, 240); + assert(grabber) + + # Create X11 window + bk = backends.BackendX11Init(None, 0, 0, grabber.frame.w, grabber.frame.h, "Grabbers test", 0) + assert(bk) + + # Start grabber capture + grabber.Start(); + + # Event loop + while True: + sleep(0.01) + + if (grabber.Poll()): + grabber.frame.Blit(0, 0, bk.context, 0, 0, grabber.frame.w, grabber.frame.h) + bk.Flip() + + ev = bk.PollEvent() + + if (ev is None): + continue + + input.EventDump(ev) + + if (ev.type == input.EV_KEY): + exit(0) + elif (ev.type == input.EV_SYS): + if (ev.code == input.EV_SYS_QUIT): + exit(0) + +if __name__ == '__main__': + main() ----------------------------------------------------------------------- Summary of changes: demos/py_simple/cam_view.py | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) create mode 100755 demos/py_simple/cam_view.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 master updated: 9bb885ab0d280b9cb36180fe21147f24ace5b672
by metan 01 Apr '13

01 Apr '13

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 9bb885ab0d280b9cb36180fe21147f24ace5b672 (commit) via a9ef97b9ae8b46b1fb805c55c09c0c14b554e235 (commit) from 285bcbbe9881cbaa844b7bb0184ad794717c538c (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/9bb885ab0d280b9cb36180fe21147f24ace5… commit 9bb885ab0d280b9cb36180fe21147f24ace5b672 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 1 00:49:00 2013 +0200 build: Update list of exported symbols. diff --git a/build/syms/Backend_symbols.txt b/build/syms/Backend_symbols.txt index 580f390..322c627 100644 --- a/build/syms/Backend_symbols.txt +++ b/build/syms/Backend_symbols.txt @@ -15,3 +15,7 @@ GP_ContextFromSurface GP_BackendResize GP_BackendResizeAck GP_BackendUpdateRectXYXY +GP_BackendFlip +GP_BackendWaitEvent +GP_BackendPollEvent + diff --git a/build/syms/Core_symbols.txt b/build/syms/Core_symbols.txt index 72ee71f..0dfdb17 100644 --- a/build/syms/Core_symbols.txt +++ b/build/syms/Core_symbols.txt @@ -23,6 +23,7 @@ GP_GammaPrint GP_DebugPrint GP_SetDebugLevel GP_GetDebugLevel +GP_SetDebugHandler GP_PrintAbortInfo diff --git a/build/syms/Filters_symbols.txt b/build/syms/Filters_symbols.txt index 25a3696..8343ae0 100644 --- a/build/syms/Filters_symbols.txt +++ b/build/syms/Filters_symbols.txt @@ -41,6 +41,7 @@ GP_FilterFloydSteinberg_RGB888_to_xRGB14666_Raw GP_FilterFloydSteinberg_RGB888_to_xRGB2222_Raw GP_FilterFloydSteinberg_RGB888_to_xRGB7333_Raw GP_FilterFloydSteinberg_RGB888_to_xRGB8888_Raw +GP_FilterFloydSteinberg_RGB888_to_G16_Raw GP_FilterHilbertPeano_RGB888 GP_FilterHilbertPeano_RGB888_Alloc @@ -57,6 +58,7 @@ GP_FilterHilbertPeano_RGB888_to_xRGB14666_Raw GP_FilterHilbertPeano_RGB888_to_xRGB2222_Raw GP_FilterHilbertPeano_RGB888_to_xRGB7333_Raw GP_FilterHilbertPeano_RGB888_to_xRGB8888_Raw +GP_FilterHilbertPeano_RGB888_to_G16_Raw GP_FilterGaussianBlurEx GP_FilterGaussianBlurExAlloc @@ -98,11 +100,11 @@ GP_FilterMinAlloc GP_FilterMin_Raw GP_FilterMirrorH -GP_FilterMirrorH_Alloc +GP_FilterMirrorHAlloc GP_FilterMirrorH_Raw GP_FilterMirrorV -GP_FilterMirrorV_Alloc +GP_FilterMirrorVAlloc GP_FilterMirrorV_Raw GP_FilterMultiply @@ -148,15 +150,15 @@ GP_FilterResizeNNAlloc GP_FilterResizeNN_Raw GP_FilterRotate180 -GP_FilterRotate180_Alloc +GP_FilterRotate180Alloc GP_FilterRotate180_Raw GP_FilterRotate270 -GP_FilterRotate270_Alloc +GP_FilterRotate270Alloc GP_FilterRotate270_Raw GP_FilterRotate90 -GP_FilterRotate90_Alloc +GP_FilterRotate90Alloc GP_FilterRotate90_Raw GP_FilterSigmaEx @@ -165,7 +167,7 @@ GP_FilterSigmaExAlloc GP_FilterSymmetry GP_FilterSymmetryByName GP_FilterSymmetryNames -GP_FilterSymmetry_Alloc +GP_FilterSymmetryAlloc GP_FilterVConvolutionMP_Raw GP_FilterVHLinearConvolution_Raw http://repo.or.cz/w/gfxprim.git/commit/a9ef97b9ae8b46b1fb805c55c09c0c14b554… commit a9ef97b9ae8b46b1fb805c55c09c0c14b554e235 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 1 00:44:51 2013 +0200 backends: X11: Declare internal functions static. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/backends/GP_X11_Win.h b/libs/backends/GP_X11_Win.h index 11786a8..eb6905b 100644 --- a/libs/backends/GP_X11_Win.h +++ b/libs/backends/GP_X11_Win.h @@ -78,7 +78,7 @@ static void win_list_rem(struct x11_win *win) win_list = win->next; } -struct x11_win *win_list_lookup(Window win) +static struct x11_win *win_list_lookup(Window win) { struct x11_win *i; @@ -382,7 +382,7 @@ static int x11_win_open(struct x11_wreq *wreq) return 0; } -void x11_win_close(struct x11_win *win) +static void x11_win_close(struct x11_win *win) { XLockDisplay(win->dpy); ----------------------------------------------------------------------- Summary of changes: build/syms/Backend_symbols.txt | 4 ++++ build/syms/Core_symbols.txt | 1 + build/syms/Filters_symbols.txt | 14 ++++++++------ libs/backends/GP_X11_Win.h | 4 ++-- 4 files changed, 15 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: 285bcbbe9881cbaa844b7bb0184ad794717c538c
by metan 01 Apr '13

01 Apr '13

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 285bcbbe9881cbaa844b7bb0184ad794717c538c (commit) via 4b6af799b2564c6bad521bfd37affaaffbe22e9c (commit) from 9f976bc10006bdd76c3c4709fa6baeb1dda15f3f (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/285bcbbe9881cbaa844b7bb0184ad794717c… commit 285bcbbe9881cbaa844b7bb0184ad794717c538c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 1 00:38:17 2013 +0200 pywrap: Add grabbers bindings + example. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/Makefile b/pylib/gfxprim/Makefile index afcad67..a2b9700 100644 --- a/pylib/gfxprim/Makefile +++ b/pylib/gfxprim/Makefile @@ -1,4 +1,4 @@ TOPDIR=../.. -SUBDIRS=core loaders backends gfx filters text input +SUBDIRS=core loaders backends gfx filters text input grabbers CLEAN+=*.pyc include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/grabbers/Makefile b/pylib/gfxprim/grabbers/Makefile new file mode 100644 index 0000000..b001822 --- /dev/null +++ b/pylib/gfxprim/grabbers/Makefile @@ -0,0 +1,11 @@ +TOPDIR=../../.. +LIBNAME=grabbers +INCLUDE=core + +LDFLAGS+=$(shell $(TOPDIR)/gfxprim-config --libs-grabbers) + +include $(TOPDIR)/pre.mk +include $(TOPDIR)/pywrap.mk +include $(TOPDIR)/post.mk + +include ../silence_swig_warnings.mk diff --git a/pylib/gfxprim/grabbers/__init__.py b/pylib/gfxprim/grabbers/__init__.py new file mode 100644 index 0000000..a36f214 --- /dev/null +++ b/pylib/gfxprim/grabbers/__init__.py @@ -0,0 +1,50 @@ +""" +Module for GFXprim grabbers. +""" + +# Import the SWIG wrapper +from . import c_grabbers +from ..utils import extend + +def extend_grabber(_Grabber): + """ + Extends _grabber class with convenience methods. + Called once on module initialization. + """ + @extend(_Grabber) + def Start(self): + "Starts frame capture." + c_grabbers.GP_GrabberStart(self) + + @extend(_Grabber) + def Stop(self): + "Stops frame capture." + c_grabbers.GP_GrabberStop(self) + + @extend(_Grabber) + def Poll(self): + "Polls for a frame." + return c_grabbers.GP_GrabberPoll(self) + +# Pull GP_Grabber +Grabber = c_grabbers.GP_Grabber + +def _init(module): + # Extend GP_Grabber with convenience methods + extend_grabber(Grabber) + + # Imports from the SWIG module + import re + def strip_GP(s): + return re.sub('^GP_', '', s) + + # Import some members from the SWIG module + from ..utils import import_members + import_members(c_grabbers, module, sub=strip_GP, + exclude=[ + '^gfxprim$', + '^w+_swigregister$', + '^_w+$']) + +_init(locals()) +del _init diff --git a/pylib/gfxprim/grabbers/grabbers.i b/pylib/gfxprim/grabbers/grabbers.i new file mode 100644 index 0000000..a6f1d13 --- /dev/null +++ b/pylib/gfxprim/grabbers/grabbers.i @@ -0,0 +1,36 @@ +%include "../common.i" +%module(package="gfxprim.grabbers") c_grabbers + +%{ +#include "GP_Grabbers.h" +#include "core/GP_Debug.h" +%} + +/* %import ../core/core.i */ + +/* + * General grabber structure handling + */ +%extend GP_Grabber { + ~GP_Grabber() { + GP_DEBUG(2, "[wrapper] GP_GrabberExit (%p)", $self); + GP_GrabberExit($self); + } +}; + +%ignore GP_Grabber::priv; +%ignore GP_Grabber::fd; + +%ignore GP_Grabber::Start; +%ignore GP_Grabber::Stop; +%ignore GP_Grabber::Exit; +%ignore GP_Grabber::Poll; + +%include "GP_Grabber.h" + +/* + * Particular grabbers. + */ +ERROR_ON_NULL(GP_GrabberV4L2Init); +%newobject GP_GrabberV4L2Init; +%include "GP_V4L2.h" http://repo.or.cz/w/gfxprim.git/commit/4b6af799b2564c6bad521bfd37affaaffbe2… commit 4b6af799b2564c6bad521bfd37affaaffbe22e9c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 1 00:25:50 2013 +0200 pywrap: backends: Fix typo. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/backends/_extend_backend.py b/pylib/gfxprim/backends/_extend_backend.py index d2f22b5..b1fab72 100644 --- a/pylib/gfxprim/backends/_extend_backend.py +++ b/pylib/gfxprim/backends/_extend_backend.py @@ -5,7 +5,7 @@ from ..input import c_input def extend_backend(_backend): """ Extends _backend class with convenience methods. - Called once on module inicialization. + Called once on module initialization. """ @extend(_backend, name='__str__') ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/Makefile | 2 +- pylib/gfxprim/backends/_extend_backend.py | 2 +- pylib/gfxprim/{backends => grabbers}/Makefile | 4 +- pylib/gfxprim/grabbers/__init__.py | 50 +++++++++++++++++++++++++ pylib/gfxprim/grabbers/grabbers.i | 36 ++++++++++++++++++ 5 files changed, 90 insertions(+), 4 deletions(-) copy pylib/gfxprim/{backends => grabbers}/Makefile (65%) create mode 100644 pylib/gfxprim/grabbers/__init__.py create mode 100644 pylib/gfxprim/grabbers/grabbers.i 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: 9f976bc10006bdd76c3c4709fa6baeb1dda15f3f
by metan 31 Mar '13

31 Mar '13

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 9f976bc10006bdd76c3c4709fa6baeb1dda15f3f (commit) from 5cd86d45da74ebf34224157f12d693e82b59f4b2 (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/9f976bc10006bdd76c3c4709fa6baeb1dda1… commit 9f976bc10006bdd76c3c4709fa6baeb1dda15f3f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 31 23:56:57 2013 +0200 demos:c_simple: Make use of BackendWaitEvent(). Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/c_simple/backend_example.c b/demos/c_simple/backend_example.c index c711f41..b0faf84 100644 --- a/demos/c_simple/backend_example.c +++ b/demos/c_simple/backend_example.c @@ -28,11 +28,25 @@ #include <GP.h> +static void redraw(GP_Backend *self) +{ + GP_Context *context = self->context; + GP_Pixel white_pixel, black_pixel; + + black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, context); + white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, context); + + GP_Fill(context, black_pixel); + GP_Line(context, 0, 0, context->w - 1, context->h - 1, white_pixel); + GP_Line(context, 0, context->h - 1, context->w - 1, 0, white_pixel); + + /* Update the backend screen */ + GP_BackendFlip(self); +} + int main(int argc, char *argv[]) { GP_Backend *backend; - GP_Context *context; - GP_Pixel white_pixel, black_pixel; const char *backend_opts = "X11:100x100"; int opt; @@ -56,51 +70,43 @@ int main(int argc, char *argv[]) backend = GP_BackendInit(backend_opts, "Backend Example", stderr); - context = backend->context; - - black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, context); - white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, context); - - GP_Fill(context, black_pixel); - GP_Line(context, 0, 0, context->w - 1, context->h - 1, white_pixel); - GP_Line(context, 0, context->h - 1, context->w - 1, 0, white_pixel); + if (backend == NULL) { + fprintf(stderr, "Failed to initialize backendn"); + return 1; + } - /* Update the backend screen */ - GP_BackendFlip(backend); + redraw(backend); + /* Handle events */ for (;;) { - /* Wait for backend event */ - GP_BackendWait(backend); - - /* Read and parse events */ GP_Event ev; - while (GP_BackendGetEvent(backend, &ev)) { - - GP_EventDump(&ev); - - switch (ev.type) { - case GP_EV_KEY: - switch (ev.val.val) { - case GP_KEY_ESC: - case GP_KEY_Q: - GP_BackendExit(backend); - return 0; - break; - } + GP_BackendWaitEvent(backend, &ev); + + GP_EventDump(&ev); + + switch (ev.type) { + case GP_EV_KEY: + switch (ev.val.val) { + case GP_KEY_ESC: + case GP_KEY_Q: + GP_BackendExit(backend); + return 0; break; - case GP_EV_SYS: - switch (ev.code) { - case GP_EV_SYS_RESIZE: - GP_BackendResizeAck(backend); - break; - case GP_EV_SYS_QUIT: - GP_BackendExit(backend); - return 0; - break; - } + } + break; + case GP_EV_SYS: + switch (ev.code) { + case GP_EV_SYS_RESIZE: + GP_BackendResizeAck(backend); + redraw(backend); + break; + case GP_EV_SYS_QUIT: + GP_BackendExit(backend); + return 0; break; } + break; } } diff --git a/demos/c_simple/fileview.c b/demos/c_simple/fileview.c index aa6ff0b..26ae4e0 100644 --- a/demos/c_simple/fileview.c +++ b/demos/c_simple/fileview.c @@ -122,7 +122,9 @@ void event_loop(void) { GP_Event ev; - while (GP_BackendGetEvent(backend, &ev)) { + for (;;) { + GP_BackendWaitEvent(backend, &ev); + switch (ev.type) { case GP_EV_KEY: if (ev.code != GP_EV_KEY_DOWN) @@ -268,10 +270,7 @@ int main(int argc, char *argv[]) redraw_screen(); GP_BackendFlip(backend); - for (;;) { - GP_BackendWait(backend); - event_loop(); - } + event_loop(); return 0; } diff --git a/demos/c_simple/fonttest.c b/demos/c_simple/fonttest.c index e374ec9..f6516cb 100644 --- a/demos/c_simple/fonttest.c +++ b/demos/c_simple/fonttest.c @@ -190,7 +190,9 @@ void event_loop(void) { GP_Event ev; - while (GP_BackendGetEvent(win, &ev)) { + for (;;) { + GP_BackendWaitEvent(win, &ev); + switch (ev.type) { case GP_EV_KEY: if (ev.code != GP_EV_KEY_DOWN) @@ -284,8 +286,7 @@ int main(int argc, char *argv[]) redraw_screen(); GP_BackendFlip(win); - for (;;) { - GP_BackendWait(win); - event_loop(); - } + event_loop(); + + return 0; } diff --git a/demos/c_simple/shapetest.c b/demos/c_simple/shapetest.c index 0edfce1..9cebdd3 100644 --- a/demos/c_simple/shapetest.c +++ b/demos/c_simple/shapetest.c @@ -337,7 +337,9 @@ void event_loop(void) GP_Event ev; - while (GP_BackendGetEvent(backend, &ev)) { + for (;;) { + GP_BackendWaitEvent(backend, &ev); + GP_EventDump(&ev); shift_pressed = GP_EventGetKey(&ev, GP_KEY_LEFT_SHIFT) || @@ -498,11 +500,8 @@ int main(void) darkgray = GP_ColorToContextPixel(GP_COL_GRAY_DARK, win); print_instructions(); - redraw_screen(); + event_loop(); - for (;;) { - GP_BackendWait(backend); - event_loop(); - } + return 0; } diff --git a/demos/c_simple/showimage.c b/demos/c_simple/showimage.c index 8903515..3394230 100644 --- a/demos/c_simple/showimage.c +++ b/demos/c_simple/showimage.c @@ -66,15 +66,13 @@ int main(int argc, char *argv[]) /* Wait for events */ for (;;) { - GP_BackendWait(backend); - GP_Event ev; - while (GP_BackendGetEvent(backend, &ev)) { - if (ev.type == GP_EV_KEY && ev.val.val == GP_KEY_Q) { - GP_BackendExit(backend); - return 0; - } + GP_BackendWaitEvent(backend, &ev); + + if (ev.type == GP_EV_KEY && ev.val.val == GP_KEY_Q) { + GP_BackendExit(backend); + return 0; } } diff --git a/demos/c_simple/textaligntest.c b/demos/c_simple/textaligntest.c index 5ae84ab..39391b4 100644 --- a/demos/c_simple/textaligntest.c +++ b/demos/c_simple/textaligntest.c @@ -73,7 +73,9 @@ static void event_loop(void) { GP_Event ev; - while (GP_BackendGetEvent(win, &ev)) { + for (;;) { + GP_BackendWaitEvent(win, &ev); + switch (ev.type) { case GP_EV_KEY: if (ev.code != GP_EV_KEY_DOWN) @@ -156,12 +158,9 @@ int main(int argc, char *argv[]) darkgray_pixel = GP_ColorToContextPixel(GP_COL_GRAY_DARK, win->context); redraw_screen(); - GP_BackendFlip(win); + event_loop(); - for (;;) { - GP_BackendWait(win); - event_loop(); - } + return 0; } ----------------------------------------------------------------------- Summary of changes: demos/c_simple/backend_example.c | 84 ++++++++++++++++++++----------------- demos/c_simple/fileview.c | 9 ++-- demos/c_simple/fonttest.c | 11 +++-- demos/c_simple/shapetest.c | 11 ++--- demos/c_simple/showimage.c | 12 ++--- demos/c_simple/textaligntest.c | 11 ++--- 6 files changed, 70 insertions(+), 68 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: 5cd86d45da74ebf34224157f12d693e82b59f4b2
by metan 31 Mar '13

31 Mar '13

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 5cd86d45da74ebf34224157f12d693e82b59f4b2 (commit) via 0e4c5008405449803a027e648fdf868ac56cc831 (commit) from 09bc0dca7b0d23abbeb091baea61573a9cc0411d (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/5cd86d45da74ebf34224157f12d693e82b59… commit 5cd86d45da74ebf34224157f12d693e82b59f4b2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 31 19:27:23 2013 +0200 pywrap: backends: Make use of WaitEvent and PollEvent. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/gfx.py b/demos/py_simple/gfx.py index 9c1ce13..2c9aef3 100755 --- a/demos/py_simple/gfx.py +++ b/demos/py_simple/gfx.py @@ -149,7 +149,7 @@ def main(): # Event loop while True: - ev = bk.Wait() + ev = bk.WaitEvent() input.EventDump(ev) diff --git a/demos/py_simple/showimage.py b/demos/py_simple/showimage.py index c61f5ff..6c5e97c 100755 --- a/demos/py_simple/showimage.py +++ b/demos/py_simple/showimage.py @@ -23,7 +23,7 @@ def main(): # Event loop while True: - ev = bk.Wait() + ev = bk.WaitEvent() input.EventDump(ev) diff --git a/pylib/gfxprim/backends/_extend_backend.py b/pylib/gfxprim/backends/_extend_backend.py index 53e1700..d2f22b5 100644 --- a/pylib/gfxprim/backends/_extend_backend.py +++ b/pylib/gfxprim/backends/_extend_backend.py @@ -26,31 +26,31 @@ def extend_backend(_backend): @extend(_backend) def Poll(self): + "Poll the backend." + c_backends.GP_BackendPoll(self) + + @extend(_backend) + def PollEvent(self): "Poll the backend for events." ev = c_input.GP_Event(); - if c_backends.GP_BackendGetEvent(self, ev) != 0: - return ev - - c_backends.GP_BackendPoll(self) - - if c_backends.GP_BackendGetEvent(self, ev) != 0: + if c_backends.GP_BackendPollEvent(self, ev) != 0: return ev return None + @extend(_backend) def Wait(self): - "Waits for backend event" + "Waits for backend." + c_backends.GP_BackendWait(self) + + @extend(_backend) + def WaitEvent(self): + "Waits for backend event." ev = c_input.GP_Event(); - if c_backends.GP_BackendGetEvent(self, ev) != 0: - return ev - - while c_backends.GP_BackendGetEvent(self, ev) == 0: - c_backends.GP_BackendWait(self) - - c_backends.GP_BackendGetEvent(self, ev) + c_backends.GP_BackendWaitEvent(self, ev) return ev http://repo.or.cz/w/gfxprim.git/commit/0e4c5008405449803a027e648fdf868ac56c… commit 0e4c5008405449803a027e648fdf868ac56cc831 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 31 19:18:11 2013 +0200 backends: Add WaitEvent and PollEvent Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/include/backends/GP_Backend.h b/include/backends/GP_Backend.h index c1b89d6..02c5b29 100644 --- a/include/backends/GP_Backend.h +++ b/include/backends/GP_Backend.h @@ -185,6 +185,11 @@ static inline void GP_BackendPoll(GP_Backend *backend) } /* + * Poll and GetEvent combined. + */ +int GP_BackendPollEvent(GP_Backend *self, GP_Event *ev); + +/* * Waits for backend events. */ static inline void GP_BackendWait(GP_Backend *backend) @@ -193,6 +198,11 @@ static inline void GP_BackendWait(GP_Backend *backend) } /* + * Wait and GetEvent combined. + */ +int GP_BackendWaitEvent(GP_Backend *self, GP_Event *ev); + +/* * Sets backend caption, if supported. * * When setting caption is not possible/implemented non zero is returned. diff --git a/libs/backends/GP_Backend.c b/libs/backends/GP_Backend.c index 87959e3..c31f29e 100644 --- a/libs/backends/GP_Backend.c +++ b/libs/backends/GP_Backend.c @@ -102,3 +102,30 @@ int GP_BackendResizeAck(GP_Backend *self) return 0; } + +int GP_BackendWaitEvent(GP_Backend *self, GP_Event *ev) +{ + int ret; + + for (;;) { + if ((ret = GP_BackendGetEvent(self, ev))) + return ret; + + GP_BackendWait(self); + } +} + +int GP_BackendPollEvent(GP_Backend *self, GP_Event *ev) +{ + int ret; + + if ((ret = GP_BackendGetEvent(self, ev))) + return ret; + + GP_BackendPoll(self); + + if ((ret = GP_BackendGetEvent(self, ev))) + return ret; + + return 0; +} ----------------------------------------------------------------------- Summary of changes: demos/py_simple/gfx.py | 2 +- demos/py_simple/showimage.py | 2 +- include/backends/GP_Backend.h | 10 ++++++++++ libs/backends/GP_Backend.c | 27 +++++++++++++++++++++++++++ pylib/gfxprim/backends/_extend_backend.py | 28 ++++++++++++++-------------- 5 files changed, 53 insertions(+), 16 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