dwindows: win/dw.c comparison

comparison win/dw.c @ 1853:4790589f52a9

Initial commit for new dw_signal_connect_data() function... Same as dw_signal_connect() but it has an additional callback parameter that gets called when the callback is being removed. This allows me to free memory allocated for the data parameter and prevent memory leaks in godwindows... Tested GTK and Mac.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 27 Feb 2013 19:14:22 +0000
parents	905f8632005b
children	285bf986e4fd

comparison

equal deleted inserted replaced

-:5f0e4ca14dcd
+:4790589f52a9
 /*
 * Dynamic Windows:
 *          A GTK like implementation of the Win32 GUI
 *
-* (C) 2000-2012 Brian Smith <brian@dbsoft.org>
+* (C) 2000-2013 Brian Smith <brian@dbsoft.org>
 * (C) 2003-2011 Mark Hessling <mark@rexx.org>
 *
 */
 #ifdef AEROGLASS
 struct _sighandler   *next;
 ULONG message;
 HWND window;
 int id;
 void *signalfunction;
+void *discfunction;
 void *data;
 } SignalHandler;
 SignalHandler *Root = NULL;
 }
 #endif
 /* This function adds a signal handler callback into the linked list.
 */
-void _new_signal(ULONG message, HWND window, int id, void *signalfunction, void *data)
+void _new_signal(ULONG message, HWND window, int id, void *signalfunction, void *discfunc, void *data)
 {
 SignalHandler *new = malloc(sizeof(SignalHandler));
 new->message = message;
 new->window = window;
 new->id = id;
 new->signalfunction = signalfunction;
+new->discfunction = discfunc;
 new->data = data;
 new->next = NULL;
 if (!Root)
 {
 */
 int timerid = (int)SetTimer(NULL, 0, interval, _TimerProc);
 if(timerid)
 {
-_new_signal(WM_TIMER, NULL, timerid, sigfunc, data);
+_new_signal(WM_TIMER, NULL, timerid, sigfunc, NULL, data);
 return timerid;
 }
 }
 return 0;
 }
 *       sigfunc: The pointer to the function to be used as the callback.
 *       data: User data to be passed to the handler function.
 */
 void API dw_signal_connect(HWND window, char *signame, void *sigfunc, void *data)
 {
+dw_signal_connect_data(window, signame, sigfunc, NULL, data);
+}
+/*
+* Add a callback to a window event with a closure callback.
+* Parameters:
+*       window: Window handle of signal to be called back.
+*       signame: A string pointer identifying which signal to be hooked.
+*       sigfunc: The pointer to the function to be used as the callback.
+*       discfunc: The pointer to the function called when this handler is removed.
+*       data: User data to be passed to the handler function.
+*/
+void API dw_signal_connect_data(HWND window, char *signame, void *sigfunc, void *discfunc, void *data)
+{
 ULONG message = 0, id = 0;
 if (window && signame && sigfunc)
 {
 if (_stricmp(signame, DW_SIGNAL_SET_FOCUS) == 0)
 {
 id = (ULONG)(uintptr_t)window;
 window = owner;
 }
 }
-_new_signal(message, window, id, sigfunc, data);
+_new_signal(message, window, id, sigfunc, discfunc, data);
 }
 }
 }
 /*
 while(tmp)
 {
 if(((window < (HWND)65536 && (int)(intptr_t)window == tmp->id) || tmp->window == window) && tmp->message == message)
 {
+void (*discfunc)(HWND, void *) = (void (*)(HWND, void *))tmp->discfunction;
+if(discfunc)
+{
+discfunc(tmp->window, tmp->data);
+}
+if(prev)
+{
+prev->next = tmp->next;
+free(tmp);
+tmp = prev->next;
+}
+else
+{
+Root = tmp->next;
+free(tmp);
+tmp = Root;
+}
+}
+else
+{
+prev = tmp;
+tmp = tmp->next;
+}
+}
+}
+/*
+* Removes all callbacks for a given window.
+* Parameters:
+*       window: Window handle of callback to be removed.
+*/
+void API dw_signal_disconnect_by_window(HWND window)
+{
+SignalHandler *prev = NULL, *tmp = Root;
+while(tmp)
+{
+if((window < (HWND)65536 && (int)(intptr_t)window == tmp->id) || tmp->window == window)
+{
+void (*discfunc)(HWND, void *) = (void (*)(HWND, void *))tmp->discfunction;
+if(discfunc)
+{
+discfunc(tmp->window, tmp->data);
+}
+if(prev)
+{
+prev->next = tmp->next;
+free(tmp);
+tmp = prev->next;
+}
+else
+{
+Root = tmp->next;
+free(tmp);
+tmp = Root;
+}
+}
+else
+{
+prev = tmp;
+tmp = tmp->next;
+}
+}
+}
+/*
+* Removes all callbacks for a given window with specified data.
+* Parameters:
+*       window: Window handle of callback to be removed.
+*       data: Pointer to the data to be compared against.
+*/
+void API dw_signal_disconnect_by_data(HWND window, void *data)
+{
+SignalHandler *prev = NULL, *tmp = Root;
+while(tmp)
+{
+if(((window < (HWND)65536 && (int)(intptr_t)window == tmp->id) || tmp->window == window) && tmp->data == data)
+{
+void (*discfunc)(HWND, void *) = (void (*)(HWND, void *))tmp->discfunction;
+if(discfunc)
+{
+discfunc(tmp->window, tmp->data);
+}
 if(prev)
 {
 prev->next = tmp->next;
 free(tmp);
 tmp = prev->next;
 }
 }
 }
 /*
-* Removes all callbacks for a given window.
-* Parameters:
-*       window: Window handle of callback to be removed.
-*/
-void API dw_signal_disconnect_by_window(HWND window)
-{
-SignalHandler *prev = NULL, *tmp = Root;
-while(tmp)
-{
-if((window < (HWND)65536 && (int)(intptr_t)window == tmp->id) || tmp->window == window)
-{
-if(prev)
-{
-prev->next = tmp->next;
-free(tmp);
-tmp = prev->next;
-}
-else
-{
-Root = tmp->next;
-free(tmp);
-tmp = Root;
-}
-}
-else
-{
-prev = tmp;
-tmp = tmp->next;
-}
-}
-}
-/*
-* Removes all callbacks for a given window with specified data.
-* Parameters:
-*       window: Window handle of callback to be removed.
-*       data: Pointer to the data to be compared against.
-*/
-void API dw_signal_disconnect_by_data(HWND window, void *data)
-{
-SignalHandler *prev = NULL, *tmp = Root;
-while(tmp)
-{
-if(((window < (HWND)65536 && (int)(intptr_t)window == tmp->id) || tmp->window == window) && tmp->data == data)
-{
-if(prev)
-{
-prev->next = tmp->next;
-free(tmp);
-tmp = prev->next;
-}
-else
-{
-Root = tmp->next;
-free(tmp);
-tmp = Root;
-}
-}
-else
-{
-prev = tmp;
-tmp = tmp->next;
-}
-}
-}
-/*
 * Converts a UTF-8 encoded string into a wide string.
 * Parameters:
 *       utf8string: UTF-8 encoded source string.
 * Returns:
 *       Wide string that needs to be freed with dw_free()

Mercurial > dwindows

comparison win/dw.c @ 1853:4790589f52a9