Mercurial > dwindows
changeset 2355:fad0821cb953
Add new function dw_render_redraw() which will trigger expose event on render widgets.
This is to help optimize drawing on GTK4 and GTK3 with Wayland. To make existing code
function on GTK4 and GTK3 with Wayland, drawing outside of a callback will mark widgets
dirty and dw_flush() will trigger draw/expose callbacks on them. This may result in
double drawing the widgets. dw_render_redraw() will allow you to just trigger the
draw event without actually attempting to draw, allowing one draw pass in the expose
callback. Only tested on Windows, may require fixes on other platforms.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Mon, 08 Mar 2021 19:53:55 +0000 |
| parents | dfb52d2bddaa |
| children | 6f4f7882363c |
| files | dw.h gtk/dw.c gtk3/dw.c gtk4/dw.c mac/dw.m os2/dw.c template/dw.c win/dw.c |
| diffstat | 8 files changed, 87 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dw.h Mon Mar 08 19:24:21 2021 +0000 +++ b/dw.h Mon Mar 08 19:53:55 2021 +0000 @@ -1812,6 +1812,7 @@ void API dw_exit(int exitcode); void API dw_shutdown(void); HWND API dw_render_new(unsigned long id); +void API dw_render_redraw(HWND handle); void API dw_color_foreground_set(unsigned long value); void API dw_color_background_set(unsigned long value); unsigned long API dw_color_choose(unsigned long value);
--- a/gtk/dw.c Mon Mar 08 19:24:21 2021 +0000 +++ b/gtk/dw.c Mon Mar 08 19:53:55 2021 +0000 @@ -8274,6 +8274,21 @@ return tmp; } +/* + * Invalidate the render widget triggering an expose event. + * Parameters: + * handle: A handle to a render widget to be redrawn. + */ +void API dw_render_redraw(HWND handle) +{ + int _locked_by_me = FALSE; + + DW_MUTEX_LOCK; + if(handle && GTK_IS_WIDGET(handle)) + gtk_widget_queue_draw(handle); + DW_MUTEX_UNLOCK; +} + /* Returns a GdkColor from a DW color */ static GdkColor _internal_color(unsigned long value) {
--- a/gtk3/dw.c Mon Mar 08 19:24:21 2021 +0000 +++ b/gtk3/dw.c Mon Mar 08 19:53:55 2021 +0000 @@ -7125,6 +7125,21 @@ return tmp; } +/* + * Invalidate the render widget triggering an expose event. + * Parameters: + * handle: A handle to a render widget to be redrawn. + */ +void API dw_render_redraw(HWND handle) +{ + int _locked_by_me = FALSE; + + DW_MUTEX_LOCK; + if(handle && GTK_IS_WIDGET(handle)) + gtk_widget_queue_draw(handle); + DW_MUTEX_UNLOCK; +} + /* Returns a GdkRGBA from a DW color */ static GdkRGBA _internal_color(unsigned long value) {
--- a/gtk4/dw.c Mon Mar 08 19:24:21 2021 +0000 +++ b/gtk4/dw.c Mon Mar 08 19:53:55 2021 +0000 @@ -6385,6 +6385,21 @@ DW_FUNCTION_RETURN_THIS(tmp); } +/* + * Invalidate the render widget triggering an expose event. + * Parameters: + * handle: A handle to a render widget to be redrawn. + */ +void API dw_render_redraw(HWND handle) +DW_FUNCTION_DEFINITION(dw_render_redraw, void, HWND handle) +DW_FUNCTION_ADD_PARAM1(handle) +DW_FUNCTION_NO_RETURN(dw_render_redraw) +DW_FUNCTION_RESTORE_PARAM1(handle, HWND) +{ + if(handle && GTK_IS_WIDGET(handle)) + gtk_widget_queue_draw(handle); +} + /* Returns a GdkRGBA from a DW color */ static GdkRGBA _dw_internal_color(unsigned long value) {
--- a/mac/dw.m Mon Mar 08 19:24:21 2021 +0000 +++ b/mac/dw.m Mon Mar 08 19:53:55 2021 +0000 @@ -6690,6 +6690,18 @@ return render; } +/* + * Invalidate the render widget triggering an expose event. + * Parameters: + * handle: A handle to a render widget to be redrawn. + */ +void API dw_render_redraw(HWND handle) +{ + DWRender *render = (DWRender *)handle; + + [render setNeedsDisplay:YES]; +} + /* Sets the current foreground drawing color. * Parameters: * red: red value.
--- a/os2/dw.c Mon Mar 08 19:24:21 2021 +0000 +++ b/os2/dw.c Mon Mar 08 19:53:55 2021 +0000 @@ -4975,6 +4975,16 @@ } /* + * Invalidate the render widget triggering an expose event. + * Parameters: + * handle: A handle to a render widget to be redrawn. + */ +void API dw_render_redraw(HWND handle) +{ + WinInvalidateRect(handle, NULL, FALSE); +} + +/* * Changes a window's parent to newparent. * Parameters: * handle: The window handle to destroy.
--- a/template/dw.c Mon Mar 08 19:24:21 2021 +0000 +++ b/template/dw.c Mon Mar 08 19:53:55 2021 +0000 @@ -1357,6 +1357,15 @@ return 0; } +/* + * Invalidate the render widget triggering an expose event. + * Parameters: + * handle: A handle to a render widget to be redrawn. + */ +void API dw_render_redraw(HWND handle) +{ +} + /* Sets the current foreground drawing color. * Parameters: * red: red value.
--- a/win/dw.c Mon Mar 08 19:24:21 2021 +0000 +++ b/win/dw.c Mon Mar 08 19:53:55 2021 +0000 @@ -11063,6 +11063,16 @@ return tmp; } +/* + * Invalidate the render widget triggering an expose event. + * Parameters: + * handle: A handle to a render widget to be redrawn. + */ +void API dw_render_redraw(HWND handle) +{ + InvalidateRect(handle, NULL, FALSE); +} + /* Sets the current foreground drawing color. * Parameters: * red: red value.