dwindows: gtk4/dw.c annotate

annotate gtk4/dw.c @ 2975:ae4d6856b983

iOS: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE. Add DW_FEATURE_HTML_MESSAGE feature test and display in dwtest(oo). Mac: Make sure code is in WK_API_ENABLED tests so old MacOS versions are still supported.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 24 Mar 2023 17:15:59 +0000
parents	0577a97fe36d
children	d84182f0054e

rev	line source
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2 * Dynamic Windows:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3 * A GTK like cross-platform GUI
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4 * GTK4 forwarder module for portabilty.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5 *
2947 edb4307ac7ce Update copyright date, readme, license and changelog for upcoming release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2910 diff changeset	6 * (C) 2000-2023 Brian Smith <brian@dbsoft.org>
2751 ee1cfa7d645e Update copyright dates for the new year 2022. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7 * (C) 2003-2022 Mark Hessling <mark@rexx.org>
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9 #include "dwconfig.h"
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10 #include "dw.h"
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11 #include <glib/gi18n.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12 #include <string.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	13 #include <stdlib.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	14 #include <sys/utsname.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	15 #include <sys/socket.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	16 #include <sys/un.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	17 #include <sys/mman.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	18 #include <stdarg.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	19 #include <stdio.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	20 #include <unistd.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	21 #include <ctype.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	22 #include <errno.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	23 #include <sys/time.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	24 #include <dirent.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	25 #include <sys/stat.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	26 #include <signal.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	27 #include <fcntl.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	28 #include <unistd.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	29 #include <math.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	30 #include <gdk/gdkkeysyms.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	31
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	32 #ifdef GDK_WINDOWING_X11
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	33 #include <gdk/x11/gdkx.h>
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	34 #endif
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	35
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	36 #ifdef USE_WEBKIT
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	37 #include <webkit2/webkit2.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	38 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	39
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	40 #include <gdk-pixbuf/gdk-pixbuf.h>
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	41
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	42 #ifdef __FreeBSD__
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	43 #include <sys/param.h>
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	44 #include <sys/sysctl.h>
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	45 #endif
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	46
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	47 #if __STDC_VERSION__ < 199901L
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	48 # if __GNUC__ >= 2
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	49 # define __func__ __FUNCTION__
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	50 # else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	51 # define __func__ "<unknown>"
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	52 # endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	53 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	54
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	55 /* Macros to encapsulate running functions on the main thread
2308 a9018bd91d04 GTK4: Fix DW_SIGNAL_ITEM_ENTER callbacks via the keyboard. Remove mouse bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2306 diff changeset	56 * #define _DW_SINGLE_THREADED to disable thread safety encapsulation.
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	57 * Parameters converted to a pointer array:
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	58 * [0] Pointer to the thread's event semaphore
2311 f6a6ea6b28fe Fix a minor typo. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2310 diff changeset	59 * [1] Pointer to the function's return value
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	60 * [2] Pointer to function parameter 1
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	61 * ...
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	62 */
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	63 #ifndef _DW_SINGLE_THREADED
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	64 #define DW_FUNCTION_DEFINITION(func, rettype, ...) gboolean _##func(void **_args); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	65 rettype API func(__VA_ARGS__) {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	66 #define DW_FUNCTION_ADD_PARAM void *_args = alloca(sizeof(void )*4); \
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	67 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	68 _args[1] = (void *)NULL; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	69 _args[2] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	70 _args[3] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	71 #define DW_FUNCTION_ADD_PARAM1(param1) void *_args = alloca(sizeof(void )*5); \
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	72 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	73 _args[1] = (void *)NULL; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	74 _args[2] = (void *)&param1; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	75 _args[3] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	76 _args[4] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	77 #define DW_FUNCTION_ADD_PARAM2(param1, param2) void *_args = alloca(sizeof(void )*6); \
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	78 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	79 _args[1] = (void *)NULL; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	80 _args[2] = (void *)&param1; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	81 _args[3] = (void *)&param2; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	82 _args[4] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	83 _args[5] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	84 #define DW_FUNCTION_ADD_PARAM3(param1, param2, param3) void *_args = alloca(sizeof(void )*7); \
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	85 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	86 _args[1] = (void *)NULL; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	87 _args[2] = (void *)&param1; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	88 _args[3] = (void *)&param2; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	89 _args[4] = (void *)&param3; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	90 _args[5] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	91 _args[6] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	92 #define DW_FUNCTION_ADD_PARAM4(param1, param2, param3, param4) void *_args = alloca(sizeof(void )*8); \
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	93 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	94 _args[1] = (void *)NULL; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	95 _args[2] = (void *)&param1; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	96 _args[3] = (void *)&param2; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	97 _args[4] = (void *)&param3; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	98 _args[5] = (void *)&param4; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	99 _args[6] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	100 _args[7] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	101 #define DW_FUNCTION_ADD_PARAM5(param1, param2, param3, param4, param5) void *_args = alloca(sizeof(void )*9); \
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	102 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	103 _args[1] = (void *)NULL; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	104 _args[2] = (void *)&param1; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	105 _args[3] = (void *)&param2; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	106 _args[4] = (void *)&param3; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	107 _args[5] = (void *)&param4; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	108 _args[6] = (void *)&param5; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	109 _args[7] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	110 _args[8] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	111 #define DW_FUNCTION_ADD_PARAM6(param1, param2, param3, param4, param5, param6) \
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	112 void *_args = alloca(sizeof(void )*10); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	113 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	114 _args[1] = (void *)NULL; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	115 _args[2] = (void *)&param1; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	116 _args[3] = (void *)&param2; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	117 _args[4] = (void *)&param3; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	118 _args[5] = (void *)&param4; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	119 _args[6] = (void *)&param5; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	120 _args[7] = (void *)&param6; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	121 _args[8] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	122 _args[9] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	123 #define DW_FUNCTION_ADD_PARAM7(param1, param2, param3, param4, param5, param6, param7) \
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	124 void *_args = alloca(sizeof(void )*11); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	125 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	126 _args[1] = (void *)NULL; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	127 _args[2] = (void *)&param1; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	128 _args[3] = (void *)&param2; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	129 _args[4] = (void *)&param3; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	130 _args[5] = (void *)&param4; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	131 _args[6] = (void *)&param5; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	132 _args[7] = (void *)&param6; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	133 _args[8] = (void *)&param7; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	134 _args[9] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	135 _args[10] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	136 #define DW_FUNCTION_ADD_PARAM8(param1, param2, param3, param4, param5, param6, param7, param8) \
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	137 void *_args = alloca(sizeof(void )*12); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	138 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	139 _args[1] = (void *)NULL; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	140 _args[2] = (void *)&param1; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	141 _args[3] = (void *)&param2; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	142 _args[4] = (void *)&param3; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	143 _args[5] = (void *)&param4; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	144 _args[6] = (void *)&param5; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	145 _args[7] = (void *)&param6; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	146 _args[8] = (void *)&param7; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	147 _args[9] = (void *)&param8; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	148 _args[10] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	149 _args[11] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	150 #define DW_FUNCTION_ADD_PARAM9(param1, param2, param3, param4, param5, param6, param7, param8, param9) \
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	151 void *_args = alloca(sizeof(void )*13); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	152 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	153 _args[1] = (void *)NULL; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	154 _args[2] = (void *)&param1; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	155 _args[3] = (void *)&param2; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	156 _args[4] = (void *)&param3; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	157 _args[5] = (void *)&param4; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	158 _args[6] = (void *)&param5; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	159 _args[7] = (void *)&param6; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	160 _args[8] = (void *)&param7; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	161 _args[9] = (void *)&param8; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	162 _args[10] = (void *)&param9; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	163 _args[11] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	164 _args[12] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	165 #define DW_FUNCTION_ADD_PARAM10(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	166 void *_args = alloca(sizeof(void )*14); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	167 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	168 _args[1] = (void *)NULL; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	169 _args[2] = (void *)&param1; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	170 _args[3] = (void *)&param2; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	171 _args[4] = (void *)&param3; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	172 _args[5] = (void *)&param4; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	173 _args[6] = (void *)&param5; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	174 _args[7] = (void *)&param6; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	175 _args[8] = (void *)&param7; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	176 _args[9] = (void *)&param8; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	177 _args[10] = (void *)&param9; \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	178 _args[11] = (void *)&param10; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	179 _args[12] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	180 _args[13] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	181 #define DW_FUNCTION_ADD_PARAM11(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	182 void *_args = alloca(sizeof(void )*15); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	183 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	184 _args[1] = (void *)NULL; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	185 _args[2] = (void *)&param1; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	186 _args[3] = (void *)&param2; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	187 _args[4] = (void *)&param3; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	188 _args[5] = (void *)&param4; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	189 _args[6] = (void *)&param5; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	190 _args[7] = (void *)&param6; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	191 _args[8] = (void *)&param7; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	192 _args[9] = (void *)&param8; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	193 _args[10] = (void *)&param9; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	194 _args[11] = (void *)&param10; \
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	195 _args[12] = (void *)&param11; \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	196 _args[13] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	197 _args[14] = (void *)pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	198 #define DW_FUNCTION_ADD_PARAM12(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	199 void *_args = alloca(sizeof(void )*16); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	200 _args[0] = (void *)pthread_getspecific(_dw_event_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	201 _args[1] = (void *)NULL; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	202 _args[2] = (void *)&param1; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	203 _args[3] = (void *)&param2; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	204 _args[4] = (void *)&param3; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	205 _args[5] = (void *)&param4; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	206 _args[6] = (void *)&param5; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	207 _args[7] = (void *)&param6; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	208 _args[8] = (void *)&param7; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	209 _args[9] = (void *)&param8; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	210 _args[10] = (void *)&param9; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	211 _args[11] = (void *)&param10; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	212 _args[12] = (void *)&param11; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	213 _args[13] = (void *)&param12; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	214 _args[14] = (void *)pthread_getspecific(_dw_fg_color_key); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	215 _args[15] = (void *)pthread_getspecific(_dw_bg_color_key);
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	216 #define DW_FUNCTION_RESTORE_PARAM1(param1, vartype1) \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	217 vartype1 param1 = ((vartype1 )_args[2]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	218 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[3]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	219 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[4];
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	220 #define DW_FUNCTION_RESTORE_PARAM2(param1, vartype1, param2, vartype2) \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	221 vartype1 param1 = ((vartype1 )_args[2]); \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	222 vartype2 param2 = ((vartype2 )_args[3]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	223 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[4]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	224 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[5];
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	225 #define DW_FUNCTION_RESTORE_PARAM3(param1, vartype1, param2, vartype2, param3, vartype3) \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	226 vartype1 param1 = ((vartype1 )_args[2]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	227 vartype2 param2 = ((vartype2 )_args[3]); \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	228 vartype3 param3 = ((vartype3 )_args[4]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	229 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[5]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	230 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[6];
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	231 #define DW_FUNCTION_RESTORE_PARAM4(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4) \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	232 vartype1 param1 = ((vartype1 )_args[2]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	233 vartype2 param2 = ((vartype2 )_args[3]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	234 vartype3 param3 = ((vartype3 )_args[4]); \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	235 vartype4 param4 = ((vartype4 )_args[5]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	236 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[6]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	237 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[7];
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	238 #define DW_FUNCTION_RESTORE_PARAM5(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5) \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	239 vartype1 param1 = ((vartype1 )_args[2]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	240 vartype2 param2 = ((vartype2 )_args[3]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	241 vartype3 param3 = ((vartype3 )_args[4]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	242 vartype4 param4 = ((vartype4 )_args[5]); \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	243 vartype5 param5 = ((vartype5 )_args[6]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	244 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[7]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	245 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[8];
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	246 #define DW_FUNCTION_RESTORE_PARAM6(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6) \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	247 vartype1 param1 = ((vartype1 )_args[2]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	248 vartype2 param2 = ((vartype2 )_args[3]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	249 vartype3 param3 = ((vartype3 )_args[4]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	250 vartype4 param4 = ((vartype4 )_args[5]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	251 vartype5 param5 = ((vartype5 )_args[6]); \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	252 vartype6 param6 = ((vartype6 )_args[7]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	253 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[8]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	254 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[9];
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	255 #define DW_FUNCTION_RESTORE_PARAM7(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7) \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	256 vartype1 param1 = ((vartype1 )_args[2]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	257 vartype2 param2 = ((vartype2 )_args[3]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	258 vartype3 param3 = ((vartype3 )_args[4]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	259 vartype4 param4 = ((vartype4 )_args[5]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	260 vartype5 param5 = ((vartype5 )_args[6]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	261 vartype6 param6 = ((vartype6 )_args[7]); \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	262 vartype7 param7 = ((vartype7 )_args[8]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	263 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[9]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	264 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[10];
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	265 #define DW_FUNCTION_RESTORE_PARAM8(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8) \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	266 vartype1 param1 = ((vartype1 )_args[2]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	267 vartype2 param2 = ((vartype2 )_args[3]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	268 vartype3 param3 = ((vartype3 )_args[4]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	269 vartype4 param4 = ((vartype4 )_args[5]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	270 vartype5 param5 = ((vartype5 )_args[6]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	271 vartype6 param6 = ((vartype6 )_args[7]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	272 vartype7 param7 = ((vartype7 )_args[8]); \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	273 vartype8 param8 = ((vartype8 )_args[9]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	274 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[10]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	275 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[11];
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	276 #define DW_FUNCTION_RESTORE_PARAM9(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8, param9, vartype9) \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	277 vartype1 param1 = ((vartype1 )_args[2]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	278 vartype2 param2 = ((vartype2 )_args[3]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	279 vartype3 param3 = ((vartype3 )_args[4]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	280 vartype4 param4 = ((vartype4 )_args[5]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	281 vartype5 param5 = ((vartype5 )_args[6]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	282 vartype6 param6 = ((vartype6 )_args[7]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	283 vartype7 param7 = ((vartype7 )_args[8]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	284 vartype8 param8 = ((vartype8 )_args[9]); \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	285 vartype9 param9 = ((vartype9 )_args[10]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	286 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[11]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	287 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[12];
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	288 #define DW_FUNCTION_RESTORE_PARAM10(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8, param9, vartype9, param10, vartype10) \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	289 vartype1 param1 = ((vartype1 )_args[2]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	290 vartype2 param2 = ((vartype2 )_args[3]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	291 vartype3 param3 = ((vartype3 )_args[4]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	292 vartype4 param4 = ((vartype4 )_args[5]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	293 vartype5 param5 = ((vartype5 )_args[6]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	294 vartype6 param6 = ((vartype6 )_args[7]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	295 vartype7 param7 = ((vartype7 )_args[8]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	296 vartype8 param8 = ((vartype8 )_args[9]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	297 vartype9 param9 = ((vartype9 )_args[10]); \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	298 vartype10 param10 = ((vartype10 )_args[11]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	299 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[12]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	300 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[13];
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	301 #define DW_FUNCTION_RESTORE_PARAM11(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8, param9, vartype9, param10, vartype10, param11, vartype11) \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	302 vartype1 param1 = ((vartype1 )_args[2]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	303 vartype2 param2 = ((vartype2 )_args[3]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	304 vartype3 param3 = ((vartype3 )_args[4]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	305 vartype4 param4 = ((vartype4 )_args[5]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	306 vartype5 param5 = ((vartype5 )_args[6]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	307 vartype6 param6 = ((vartype6 )_args[7]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	308 vartype7 param7 = ((vartype7 )_args[8]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	309 vartype8 param8 = ((vartype8 )_args[9]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	310 vartype9 param9 = ((vartype9 )_args[10]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	311 vartype10 param10 = ((vartype10 )_args[11]); \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	312 vartype11 param11 = ((vartype11 )_args[12]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	313 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[13]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	314 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[14];
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	315 #define DW_FUNCTION_RESTORE_PARAM12(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8, param9, vartype9, param10, vartype10, param11, vartype11, param12, vartype12) \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	316 vartype1 param1 = ((vartype1 )_args[2]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	317 vartype2 param2 = ((vartype2 )_args[3]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	318 vartype3 param3 = ((vartype3 )_args[4]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	319 vartype4 param4 = ((vartype4 )_args[5]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	320 vartype5 param5 = ((vartype5 )_args[6]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	321 vartype6 param6 = ((vartype6 )_args[7]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	322 vartype7 param7 = ((vartype7 )_args[8]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	323 vartype8 param8 = ((vartype8 )_args[9]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	324 vartype9 param9 = ((vartype9 )_args[10]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	325 vartype10 param10 = ((vartype10 )_args[11]); \
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	326 vartype11 param11 = ((vartype11 )_args[12]); \
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	327 vartype12 param12 = ((vartype12 )_args[13]); \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	328 GdkRGBA * DW_UNUSED(_dw_fg_color) = (GdkRGBA *)_args[14]; \
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	329 GdkRGBA * DW_UNUSED(_dw_bg_color) = (GdkRGBA *)_args[15];
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	330 #define DW_FUNCTION_END }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	331 #define DW_FUNCTION_NO_RETURN(func) dw_event_reset((HEV)_args[0]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	332 if(_dw_thread == (pthread_t)-1 \|\| pthread_self() == _dw_thread) \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	333 _##func(_args); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	334 else { \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	335 g_idle_add_full(G_PRIORITY_HIGH_IDLE, G_SOURCE_FUNC(_##func), (gpointer)_args, NULL); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	336 dw_event_wait((HEV)_args[0], DW_TIMEOUT_INFINITE); } \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	337 }\
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	338 gboolean _##func(void **_args) {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	339 #define DW_FUNCTION_RETURN(func, rettype) dw_event_reset((HEV)_args[0]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	340 if(_dw_thread == (pthread_t)-1 \|\| pthread_self() == _dw_thread) \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	341 _##func(_args); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	342 else { \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	343 g_idle_add_full(G_PRIORITY_HIGH_IDLE, G_SOURCE_FUNC(_##func), (gpointer)_args, NULL); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	344 dw_event_wait((HEV)_args[0], DW_TIMEOUT_INFINITE); } { \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	345 void *tmp = _args[1]; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	346 rettype myreturn = ((rettype )tmp); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	347 free(tmp); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	348 return myreturn; } \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	349 } \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	350 gboolean _##func(void **_args) {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	351 #define DW_FUNCTION_RETURN_THIS(_retvar) { void *_myreturn = malloc(sizeof(_retvar)); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	352 memcpy(_myreturn, (void *)&_retvar, sizeof(_retvar)); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	353 _args[1] = _myreturn; } \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	354 dw_event_post((HEV)_args[0]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	355 return FALSE; }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	356 #define DW_FUNCTION_RETURN_NOTHING dw_event_post((HEV)_args[0]); \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	357 return FALSE; }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	358 #else
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	359 #define DW_FUNCTION_DEFINITION(func, rettype, ...) rettype API func(__VA_ARGS__)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	360 #define DW_FUNCTION_ADD_PARAM1(param1)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	361 #define DW_FUNCTION_ADD_PARAM2(param1, param2)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	362 #define DW_FUNCTION_ADD_PARAM3(param1, param2, param3)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	363 #define DW_FUNCTION_ADD_PARAM4(param1, param2, param3, param4)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	364 #define DW_FUNCTION_ADD_PARAM5(param1, param2, param3, param4, param5)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	365 #define DW_FUNCTION_ADD_PARAM6(param1, param2, param3, param4, param5, param6)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	366 #define DW_FUNCTION_ADD_PARAM7(param1, param2, param3, param4, param5, param6, param7)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	367 #define DW_FUNCTION_ADD_PARAM8(param1, param2, param3, param4, param5, param6, param7, param8)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	368 #define DW_FUNCTION_ADD_PARAM9(param1, param2, param3, param4, param5, param6, param7, param8, param9)
2312 ada8f7610df0 GTK4: Fix building with -D_DW_SINGLE_THREADED and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2311 diff changeset	369 #define DW_FUNCTION_ADD_PARAM10(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	370 #define DW_FUNCTION_ADD_PARAM11(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	371 #define DW_FUNCTION_ADD_PARAM12(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	372 #define DW_FUNCTION_RESTORE_PARAM1(param1, vartype1)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	373 #define DW_FUNCTION_RESTORE_PARAM2(param1, vartype1, param2, vartype2)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	374 #define DW_FUNCTION_RESTORE_PARAM3(param1, vartype1, param2, vartype2, param3, vartype3)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	375 #define DW_FUNCTION_RESTORE_PARAM4(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	376 #define DW_FUNCTION_RESTORE_PARAM5(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	377 #define DW_FUNCTION_RESTORE_PARAM6(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	378 #define DW_FUNCTION_RESTORE_PARAM7(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	379 #define DW_FUNCTION_RESTORE_PARAM8(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	380 #define DW_FUNCTION_RESTORE_PARAM9(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8, param9, vartype9)
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	381 #define DW_FUNCTION_RESTORE_PARAM10(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8, param9, vartype9, param10, vartype10)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	382 #define DW_FUNCTION_RESTORE_PARAM11(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8, param9, vartype9, param10, vartype10, param11, vartype11)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	383 #define DW_FUNCTION_RESTORE_PARAM12(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8, param9, vartype9, param10, vartype10, param11, vartype11, param12, vartype12)
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	384 #define DW_FUNCTION_END
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	385 #define DW_FUNCTION_NO_RETURN(func)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	386 #define DW_FUNCTION_RETURN(func, rettype)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	387 #define DW_FUNCTION_RETURN_THIS(retvar) return retvar;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	388 #define DW_FUNCTION_RETURN_NOTHING
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	389 #endif
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	390
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	391 /* ff = 255 = 1.0000
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	392 * ee = 238 = 0.9333
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	393 * cc = 204 = 0.8000
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	394 * bb = 187 = 0.7333
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	395 * aa = 170 = 0.6667
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	396 * 77 = 119 = 0.4667
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	397 * 00 = 0 = 0.0000
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	398 */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	399 GdkRGBA _dw_colors[] =
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	400 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	401 { 0.0000, 0.0000, 0.0000, 1.0 }, /* 0 black */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	402 { 0.7333, 0.0000, 0.0000, 1.0 }, /* 1 red */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	403 { 0.0000, 0.7333, 0.0000, 1.0 }, /* 2 green */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	404 { 0.6667, 0.6667, 0.0000, 1.0 }, /* 3 yellow */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	405 { 0.0000, 0.0000, 0.8000, 1.0 }, /* 4 blue */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	406 { 0.7333, 0.0000, 0.7333, 1.0 }, /* 5 magenta */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	407 { 0.0000, 0.7333, 0.7333, 1.0 }, /* 6 cyan */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	408 { 0.7333, 0.7333, 0.7333, 1.0 }, /* 7 white */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	409 { 0.4667, 0.4667, 0.4667, 1.0 }, /* 8 grey */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	410 { 1.0000, 0.0000, 0.0000, 1.0 }, /* 9 bright red */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	411 { 0.0000, 1.0000, 0.0000, 1.0 }, /* 10 bright green */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	412 { 0.9333, 0.9333, 0.0000, 1.0 }, /* 11 bright yellow */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	413 { 0.0000, 0.0000, 1.0000, 1.0 }, /* 12 bright blue */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	414 { 1.0000, 0.0000, 1.0000, 1.0 }, /* 13 bright magenta */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	415 { 0.0000, 0.9333, 0.9333, 1.0 }, /* 14 bright cyan */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	416 { 1.0000, 1.0000, 1.0000, 1.0 }, /* 15 bright white */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	417 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	418
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	419 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	420 * List those icons that have transparency first
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	421 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	422 static char *_dw_image_exts[] =
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	423 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	424 ".xpm",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	425 ".png",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	426 ".ico",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	427 ".icns",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	428 ".gif",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	429 ".jpg",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	430 ".jpeg",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	431 ".tiff",
2312 ada8f7610df0 GTK4: Fix building with -D_DW_SINGLE_THREADED and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2311 diff changeset	432 ".bmp",
ada8f7610df0 GTK4: Fix building with -D_DW_SINGLE_THREADED and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2311 diff changeset	433 NULL
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	434 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	435
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	436 #ifndef max
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	437 # define max(a,b) (((a) > (b)) ? (a) : (b))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	438 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	439
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	440 #ifndef min
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	441 # define min(a,b) (((a) < (b)) ? (a) : (b))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	442 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	443
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	444 static pthread_key_t _dw_fg_color_key;
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	445 static pthread_key_t _dw_bg_color_key;
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	446 static pthread_key_t _dw_event_key;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	447
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	448 static pthread_t _dw_thread = (pthread_t)-1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	449
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	450 static GList *_dw_dirty_list = NULL;
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	451
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	452 #define _DW_TREE_TYPE_CONTAINER 1
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	453 #define _DW_TREE_TYPE_TREE 2
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	454 #define _DW_TREE_TYPE_LISTBOX 3
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	455 #define _DW_TREE_TYPE_COMBOBOX 4
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	456
2319 36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	457 #define _DW_RESOURCE_PATH "/org/dbsoft/dwindows/resources/"
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	458
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	459 /* Signal forwarder prototypes */
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	460 static gint _dw_button_press_event(GtkGestureSingle *gesture, int n_press, double x, double y, gpointer data);
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	461 static gint _dw_button_release_event(GtkGestureSingle *gesture, int n_press, double x, double y, gpointer data);
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	462 static gint _dw_motion_notify_event(GtkEventControllerMotion *controller, double x, double y, gpointer data);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	463 static gboolean _dw_delete_event(GtkWidget *window, gpointer data);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	464 static gint _dw_key_press_event(GtkEventControllerKey *controller, guint keyval, guint keycode, GdkModifierType state, gpointer data);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	465 static gint _dw_generic_event(GtkWidget *widget, gpointer data);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	466 static gint _dw_configure_event(GtkWidget *widget, int width, int height, gpointer data);
2309 e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	467 static gint _dw_container_enter_event(GtkEventController *controller, guint keyval, guint keycode, GdkModifierType state, gpointer data);
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	468 static gint _dw_combobox_select_event(GtkWidget *widget, gpointer data);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	469 static gint _dw_expose_event(GtkWidget widget, cairo_t cr, int width, int height, gpointer data);
2371 67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	470 static void _dw_set_focus_event(GObject window, GParamSpec pspec, gpointer data);
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	471 static gint _dw_tree_context_event(GtkGestureSingle *gesture, int n_press, double x, double y, gpointer data);
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	472 static gint _dw_value_changed_event(GtkWidget *widget, gpointer user_data);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	473 static gint _dw_tree_select_event(GtkTreeSelection *sel, gpointer data);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	474 static gint _dw_tree_expand_event(GtkTreeView treeview, GtkTreeIter arg1, GtkTreePath *arg2, gpointer data);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	475 static gint _dw_switch_page_event(GtkNotebook notebook, GtkWidget page, guint page_num, gpointer data);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	476 static gint _dw_column_click_event(GtkWidget *widget, gpointer data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	477 #ifdef USE_WEBKIT
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	478 static void _dw_html_result_event(GObject object, GAsyncResult result, gpointer script_data);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	479 static void _dw_html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	480 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	481 static void _dw_signal_disconnect(gpointer data, GClosure *closure);
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	482 static void _dw_event_coordinates_to_window(GtkWidget widget, double x, double *y);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	483
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	484 GObject *_DWObject = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	485 GApplication *_DWApp = NULL;
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	486 GMainLoop *_DWMainLoop = NULL;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	487 static char _dw_app_id[_DW_APP_ID_SIZE+1] = { 0 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	488 char *_DWDefaultFont = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	489 static char _dw_share_path[PATH_MAX+1] = { 0 };
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	490 static long _dw_mouse_last_x = 0;
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	491 static long _dw_mouse_last_y = 0;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	492
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	493 typedef struct _dw_signal_list
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	494 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	495 void *func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	496 char name[30];
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	497 char gname[30];
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	498 GObject (setup)(struct _dw_signal_list , GObject , void , void , void *);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	499
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	500 } DWSignalList;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	501
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	502 /* Signal setup function prototypes */
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	503 GObject _dw_key_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data);
fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	504 GObject _dw_button_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data);
fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	505 GObject _dw_mouse_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data);
fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	506 GObject _dw_motion_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data);
fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	507 GObject _dw_draw_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data);
fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	508 GObject _dw_value_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data);
fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	509 GObject _dw_tree_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data);
fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	510 GObject _dw_focus_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data);
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	511 #ifdef USE_WEBKIT
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	512 GObject _dw_html_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data);
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	513 #endif
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	514
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	515 typedef struct
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	516 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	517 HWND window;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	518 void *func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	519 gpointer data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	520 gint cid;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	521 void *intfunc;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	522
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	523 } DWSignalHandler;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	524
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	525 /* A list of signal forwarders, to account for paramater differences. */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	526 static DWSignalList DWSignalTranslate[] = {
2371 67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	527 { _dw_configure_event, DW_SIGNAL_CONFIGURE, "resize", NULL },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	528 { _dw_key_press_event, DW_SIGNAL_KEY_PRESS, "key-pressed", _dw_key_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	529 { _dw_button_press_event, DW_SIGNAL_BUTTON_PRESS, "pressed", _dw_mouse_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	530 { _dw_button_release_event, DW_SIGNAL_BUTTON_RELEASE, "released", _dw_mouse_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	531 { _dw_motion_notify_event, DW_SIGNAL_MOTION_NOTIFY, "motion", _dw_motion_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	532 { _dw_delete_event, DW_SIGNAL_DELETE, "close-request", NULL },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	533 { _dw_expose_event, DW_SIGNAL_EXPOSE, "draw", _dw_draw_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	534 { _dw_generic_event, DW_SIGNAL_CLICKED, "clicked", _dw_button_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	535 { _dw_container_enter_event, DW_SIGNAL_ITEM_ENTER, "key-pressed", _dw_key_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	536 { _dw_tree_context_event, DW_SIGNAL_ITEM_CONTEXT, "pressed", _dw_tree_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	537 { _dw_combobox_select_event, DW_SIGNAL_LIST_SELECT, "changed", NULL },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	538 { _dw_tree_select_event, DW_SIGNAL_ITEM_SELECT, "changed", _dw_tree_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	539 { _dw_set_focus_event, DW_SIGNAL_SET_FOCUS, "notify::is-active", _dw_focus_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	540 { _dw_value_changed_event, DW_SIGNAL_VALUE_CHANGED, "value-changed", _dw_value_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	541 { _dw_switch_page_event, DW_SIGNAL_SWITCH_PAGE, "switch-page", NULL },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	542 { _dw_column_click_event, DW_SIGNAL_COLUMN_CLICK, "activate", _dw_tree_setup },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	543 { _dw_tree_expand_event, DW_SIGNAL_TREE_EXPAND, "row-expanded", NULL },
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	544 #ifdef USE_WEBKIT
2371 67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	545 { _dw_html_changed_event, DW_SIGNAL_HTML_CHANGED, "load-changed", NULL },
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	546 { _dw_html_result_event, DW_SIGNAL_HTML_RESULT, "", _dw_html_setup },
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	547 #endif
2371 67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	548 { NULL, "", "", NULL }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	549 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	550
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	551 /* Alignment flags */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	552 #define DW_CENTER 0.5f
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	553 #define DW_LEFT 0.0f
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	554 #define DW_RIGHT 1.0f
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	555 #define DW_TOP 0.0f
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	556 #define DW_BOTTOM 1.0f
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	557
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	558 static void _dw_msleep(long period)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	559 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	560 #ifdef __sun__
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	561 /* usleep() isn't threadsafe on Solaris */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	562 struct timespec req;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	563
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	564 req.tv_sec = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	565 if(period >= 1000)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	566 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	567 req.tv_sec = (int)(period / 1000);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	568 period -= (req.tv_sec * 1000);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	569 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	570 req.tv_nsec = period * 10000000;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	571
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	572 nanosleep(&req, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	573 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	574 usleep(period * 1000);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	575 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	576 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	577
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	578 /* Finds the translation function for a given signal name */
2628 d3d8a93124f1 GTK4: Fix compilation after style standarization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	579 static DWSignalList _dw_findsignal(const char *signame)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	580 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	581 int z=0;
2628 d3d8a93124f1 GTK4: Fix compilation after style standarization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	582 static DWSignalList empty = {0};
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	583
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	584 while(DWSignalTranslate[z].func)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	585 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	586 if(strcasecmp(signame, DWSignalTranslate[z].name) == 0)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	587 return DWSignalTranslate[z];
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	588 z++;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	589 }
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	590 return empty;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	591 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	592
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	593 static DWSignalHandler _dw_get_signal_handler(gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	594 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	595 DWSignalHandler sh = {0};
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	596
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	597 if(data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	598 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	599 void params = (void )data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	600 int counter = GPOINTER_TO_INT(params[0]);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	601 GtkWidget widget = (GtkWidget )params[2];
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	602 char text[101] = {0};
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	603
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	604 snprintf(text, 100, "_dw_sigwindow%d", counter);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	605 sh.window = (HWND)g_object_get_data(G_OBJECT(widget), text);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	606 snprintf(text, 100, "_dw_sigfunc%d", counter);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	607 sh.func = (void *)g_object_get_data(G_OBJECT(widget), text);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	608 snprintf(text, 100, "_dw_intfunc%d", counter);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	609 sh.intfunc = (void *)g_object_get_data(G_OBJECT(widget), text);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	610 snprintf(text, 100, "_dw_sigdata%d", counter);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	611 sh.data = g_object_get_data(G_OBJECT(widget), text);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	612 snprintf(text, 100, "_dw_sigcid%d", counter);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	613 sh.cid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), text));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	614 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	615 return sh;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	616 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	617
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	618 static void _dw_remove_signal_handler(GtkWidget *widget, int counter)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	619 {
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	620 char text[101] = {0};
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	621 gint cid;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	622
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	623 snprintf(text, 100, "_dw_sigcid%d", counter);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	624 cid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), text));
2660 650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2628 diff changeset	625 if(cid > 0)
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2628 diff changeset	626 g_signal_handler_disconnect(G_OBJECT(widget), cid);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	627 g_object_set_data(G_OBJECT(widget), text, NULL);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	628 snprintf(text, 100, "_dw_sigwindow%d", counter);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	629 g_object_set_data(G_OBJECT(widget), text, NULL);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	630 snprintf(text, 100, "_dw_sigfunc%d", counter);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	631 g_object_set_data(G_OBJECT(widget), text, NULL);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	632 snprintf(text, 100, "_dw_intfunc%d", counter);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	633 g_object_set_data(G_OBJECT(widget), text, NULL);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	634 snprintf(text, 100, "_dw_sigdata%d", counter);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	635 g_object_set_data(G_OBJECT(widget), text, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	636 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	637
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	638 static int _dw_set_signal_handler(GObject object, HWND window, void func, gpointer data, void intfunc, void discfunc)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	639 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	640 int counter = GPOINTER_TO_INT(g_object_get_data(object, "_dw_sigcounter"));
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	641 char text[101] = {0};
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	642
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	643 snprintf(text, 100, "_dw_sigwindow%d", counter);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	644 g_object_set_data(object, text, (gpointer)window);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	645 snprintf(text, 100, "_dw_sigfunc%d", counter);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	646 g_object_set_data(object, text, (gpointer)func);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	647 snprintf(text, 100, "_dw_intfunc%d", counter);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	648 g_object_set_data(object, text, (gpointer)intfunc);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	649 snprintf(text, 100, "_dw_discfunc%d", counter);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	650 g_object_set_data(object, text, (gpointer)discfunc);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	651 snprintf(text, 100, "_dw_sigdata%d", counter);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	652 g_object_set_data(object, text, (gpointer)data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	653
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	654 counter++;
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	655 g_object_set_data(object, "_dw_sigcounter", GINT_TO_POINTER(counter));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	656
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	657 return counter - 1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	658 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	659
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	660 static void _dw_set_signal_handler_id(GObject *object, int counter, gint cid)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	661 {
2660 650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2628 diff changeset	662 if(cid > 0)
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2628 diff changeset	663 {
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	664 char text[101] = {0};
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	665
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	666 snprintf(text, 100, "_dw_sigcid%d", counter);
2660 650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2628 diff changeset	667 g_object_set_data(object, text, GINT_TO_POINTER(cid));
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2628 diff changeset	668 }
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2628 diff changeset	669 else
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2628 diff changeset	670 dw_debug("WARNING: Dynamic Windows failed to connect signal.\n");
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	671 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	672
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	673 #ifdef USE_WEBKIT
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	674 static void _dw_html_result_event(GObject object, GAsyncResult result, gpointer script_data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	675 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	676 pthread_t saved_thread = _dw_thread;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	677 WebKitJavascriptResult *js_result;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	678 JSCValue *value;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	679 GError *error = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	680 int (htmlresultfunc)(HWND, int, char , void , void ) = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	681 gint handlerdata = GPOINTER_TO_INT(g_object_get_data(object, "_dw_html_result_id"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	682 void *user_data = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	683
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	684 _dw_thread = (pthread_t)-1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	685 if(handlerdata)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	686 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	687 DWSignalHandler work;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	688 void *params[3] = { GINT_TO_POINTER(handlerdata-1), 0, object };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	689
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	690 work = _dw_get_signal_handler(params);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	691
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	692 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	693 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	694 htmlresultfunc = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	695 user_data = work.data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	696 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	697 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	698
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	699 if(!(js_result = webkit_web_view_run_javascript_finish(WEBKIT_WEB_VIEW(object), result, &error)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	700 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	701 if(htmlresultfunc)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	702 htmlresultfunc((HWND)object, DW_ERROR_UNKNOWN, error->message, script_data, user_data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	703 g_error_free (error);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	704 _dw_thread = saved_thread;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	705 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	706 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	707
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	708 value = webkit_javascript_result_get_js_value(js_result);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	709 if(jsc_value_is_string(value))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	710 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	711 gchar *str_value = jsc_value_to_string(value);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	712 JSCException *exception = jsc_context_get_exception(jsc_value_get_context(value));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	713
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	714 if(htmlresultfunc)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	715 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	716 if(exception)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	717 htmlresultfunc((HWND)object, DW_ERROR_UNKNOWN, (char *)jsc_exception_get_message(exception), script_data, user_data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	718 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	719 htmlresultfunc((HWND)object, DW_ERROR_NONE, str_value, script_data, user_data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	720 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	721 g_free (str_value);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	722 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	723 else if(htmlresultfunc)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	724 htmlresultfunc((HWND)object, DW_ERROR_UNKNOWN, NULL, script_data, user_data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	725 webkit_javascript_result_unref (js_result);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	726 _dw_thread = saved_thread;
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	727 }
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	728
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	729 static void _dw_html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data)
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	730 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	731 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	732 char location = (char )webkit_web_view_get_uri(web_view);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	733 int status = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	734
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	735 switch (load_event) {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	736 case WEBKIT_LOAD_STARTED:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	737 status = DW_HTML_CHANGE_STARTED;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	738 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	739 case WEBKIT_LOAD_REDIRECTED:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	740 status = DW_HTML_CHANGE_REDIRECT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	741 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	742 case WEBKIT_LOAD_COMMITTED:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	743 status = DW_HTML_CHANGE_LOADING;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	744 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	745 case WEBKIT_LOAD_FINISHED:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	746 status = DW_HTML_CHANGE_COMPLETE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	747 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	748 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	749 if(status && location && work.window && work.func)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	750 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	751 int (htmlchangedfunc)(HWND, int, char , void *) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	752
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	753 htmlchangedfunc(work.window, status, location, work.data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	754 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	755 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	756 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	757
2371 67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	758 static void _dw_set_focus_event(GObject window, GParamSpec pspec, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	759 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	760 DWSignalHandler work = _dw_get_signal_handler(data);
2371 67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	761 gboolean active;
2370 b18ef6c5b77a GTK4: The GtkWidget paramater to the activate-focus signal was removed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2369 diff changeset	762
2371 67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	763 g_object_get(window, "is-active", &active, NULL);
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	764
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	765 if(active && work.window)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	766 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	767 int (setfocusfunc)(HWND, void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	768
2371 67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	769 setfocusfunc(work.window, work.data);
67f98f3e47f4 GTK4: Switch from "activate-focus" to "notify::is-active" for DW_SIGNAL_SET_FOCUS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2370 diff changeset	770 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	771 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	772
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	773 static gint _dw_button_press_event(GtkGestureSingle *gesture, int n_press, double x, double y, gpointer data)
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	774 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	775 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	776 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	777
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	778 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	779 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	780 int (buttonfunc)(HWND, int, int, int, void ) = work.func;
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	781 int mybutton = gtk_gesture_single_get_current_button(gesture);
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	782
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	783 if(mybutton == 3)
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	784 mybutton = DW_BUTTON2_MASK;
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	785 else if(mybutton == 2)
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	786 mybutton = DW_BUTTON3_MASK;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	787
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	788 retval = buttonfunc(work.window, (int)x, (int)y, mybutton, work.data);
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	789
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	790 _dw_event_coordinates_to_window(work.window, &x, &y);
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	791
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	792 _dw_mouse_last_x = (long)x;
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	793 _dw_mouse_last_y = (long)y;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	794 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	795 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	796 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	797
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	798 static gint _dw_button_release_event(GtkGestureSingle *gesture, int n_press, double x, double y, gpointer data)
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	799 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	800 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	801 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	802
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	803 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	804 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	805 int (buttonfunc)(HWND, int, int, int, void ) = work.func;
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	806 int mybutton = gtk_gesture_single_get_current_button(gesture);
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	807
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	808 if(mybutton == 3)
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	809 mybutton = DW_BUTTON2_MASK;
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	810 else if(mybutton == 2)
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	811 mybutton = DW_BUTTON3_MASK;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	812
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	813 retval = buttonfunc(work.window, (int)x, (int)y, mybutton, work.data);
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	814
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	815 _dw_event_coordinates_to_window(work.window, &x, &y);
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	816
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	817 _dw_mouse_last_x = (long)x;
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	818 _dw_mouse_last_y = (long)y;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	819 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	820 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	821 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	822
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	823 static gint _dw_motion_notify_event(GtkEventControllerMotion *controller, double x, double y, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	824 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	825 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	826 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	827
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	828 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	829 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	830 int (motionfunc)(HWND, int, int, int, void ) = work.func;
2278 18028fa53ef2 GTK4: Implement dw_pointer_query_pos(). Fix a macro typo. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2277 diff changeset	831 GdkEvent *event = gtk_event_controller_get_current_event(GTK_EVENT_CONTROLLER(controller));
2277 ba81894924cb GTK4: Changes to handle the now opaque GdkEvent structure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2276 diff changeset	832 GdkModifierType state = gdk_event_get_modifier_state(event);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	833 int keys = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	834
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	835 if (state & GDK_BUTTON1_MASK)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	836 keys = DW_BUTTON1_MASK;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	837 if (state & GDK_BUTTON3_MASK)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	838 keys \|= DW_BUTTON2_MASK;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	839 if (state & GDK_BUTTON2_MASK)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	840 keys \|= DW_BUTTON3_MASK;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	841
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	842 retval = motionfunc(work.window, (int)x, (int)y, keys, work.data);
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	843
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	844 _dw_event_coordinates_to_window(work.window, &x, &y);
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	845
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	846 _dw_mouse_last_x = (long)x;
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	847 _dw_mouse_last_y = (long)y;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	848 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	849 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	850 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	851
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	852 static gboolean _dw_delete_event(GtkWidget *window, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	853 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	854 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	855 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	856
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	857 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	858 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	859 int (closefunc)(HWND, void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	860
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	861 retval = closefunc(work.window, work.data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	862 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	863 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	864 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	865
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	866 static gint _dw_key_press_event(GtkEventControllerKey *controller, guint keyval, guint keycode, GdkModifierType state, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	867 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	868 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	869 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	870
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	871 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	872 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	873 int (keypressfunc)(HWND, char, int, int, void , char *) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	874 guint32 unichar = gdk_keyval_to_unicode(keyval);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	875 char utf8[7] = { 0 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	876
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	877 g_unichar_to_utf8(unichar, utf8);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	878
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	879 retval = keypressfunc(work.window, (char)keycode, keyval,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	880 state & (GDK_CONTROL_MASK \| GDK_SHIFT_MASK \| GDK_ALT_MASK), work.data, utf8);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	881 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	882 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	883 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	884
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	885 static gint _dw_generic_event(GtkWidget *widget, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	886 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	887 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	888 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	889
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	890 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	891 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	892 int (genericfunc)(HWND, void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	893
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	894 retval = genericfunc(work.window, work.data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	895 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	896 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	897 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	898
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	899 static gint _dw_configure_event(GtkWidget *widget, int width, int height, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	900 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	901 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	902 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	903
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	904 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	905 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	906 int (sizefunc)(HWND, int, int, void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	907
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	908 retval = sizefunc(work.window, width, height, work.data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	909 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	910 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	911 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	912
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	913 cairo_t _dw_cairo_update(GtkWidget widget, int width, int height)
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	914 {
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	915 cairo_t *wincr = g_object_get_data(G_OBJECT(widget), "_dw_cr");
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	916 cairo_surface_t *surface = g_object_get_data(G_OBJECT(widget), "_dw_cr_surface");
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	917
2365 77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	918 if(width == -1 && height == -1 && !wincr && g_list_find(_dw_dirty_list, widget) == NULL)
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	919 _dw_dirty_list = g_list_append(_dw_dirty_list, widget);
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	920
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	921 if(width == -1)
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	922 width = gtk_widget_get_width(widget);
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	923 if(height == -1)
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	924 height = gtk_widget_get_height(widget);
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	925
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	926 if(!surface \|\| GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_dw_width")) != width \|\|
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	927 GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_dw_height")) != height)
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	928 {
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	929 if(surface)
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	930 cairo_surface_destroy(surface);
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	931 surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	932 /* Save the cairo context for use in the drawing functions */
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	933 g_object_set_data(G_OBJECT(widget), "_dw_cr_surface", (gpointer)surface);
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	934 g_object_set_data(G_OBJECT(widget), "_dw_width", GINT_TO_POINTER(width));
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	935 g_object_set_data(G_OBJECT(widget), "_dw_height", GINT_TO_POINTER(height));
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	936 }
2365 77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	937 #ifdef DW_USE_CACHED_CR
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	938 return wincr;
2365 77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	939 #else
77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	940 return NULL;
77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	941 #endif
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	942 }
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	943
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	944 static gint _dw_expose_event(GtkWidget widget, cairo_t cr, int width, int height, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	945 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	946 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	947
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	948 if(widget && GTK_IS_DRAWING_AREA(widget))
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	949 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	950 DWExpose exp;
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	951 int (exposefunc)(HWND, DWExpose , void *) = g_object_get_data(G_OBJECT(widget), "_dw_expose_func");
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	952
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	953 _dw_cairo_update(widget, width, height);
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	954
2365 77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	955 /* Remove the currently drawn widget from the dirty list */
77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	956 _dw_dirty_list = g_list_remove(_dw_dirty_list, widget);
77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	957
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	958 exp.x = exp.y = 0;
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	959 exp.width = width;
a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	960 exp.height = height;
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	961 g_object_set_data(G_OBJECT(widget), "_dw_cr", (gpointer)cr);
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	962 retval = exposefunc((HWND)widget, &exp, data);
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	963 g_object_set_data(G_OBJECT(widget), "_dw_cr", NULL);
2363 d7688c3ec43f GTK4: Remove widget from dirty list during expose event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2362 diff changeset	964
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	965 /* Copy the cached image to the output surface */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	966 cairo_set_source_surface(cr, g_object_get_data(G_OBJECT(widget), "_dw_cr_surface"), 0, 0);
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	967 cairo_rectangle(cr, 0, 0, width, height);
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	968 cairo_fill(cr);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	969 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	970 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	971 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	972
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	973 static gint _dw_combobox_select_event(GtkWidget *widget, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	974 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	975 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	976 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	977
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	978 if(g_object_get_data(G_OBJECT(widget), "_dw_recursing"))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	979 return FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	980
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	981 if(work.window && GTK_IS_COMBO_BOX(widget))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	982 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	983 GtkTreeModel *store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	984
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	985 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	986 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	987 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	988 GtkTreePath *path;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	989
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	990 g_object_set_data(G_OBJECT(widget), "_dw_recursing", GINT_TO_POINTER(1));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	991
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	992 if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	993 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	994 path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	995
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	996 if(path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	997 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	998 gint *indices = gtk_tree_path_get_indices(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	999
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1000 if(indices)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1001 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1002 int (selectfunc)(HWND, int, void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1003
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1004 retval = selectfunc(work.window, indices[0], work.data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1005 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1006 gtk_tree_path_free(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1007 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1008 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1009
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1010 g_object_set_data(G_OBJECT(widget), "_dw_recursing", NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1011 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1012 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1013 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1014 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1015
2757 b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1016 /* Convert coordinate system from the widget to the window */
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	1017 static void _dw_event_coordinates_to_window(GtkWidget widget, double x, double *y)
2757 b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1018 {
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1019 GtkRoot *root = (widget && GTK_IS_WIDGET(widget)) ? gtk_widget_get_root(widget) : NULL;
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1020
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1021 if(root && GTK_IS_WIDGET(root))
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1022 {
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1023 GtkWidget *parent = GTK_WIDGET(root);
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1024
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1025 /* If the parent is a window, try to use the box attached to it... */
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1026 if(GTK_IS_WINDOW(parent))
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1027 {
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1028 GtkWidget *box = g_object_get_data(G_OBJECT(parent), "_dw_grid");
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1029
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1030 if(box && GTK_IS_GRID(box))
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1031 parent = box;
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1032 }
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1033
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1034 graphene_point_t treepoint = graphene_point_init(graphene_point_alloc(), (float)x, (float)*y);
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1035 graphene_point_t *windowpoint = graphene_point_alloc();
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1036
2758 e1b5dbec0796 GTK4: Was still passing the root parameter to the transform function, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2757 diff changeset	1037 if(gtk_widget_compute_point(widget, parent, treepoint, windowpoint))
2757 b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1038 {
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1039 *x = (double)windowpoint->x;
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1040 *y = (double)windowpoint->y;
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1041 }
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1042
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1043 graphene_point_free(treepoint);
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1044 graphene_point_free(windowpoint);
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1045 }
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1046 }
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1047
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1048 #define _DW_DATA_TYPE_STRING 0
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1049 #define _DW_DATA_TYPE_POINTER 1
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1050
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	1051 static gint _dw_tree_context_event(GtkGestureSingle *gesture, int n_press, double x, double y, gpointer data)
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	1052 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1053 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1054 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1055
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1056 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1057 {
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	1058 int button = gtk_gesture_single_get_current_button(gesture);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1059
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1060 if(button == 3)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1061 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1062 int (contextfunc)(HWND, char , int, int, void , void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1063 char *text = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1064 void *itemdata = NULL;
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	1065 GtkWidget *widget = work.window;
2757 b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1066
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1067 _dw_event_coordinates_to_window(widget, &x, &y);
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	1068
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	1069 _dw_mouse_last_x = (long)x;
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	1070 _dw_mouse_last_y = (long)y;
2757 b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1071
2335 1d413d869fa2 GTK4: Trees/Containers were not passing correct data due to missing scrolled bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2334 diff changeset	1072 /* Containers and trees are inside scrolled window widgets */
1d413d869fa2 GTK4: Trees/Containers were not passing correct data due to missing scrolled bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2334 diff changeset	1073 if(GTK_IS_SCROLLED_WINDOW(widget))
1d413d869fa2 GTK4: Trees/Containers were not passing correct data due to missing scrolled bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2334 diff changeset	1074 widget = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "_dw_user"));
1d413d869fa2 GTK4: Trees/Containers were not passing correct data due to missing scrolled bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2334 diff changeset	1075
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1076 if(widget && GTK_IS_TREE_VIEW(widget))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1077 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1078 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1079 GtkTreeModel store = (GtkTreeModel )gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1080 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1081
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1082 if(sel && gtk_tree_selection_get_mode(sel) != GTK_SELECTION_MULTIPLE &&
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1083 gtk_tree_selection_get_selected(sel, NULL, &iter))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1084 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1085 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1086 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1087 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1088 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1089 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1090 {
2470 8f7c2f20c7c0 GTK4: Fill in the row data for contatiner context. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2441 diff changeset	1091 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1092 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1093 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1094 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1095 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1096 GtkTreePath *path;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1097
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1098 gtk_tree_view_get_cursor(GTK_TREE_VIEW(widget), &path, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1099 if(path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1100 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1101 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1102
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1103 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1104 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1105 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1106 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1107 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1108 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1109 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1110 {
2470 8f7c2f20c7c0 GTK4: Fill in the row data for contatiner context. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2441 diff changeset	1111 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1112 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1113 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1114 gtk_tree_path_free(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1115 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1116 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1117 }
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	1118 retval = contextfunc(work.window, text, (int)x, (int)y, work.data, itemdata);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1119 if(text)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1120 g_free(text);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1121 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1122 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1123 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1124 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1125
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1126 static gint _dw_tree_select_event(GtkTreeSelection *sel, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1127 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1128 GtkWidget item = NULL, widget = (GtkWidget *)gtk_tree_selection_get_tree_view(sel);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1129 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1130
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1131 if(widget)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1132 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1133 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1134
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1135 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1136 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1137 int (treeselectfunc)(HWND, HTREEITEM, char , void , void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1138 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1139 char *text = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1140 void *itemdata = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1141 GtkTreeModel store = (GtkTreeModel )gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1142
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1143 if(g_object_get_data(G_OBJECT(widget), "_dw_double_click"))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1144 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1145 g_object_set_data(G_OBJECT(widget), "_dw_double_click", GINT_TO_POINTER(0));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1146 return TRUE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1147 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1148
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1149 if(gtk_tree_selection_get_mode(sel) != GTK_SELECTION_MULTIPLE &&
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1150 gtk_tree_selection_get_selected(sel, NULL, &iter))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1151 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1152 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1153 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1154 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, 3, &item, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1155 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1156 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1157 else if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1158 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1159 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1160 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1161 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1162 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1163 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1164 GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1165
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1166 if(path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1167 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1168 gint *indices = gtk_tree_path_get_indices(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1169
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1170 if(indices)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1171 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1172 int (selectfunc)(HWND, int, void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1173
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1174 retval = selectfunc(work.window, indices[0], work.data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1175 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1176 gtk_tree_path_free(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1177 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1178 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1179 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1180 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1181 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1182 GtkTreePath *path;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1183
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1184 gtk_tree_view_get_cursor(GTK_TREE_VIEW(widget), &path, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1185 if(path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1186 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1187 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1188
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1189 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1190 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1191 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1192 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1193 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, 3, &item, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1194 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1195 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1196 else if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1197 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1198 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1199 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1200 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1201 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1202 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1203 gint *indices = gtk_tree_path_get_indices(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1204
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1205 if(indices)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1206 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1207 int (selectfunc)(HWND, int, void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1208
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1209 retval = selectfunc(work.window, indices[0], work.data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1210 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1211 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1212 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1213 gtk_tree_path_free(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1214 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1215 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1216 if(text)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1217 g_free(text);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1218 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1219 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1220 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1221 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1222
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1223 static gint _dw_tree_expand_event(GtkTreeView widget, GtkTreeIter iter, GtkTreePath *path, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1224 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1225 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1226 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1227
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1228 if(work.window)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1229 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1230 int (treeexpandfunc)(HWND, HTREEITEM, void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1231 retval = treeexpandfunc(work.window, (HTREEITEM)iter, work.data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1232 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1233 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1234 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1235
2309 e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	1236 static gint _dw_container_enter_event(GtkEventController *controller, guint keyval, guint keycode, GdkModifierType state, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1237 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1238 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1239 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1240
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1241 if(work.window && GTK_IS_WIDGET(work.window))
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1242 {
2309 e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	1243 GtkWidget *user = GTK_WIDGET(g_object_get_data(G_OBJECT(work.window), "_dw_user"));
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	1244 GtkWidget *widget = user ? user : work.window;
2278 18028fa53ef2 GTK4: Implement dw_pointer_query_pos(). Fix a macro typo. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2277 diff changeset	1245 GdkEvent *event = gtk_event_controller_get_current_event(GTK_EVENT_CONTROLLER(controller));
18028fa53ef2 GTK4: Implement dw_pointer_query_pos(). Fix a macro typo. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2277 diff changeset	1246 GdkEventType type = gdk_event_get_event_type(event);
2308 a9018bd91d04 GTK4: Fix DW_SIGNAL_ITEM_ENTER callbacks via the keyboard. Remove mouse bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2306 diff changeset	1247 gint button = (type == GDK_BUTTON_PRESS) ? gdk_button_event_get_button(event) : -1;
a9018bd91d04 GTK4: Fix DW_SIGNAL_ITEM_ENTER callbacks via the keyboard. Remove mouse bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2306 diff changeset	1248
2309 e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	1249 /* Handle both key and button events together */
2277 ba81894924cb GTK4: Changes to handle the now opaque GdkEvent structure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2276 diff changeset	1250 if((type == GDK_BUTTON_PRESS && button == 1) \|\| keyval == VK_RETURN)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1251 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1252 int (contextfunc)(HWND, char , void , void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1253 char *text = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1254 void *data = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1255
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1256 /* Sanity check */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1257 if(GTK_IS_TREE_VIEW(widget))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1258 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1259 GtkTreePath *path;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1260 GtkTreeModel store = (GtkTreeModel )gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1261
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1262 gtk_tree_view_get_cursor(GTK_TREE_VIEW(widget), &path, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1263 if(path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1264 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1265 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1266
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1267 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1268 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1269 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1270 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1271 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &data, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1272 retval = contextfunc(work.window, text, work.data, data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1273 if(text)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1274 g_free(text);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1275 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1276 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1277 gtk_tree_path_free(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1278 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1279 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1280 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1281 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1282 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1283 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1284
2309 e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	1285 /* Just forward to the other handler, with bogus key info */
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	1286 void _dw_container_enter_mouse(GtkEventController *controller, int n_press, double x, double y, gpointer data)
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	1287 {
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	1288 if(n_press == 2)
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	1289 _dw_container_enter_event(GTK_EVENT_CONTROLLER(controller), 0, 0, 0, data);
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	1290 }
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	1291
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1292 /* Return the logical page id from the physical page id */
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1293 int _dw_get_logical_page(HWND handle, unsigned long pageid)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1294 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1295 int z;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1296 GtkWidget **pagearray = g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1297 GtkWidget *thispage = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), pageid);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1298
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1299 if(pagearray && thispage)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1300 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1301 for(z=0;z<256;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1302 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1303 if(thispage == pagearray[z])
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1304 return z;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1305 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1306 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1307 return 256;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1308 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1309
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1310
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1311 static gint _dw_switch_page_event(GtkNotebook notebook, GtkWidget page, guint page_num, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1312 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1313 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1314 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1315
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1316 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1317 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1318 int (switchpagefunc)(HWND, unsigned long, void ) = work.func;
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1319 retval = switchpagefunc(work.window, _dw_get_logical_page(GTK_WIDGET(notebook), page_num), work.data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1320 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1321 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1322 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1323
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1324 static gint _dw_column_click_event(GtkWidget *widget, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1325 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1326 void **params = data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1327 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1328
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1329 if(params && params[2])
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1330 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1331 GtkWidget tree = (GtkWidget )params[2];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1332 gint handlerdata = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(tree), "_dw_column_click_id"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1333
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1334 if(handlerdata)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1335 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1336 DWSignalHandler work;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1337
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1338 params[0] = GINT_TO_POINTER(handlerdata-1);
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	1339 work = _dw_get_signal_handler(params);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1340
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1341 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1342 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1343 int column_num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_dw_column"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1344 int (clickcolumnfunc)(HWND, int, void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1345 retval = clickcolumnfunc(work.window, column_num, work.data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1346 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1347 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1348 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1349 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1350 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1351
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1352 static int _dw_round_value(gfloat val)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1353 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1354 int newval = (int)val;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1355
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1356 if(val >= 0.5 + (gfloat)newval)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1357 newval++;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1358
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1359 return newval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1360 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1361
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1362 static gint _dw_value_changed_event(GtkWidget *widget, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1363 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1364 GtkWidget slider, spinbutton, *scrollbar;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1365 GtkAdjustment adjustment = (GtkAdjustment )widget;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1366 int max, val;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1367
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1368 if(!GTK_IS_ADJUSTMENT(adjustment))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1369 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(widget), "_dw_adjustment");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1370
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1371 slider = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_slider");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1372 spinbutton = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_spinbutton");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1373 scrollbar = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_scrollbar");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1374
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1375 max = _dw_round_value(gtk_adjustment_get_upper(adjustment));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1376 val = _dw_round_value(gtk_adjustment_get_value(adjustment));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1377
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1378 if(g_object_get_data(G_OBJECT(adjustment), "_dw_suppress_value_changed_event"))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1379 return FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1380
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1381 if(slider \|\| spinbutton \|\| scrollbar)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1382 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1383 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1384
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1385 if (work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1386 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1387 int (valuechangedfunc)(HWND, int, void ) = work.func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1388
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1389 if(slider && gtk_orientable_get_orientation(GTK_ORIENTABLE(slider)) == GTK_ORIENTATION_VERTICAL)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1390 valuechangedfunc(work.window, (max - val) - 1, work.data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1391 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1392 valuechangedfunc(work.window, val, work.data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1393 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1394 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1395 return FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1396 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1397
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1398 static gint _dw_default_key_press_event(GtkEventControllerKey *controller, guint keyval, guint keycode, GdkModifierType state, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1399 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1400 GtkWidget next = (GtkWidget )data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1401
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1402 if(next)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1403 {
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1404 if(keyval == GDK_KEY_Return)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1405 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1406 if(GTK_IS_BUTTON(next))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1407 g_signal_emit_by_name(G_OBJECT(next), "clicked");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1408 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1409 gtk_widget_grab_focus(next);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1410 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1411 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1412 return FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1413 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1414
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1415 static void _dw_dialog_response(GtkDialog *dialog, int response_id, gpointer data)
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1416 {
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1417 DWDialog dwdialog = (DWDialog )data;
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1418
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1419 if(dwdialog)
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1420 dw_dialog_dismiss(dwdialog, DW_INT_TO_POINTER(response_id));
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1421 }
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1422
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1423 static GdkPixbuf *_dw_pixbuf_from_resource(unsigned int rid)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1424 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1425 char resource_path[201] = {0};
2319 36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	1426
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	1427 snprintf(resource_path, 200, "%s%u.png", _DW_RESOURCE_PATH, rid);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1428 return gdk_pixbuf_new_from_resource(resource_path, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1429 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1430
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1431 static GdkPixbuf _dw_find_pixbuf(HICN icon, unsigned long userwidth, unsigned long *userheight)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1432 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1433 unsigned int id = GPOINTER_TO_INT(icon);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1434 GdkPixbuf *icon_pixbuf = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1435
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1436 /* Quick dropout for non-handle */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1437 if(!icon)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1438 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1439
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1440 if(id > 65535)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1441 icon_pixbuf = icon;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1442 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1443 icon_pixbuf = _dw_pixbuf_from_resource(id);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1444
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1445 if(userwidth)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1446 *userwidth = icon_pixbuf ? gdk_pixbuf_get_width(icon_pixbuf) : 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1447 if(userheight)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1448 *userheight = icon_pixbuf ? gdk_pixbuf_get_height(icon_pixbuf) : 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1449
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1450 return icon_pixbuf;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1451 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1452
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1453 /* Handle system notification click callbacks */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1454 static void _dw_notification_handler(GSimpleAction action, GVariant param, gpointer user_data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1455 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1456 char textbuf[101] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1457 int (func)(HWND, void );
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1458 void *data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1459
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1460 snprintf(textbuf, 100, "dw-notification-%llu-func", DW_POINTER_TO_ULONGLONG(g_variant_get_uint64(param)));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1461 func = g_object_get_data(G_OBJECT(_DWApp), textbuf);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1462 g_object_set_data(G_OBJECT(_DWApp), textbuf, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1463 snprintf(textbuf, 100, "dw-notification-%llu-data", DW_POINTER_TO_ULONGLONG(g_variant_get_uint64(param)));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1464 data = g_object_get_data(G_OBJECT(_DWApp), textbuf);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1465 g_object_set_data(G_OBJECT(_DWApp), textbuf, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1466
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1467 if(func)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1468 func((HWND)DW_ULONGLONG_TO_POINTER(g_variant_get_uint64(param)), data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1469 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1470
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1471 /* Handle menu click callbacks */
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1472 static void _dw_menu_handler(GSimpleAction action, GVariant param, gpointer data)
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1473 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1474 DWSignalHandler work = _dw_get_signal_handler(data);
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1475 GVariant *action_state = g_action_get_state(G_ACTION(action));
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1476
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1477 /* Handle toggling checkable menu items automatically, before the callback */
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1478 if(action_state)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1479 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1480 gboolean active = g_variant_get_boolean(action_state);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1481 GVariant *new_state = g_variant_new_boolean(!active);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1482 g_simple_action_set_state(action, new_state);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1483 }
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1484
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1485 if(work.window)
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1486 {
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1487 int (genericfunc)(HWND, void ) = work.func;
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1488
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1489 genericfunc(work.window, work.data);
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1490 }
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1491 }
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1492
2276 d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1493 /* Internal function to add padding to boxes or other widgets */
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1494 static void _dw_widget_set_pad(GtkWidget *widget, int pad)
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1495 {
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1496 /* Set pad for each margin direction on the widget */
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1497 gtk_widget_set_margin_start(widget, pad);
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1498 gtk_widget_set_margin_end(widget, pad);
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1499 gtk_widget_set_margin_top(widget, pad);
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1500 gtk_widget_set_margin_bottom(widget, pad);
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1501 }
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1502
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1503 static void _dw_app_activate(GApplication *app, gpointer user_data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1504 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1505 /* Not sure why this signal is required, but GLib gives warnings
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1506 * when this signal is not connected, so putting this here to
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1507 * quell the warning and can be used at a later point if needed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1508 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1509 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1510
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1511 void _dw_init_path(char *arg)
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1512 {
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1513 char path[PATH_MAX+1] = {0};
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1514
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1515 #ifdef __linux__
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1516 if(readlink("/proc/self/exe", path, PATH_MAX) == -1)
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1517 #elif defined(__FreeBSD__)
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1518 int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1519 size_t length = PATH_MAX;
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1520
2858 ecfbc48e933a FreeBSD: Fix the executable path detection code on FreeBSD. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2857 diff changeset	1521 if(sysctl(name, 4, path, &length, NULL, 0) == -1 \|\| length <= 1)
2859 b5cd3242b5e7 Solaris: Add platform specific executable path detection. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2858 diff changeset	1522 #elif defined(__sun__)
b5cd3242b5e7 Solaris: Add platform specific executable path detection. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2858 diff changeset	1523 char procpath[101] = {0};
b5cd3242b5e7 Solaris: Add platform specific executable path detection. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2858 diff changeset	1524
2904 2b7babf491e1 Solaris: Fix warning because getpid() returns a long int. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2901 diff changeset	1525 snprintf(procpath, 100, "/proc/%ld/path/a.out", (long)getpid());
2859 b5cd3242b5e7 Solaris: Add platform specific executable path detection. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2858 diff changeset	1526
b5cd3242b5e7 Solaris: Add platform specific executable path detection. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2858 diff changeset	1527 if(readlink(procpath, path, PATH_MAX) == -1)
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1528 #endif
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1529 strncpy(path, arg ? arg : "", PATH_MAX);
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1530
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1531 if(path[0])
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1532 {
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1533 char *pos = strrchr(path, '/');
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1534 char *binname = path;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1535
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1536 /* If we have a / then...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1537 * the binary name should be at the end.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1538 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1539 if(pos)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1540 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1541 binname = pos + 1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1542 *pos = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1543 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1544
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1545 if(*binname)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1546 {
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1547 char *binpos = strstr(path, "/bin");
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1548
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1549 if(binpos)
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1550 strncpy(_dw_share_path, path, (size_t)(binpos - path));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1551 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1552 strcpy(_dw_share_path, "/usr/local");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1553 strcat(_dw_share_path, "/share/");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1554 strcat(_dw_share_path, binname);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1555 if(!_dw_app_id[0])
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1556 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1557 /* If we have a binary name, use that for the Application ID instead. */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1558 snprintf(_dw_app_id, _DW_APP_ID_SIZE, "%s.%s", DW_APP_DOMAIN_DEFAULT, binname);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1559 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1560 }
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1561 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1562 /* If that failed... just get the current directory */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1563 if(!_dw_share_path[0] && !getcwd(_dw_share_path, PATH_MAX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1564 _dw_share_path[0] = '/';
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1565 }
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1566
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1567 /*
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1568 * Initializes the Dynamic Windows engine.
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1569 * Parameters:
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1570 * newthread: True if this is the only thread.
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1571 * False if there is already a message loop running.
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1572 */
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1573 int API dw_init(int newthread, int argc, char *argv[])
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1574 {
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1575 /* Setup the private data directory */
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	1576 _dw_init_path(argc > 0 ? argv[0] : NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1577
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1578 gtk_init();
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1579
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1580 _DWMainLoop = g_main_loop_new(NULL, FALSE);
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1581 g_main_loop_ref(_DWMainLoop);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1582
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1583 pthread_key_create(&_dw_fg_color_key, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1584 pthread_key_create(&_dw_bg_color_key, NULL);
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	1585 pthread_key_create(&_dw_event_key, NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1586
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1587 _dw_init_thread();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1588
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1589 /* Create a global object for glib activities */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1590 _DWObject = g_object_new(G_TYPE_OBJECT, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1591
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1592 if(!_dw_app_id[0])
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1593 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1594 /* Generate an Application ID based on the PID if all else fails. */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1595 snprintf(_dw_app_id, _DW_APP_ID_SIZE, "%s.pid.%d", DW_APP_DOMAIN_DEFAULT, (int)getpid());
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1596 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1597
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1598 /* Initialize the application subsystem on supported versions...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1599 * we generate an application ID based on the binary name or PID
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1600 * instead of passing NULL to enable full application support.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1601 */
2860 9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	1602 #if GLIB_CHECK_VERSION(2,74,0)
9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	1603 _DWApp = g_application_new(_dw_app_id, G_APPLICATION_DEFAULT_FLAGS);
9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	1604 #else
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1605 _DWApp = g_application_new(_dw_app_id, G_APPLICATION_FLAGS_NONE);
2860 9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	1606 #endif
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1607 if(_DWApp && g_application_register(_DWApp, NULL, NULL))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1608 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1609 /* Creat our notification handler for any notifications */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1610 GSimpleAction *action = g_simple_action_new("notification", G_VARIANT_TYPE_UINT64);
2330 58700e9fcba3 GTK3/4: Add call to g_set_prgname() with the Application ID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2329 diff changeset	1611
58700e9fcba3 GTK3/4: Add call to g_set_prgname() with the Application ID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2329 diff changeset	1612 g_set_prgname(_dw_app_id);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1613 g_signal_connect(G_OBJECT(action), "activate", G_CALLBACK(_dw_notification_handler), NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1614 g_action_map_add_action(G_ACTION_MAP(_DWApp), G_ACTION(action));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1615 g_signal_connect(_DWApp, "activate", G_CALLBACK(_dw_app_activate), NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1616 g_application_activate(_DWApp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1617 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1618 return TRUE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1619 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1620
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1621 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1622 * Runs a message loop for Dynamic Windows.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1623 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1624 void API dw_main(void)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1625 {
2306 558959a64772 GTK4: Fix thread safety while using dw_main() and fix an status text issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2305 diff changeset	1626 pthread_t orig = _dw_thread;
558959a64772 GTK4: Fix thread safety while using dw_main() and fix an status text issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2305 diff changeset	1627
558959a64772 GTK4: Fix thread safety while using dw_main() and fix an status text issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2305 diff changeset	1628 _dw_thread = pthread_self();
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1629 g_main_loop_run(_DWMainLoop);
2306 558959a64772 GTK4: Fix thread safety while using dw_main() and fix an status text issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2305 diff changeset	1630 _dw_thread = orig;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1631 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1632
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1633 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1634 * Causes running dw_main() to return.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1635 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1636 void API dw_main_quit(void)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1637 {
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1638 g_main_loop_quit(_DWMainLoop);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1639 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1640
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1641 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1642 * Runs a message loop for Dynamic Windows, for a period of milliseconds.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1643 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1644 * milliseconds: Number of milliseconds to run the loop for.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1645 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1646 void API dw_main_sleep(int milliseconds)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1647 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1648 struct timeval tv, start;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1649 pthread_t curr = pthread_self();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1650
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1651 gettimeofday(&start, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1652
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1653 if(_dw_thread == (pthread_t)-1 \|\| _dw_thread == curr)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1654 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1655 pthread_t orig = _dw_thread;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1656
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1657 gettimeofday(&tv, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1658
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1659 while(((tv.tv_sec - start.tv_sec)*1000) + ((tv.tv_usec - start.tv_usec)/1000) <= milliseconds)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1660 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1661 if(orig == (pthread_t)-1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1662 _dw_thread = curr;
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1663 if(curr == _dw_thread && g_main_context_pending(NULL))
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1664 g_main_context_iteration(NULL, FALSE);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1665 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1666 _dw_msleep(1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1667 if(orig == (pthread_t)-1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1668 _dw_thread = orig;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1669 gettimeofday(&tv, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1670 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1671 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1672 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1673 _dw_msleep(milliseconds);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1674 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1675
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1676 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1677 * Processes a single message iteration and returns.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1678 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1679 void API dw_main_iteration(void)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1680 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1681 pthread_t orig = _dw_thread;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1682 pthread_t curr = pthread_self();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1683
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1684 if(_dw_thread == (pthread_t)-1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1685 _dw_thread = curr;
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1686 if(curr == _dw_thread && g_main_context_pending(NULL))
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1687 g_main_context_iteration(NULL, FALSE);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1688 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1689 sched_yield();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1690 if(orig == (pthread_t)-1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1691 _dw_thread = orig;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1692 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1693
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1694 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1695 * Free's memory allocated by dynamic windows.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1696 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1697 * ptr: Pointer to dynamic windows allocated
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1698 * memory to be free()'d.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1699 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	1700 void API dw_free(void *ptr)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1701 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1702 free(ptr);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1703 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1704
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1705 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1706 * Allocates and initializes a dialog struct.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1707 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1708 * data: User defined data to be passed to functions.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1709 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	1710 DWDialog * API dw_dialog_new(void *data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1711 {
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1712 DWDialog *tmp = calloc(sizeof(DWDialog), 1);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1713
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1714 if(tmp)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1715 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1716 tmp->eve = dw_event_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1717 dw_event_reset(tmp->eve);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1718 tmp->data = data;
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1719 tmp->mainloop = g_main_loop_new(NULL, FALSE);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1720 g_main_loop_ref(tmp->mainloop);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1721 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1722 return tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1723 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1724
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1725 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1726 * Accepts a dialog struct and returns the given data to the
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1727 * initial called of dw_dialog_wait().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1728 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1729 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1730 * result: Data to be returned by dw_dialog_wait().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1731 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	1732 int API dw_dialog_dismiss(DWDialog dialog, void result)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1733 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1734 dialog->result = result;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1735 if(dialog->method)
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1736 g_main_loop_quit(dialog->mainloop);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1737 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1738 dw_event_post(dialog->eve);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1739 dialog->done = TRUE;
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1740 return DW_ERROR_NONE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1741 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1742
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1743 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1744 * Accepts a dialog struct waits for dw_dialog_dismiss() to be
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1745 * called by a signal handler with the given dialog struct.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1746 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1747 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1748 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	1749 void * API dw_dialog_wait(DWDialog *dialog)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1750 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1751 void *tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1752
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1753 if(!dialog)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1754 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1755
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1756 if(_dw_thread == (pthread_t)-1 \|\| pthread_self() == _dw_thread)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1757 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1758 dialog->method = TRUE;
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1759 g_main_loop_run(dialog->mainloop);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1760 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1761 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1762 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1763 dialog->method = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1764 dw_event_wait(dialog->eve, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1765 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1766
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1767 dw_event_close(&dialog->eve);
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1768 g_main_loop_unref(dialog->mainloop);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1769 tmp = dialog->result;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1770 free(dialog);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1771 return tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1772 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1773
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1774 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1775 * Displays a debug message on the console...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1776 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1777 * format: printf style format string.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1778 * ...: Additional variables for use in the format.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1779 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1780 void API dw_debug(const char *format, ...)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1781 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1782 va_list args;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1783
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1784 va_start(args, format);
2901 761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1785 vfprintf(stderr, format, args);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1786 va_end(args);
2901 761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1787 }
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1788
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1789 void API dw_vdebug(const char *format, va_list args)
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1790 {
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1791 vfprintf(stderr, format, args);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1792 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1793
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1794 /* Internal version that does not use variable arguments */
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1795 DW_FUNCTION_DEFINITION(dw_messagebox_int, int, const char title, int flags, char outbuf)
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1796 DW_FUNCTION_ADD_PARAM3(title, flags, outbuf)
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1797 DW_FUNCTION_RETURN(dw_messagebox_int, int)
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1798 DW_FUNCTION_RESTORE_PARAM3(title, const char , flags, int, outbuf, char )
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1799 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1800 GtkMessageType gtkicon = GTK_MESSAGE_OTHER;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1801 GtkButtonsType gtkbuttons = GTK_BUTTONS_OK;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1802 GtkWidget *dialog;
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1803 int response, retval = DW_MB_RETURN_OK;
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	1804 DWDialog *tmp = dw_dialog_new(NULL);
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	1805 ULONG width, height;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1806
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1807 if(flags & DW_MB_ERROR)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1808 gtkicon = GTK_MESSAGE_ERROR;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1809 else if(flags & DW_MB_WARNING)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1810 gtkicon = GTK_MESSAGE_WARNING;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1811 else if(flags & DW_MB_INFORMATION)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1812 gtkicon = GTK_MESSAGE_INFO;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1813 else if(flags & DW_MB_QUESTION)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1814 gtkicon = GTK_MESSAGE_QUESTION;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1815
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1816 if(flags & DW_MB_OKCANCEL)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1817 gtkbuttons = GTK_BUTTONS_OK_CANCEL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1818 else if(flags & (DW_MB_YESNO \| DW_MB_YESNOCANCEL))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1819 gtkbuttons = GTK_BUTTONS_YES_NO;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1820
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1821 dialog = gtk_message_dialog_new(NULL,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1822 GTK_DIALOG_USE_HEADER_BAR \|
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1823 GTK_DIALOG_MODAL, gtkicon, gtkbuttons, "%s", title);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1824 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", outbuf);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1825 if(flags & DW_MB_YESNOCANCEL)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1826 gtk_dialog_add_button(GTK_DIALOG(dialog), "Cancel", GTK_RESPONSE_CANCEL);
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	1827 gtk_widget_show(GTK_WIDGET(dialog));
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	1828 g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp);
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	1829 /* Center the dialog on the screen since there is no parent */
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	1830 dw_window_get_pos_size((HWND)dialog, NULL, NULL, &width, &height);
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	1831 dw_window_set_pos((HWND)dialog, (dw_screen_width() - width)/2, (dw_screen_height() - height)/2);
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	1832 response = DW_POINTER_TO_INT(dw_dialog_wait(tmp));
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1833 if(GTK_IS_WINDOW(dialog))
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1834 gtk_window_destroy(GTK_WINDOW(dialog));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1835 switch(response)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1836 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1837 case GTK_RESPONSE_OK:
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1838 retval = DW_MB_RETURN_OK;
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1839 break;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1840 case GTK_RESPONSE_CANCEL:
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1841 retval = DW_MB_RETURN_CANCEL;
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1842 break;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1843 case GTK_RESPONSE_YES:
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1844 retval = DW_MB_RETURN_YES;
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1845 break;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1846 case GTK_RESPONSE_NO:
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1847 retval = DW_MB_RETURN_NO;
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1848 break;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1849 default:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1850 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1851 /* Handle the destruction of the dialog result */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1852 if(flags & (DW_MB_OKCANCEL \| DW_MB_YESNOCANCEL))
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1853 retval = DW_MB_RETURN_CANCEL;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1854 else if(flags & DW_MB_YESNO)
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1855 retval = DW_MB_RETURN_NO;
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1856 }
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1857 }
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1858 DW_FUNCTION_RETURN_THIS(retval);
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1859 }
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1860
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1861 /*
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1862 * Displays a Message Box with given text and title..
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1863 * Parameters:
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1864 * title: The title of the message box.
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1865 * flags: Defines buttons and icons to display
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1866 * format: printf style format string.
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1867 * ...: Additional variables for use in the format.
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1868 */
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1869 int API dw_messagebox(const char title, int flags, const char format, ...)
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1870 {
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1871 va_list args;
2901 761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1872 int rc;
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1873
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1874 va_start(args, format);
2901 761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1875 rc = dw_vmessagebox(title, flags, format, args);
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1876 va_end(args);
2901 761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1877 return rc;
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1878 }
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1879
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1880 int API dw_vmessagebox(const char title, int flags, const char format, va_list args)
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1881 {
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1882 char outbuf[1025] = {0};
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1883
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	1884 vsnprintf(outbuf, 1024, format, args);
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1885 return dw_messagebox_int(title, flags, outbuf);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1886 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1887
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1888 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1889 * Minimizes or Iconifies a top-level window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1890 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1891 * handle: The window handle to minimize.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1892 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1893 DW_FUNCTION_DEFINITION(dw_window_minimize, int, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1894 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1895 DW_FUNCTION_RETURN(dw_window_minimize, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1896 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1897 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1898 int retval = DW_ERROR_NONE;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1899
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	1900 if(handle && GTK_IS_WINDOW(handle))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	1901 gtk_window_minimize(GTK_WINDOW(handle));
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1902 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1903 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1904
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1905 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1906 * Makes the window topmost.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1907 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1908 * handle: The window handle to make topmost.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1909 */
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1910 #ifndef GDK_WINDOWING_X11
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	1911 int API dw_window_raise(HWND handle)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1912 {
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1913 return DW_ERROR_UNKNOWN;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1914 }
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1915 #else
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1916 DW_FUNCTION_DEFINITION(dw_window_raise, int, HWND handle)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1917 DW_FUNCTION_ADD_PARAM1(handle)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1918 DW_FUNCTION_RETURN(dw_window_raise, int)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1919 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1920 {
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1921 int retval = DW_ERROR_UNKNOWN;
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	1922 GdkDisplay *display = gdk_display_get_default();
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	1923
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	1924 if(handle && GTK_IS_WINDOW(handle) && display && GDK_IS_X11_DISPLAY(display))
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1925 {
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1926 GdkSurface *surface = gtk_native_get_surface(GTK_NATIVE(handle));
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1927
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1928 if(surface)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1929 {
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1930 XRaiseWindow(GDK_SURFACE_XDISPLAY(surface), GDK_SURFACE_XID(surface));
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1931 retval = DW_ERROR_NONE;
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1932 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1933 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1934 DW_FUNCTION_RETURN_THIS(retval);
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1935 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1936 #endif
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1937
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1938 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1939 * Makes the window bottommost.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1940 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1941 * handle: The window handle to make bottommost.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1942 */
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1943 #ifndef GDK_WINDOWING_X11
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	1944 int API dw_window_lower(HWND handle)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1945 {
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1946 return DW_ERROR_UNKNOWN;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1947 }
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1948 #else
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1949 DW_FUNCTION_DEFINITION(dw_window_lower, int, HWND handle)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1950 DW_FUNCTION_ADD_PARAM1(handle)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1951 DW_FUNCTION_RETURN(dw_window_lower, int)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1952 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1953 {
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1954 int retval = DW_ERROR_UNKNOWN;
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	1955 GdkDisplay *display = gdk_display_get_default();
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	1956
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	1957 if(handle && GTK_IS_WINDOW(handle) && display && GDK_IS_X11_DISPLAY(display))
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1958 {
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1959 GdkSurface *surface = gtk_native_get_surface(GTK_NATIVE(handle));
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1960
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1961 if(surface)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1962 {
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1963 XLowerWindow(GDK_SURFACE_XDISPLAY(surface), GDK_SURFACE_XID(surface));
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1964 retval = DW_ERROR_NONE;
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1965 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1966 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1967 DW_FUNCTION_RETURN_THIS(retval);
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1968 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	1969 #endif
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1970
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1971 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1972 * Makes the window visible.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1973 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1974 * handle: The window handle to make visible.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1975 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1976 DW_FUNCTION_DEFINITION(dw_window_show, int, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1977 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1978 DW_FUNCTION_RETURN(dw_window_show, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1979 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1980 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1981 int retval = DW_ERROR_NONE;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1982
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1983 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1984 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1985 if(GTK_IS_WINDOW(handle))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1986 {
2369 5b3b51ba5239 GTK4: Minor code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2368 diff changeset	1987 GtkWidget *defaultitem = GTK_WIDGET(g_object_get_data(G_OBJECT(handle), "_dw_defaultitem"));
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1988
2368 ec90b552b266 GTK4: Switch to using gtk_window_present() in dw_window_show(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2367 diff changeset	1989 gtk_window_present(GTK_WINDOW(handle));
2369 5b3b51ba5239 GTK4: Minor code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2368 diff changeset	1990
5b3b51ba5239 GTK4: Minor code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2368 diff changeset	1991 if(defaultitem)
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1992 gtk_widget_grab_focus(defaultitem);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1993 }
2368 ec90b552b266 GTK4: Switch to using gtk_window_present() in dw_window_show(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2367 diff changeset	1994 else if(GTK_IS_WIDGET(handle))
ec90b552b266 GTK4: Switch to using gtk_window_present() in dw_window_show(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2367 diff changeset	1995 gtk_widget_show(handle);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1996 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1997 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1998 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1999
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2000 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2001 * Makes the window invisible.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2002 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2003 * handle: The window handle to make visible.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2004 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2005 DW_FUNCTION_DEFINITION(dw_window_hide, int, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2006 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2007 DW_FUNCTION_RETURN(dw_window_hide, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2008 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2009 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2010 int retval = DW_ERROR_NONE;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2011
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2012 if(handle && GTK_IS_WIDGET(handle))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2013 gtk_widget_hide(handle);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2014 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2015 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2016
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2017 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2018 * Destroys a window and all of it's children.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2019 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2020 * handle: The window handle to destroy.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2021 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2022 DW_FUNCTION_DEFINITION(dw_window_destroy, int, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2023 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2024 DW_FUNCTION_RETURN(dw_window_destroy, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2025 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2026 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2027 int retval = DW_ERROR_NONE;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2028
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2029 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2030 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2031 if(GTK_IS_WINDOW(handle))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2032 gtk_window_destroy(GTK_WINDOW(handle));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2033 else if(GTK_IS_WIDGET(handle))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2034 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2035 GtkWidget box, handle2 = handle;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2036
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2037 /* Check if we are removing a widget from a box */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2038 if((box = gtk_widget_get_parent(handle2)) && GTK_IS_GRID(box))
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2039 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2040 /* Get the number of items in the box... */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2041 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2042 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2043 int z;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2044
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2045 /* Figure out where in the grid this widget is and remove that row/column */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2046 if(boxtype == DW_VERT)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2047 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2048 for(z=0;z<boxcount;z++)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2049 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2050 if(gtk_grid_get_child_at(GTK_GRID(box), 0, z) == handle2)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2051 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2052 gtk_grid_remove_row(GTK_GRID(box), z);
2329 47f8f950f377 GTK4: Fix crash by stopping processing after removing widget from the box. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2328 diff changeset	2053 handle2 = NULL;
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2054 break;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2055 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2056 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2057 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2058 else
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2059 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2060 for(z=0;z<boxcount;z++)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2061 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2062 if(gtk_grid_get_child_at(GTK_GRID(box), z, 0) == handle2)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2063 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2064 gtk_grid_remove_column(GTK_GRID(box), z);
2329 47f8f950f377 GTK4: Fix crash by stopping processing after removing widget from the box. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2328 diff changeset	2065 handle2 = NULL;
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2066 break;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2067 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2068 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2069 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2070
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2071 if(boxcount > 0)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2072 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2073 /* Decrease the count by 1 */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2074 boxcount--;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2075 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2076 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2077 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2078 /* Finally destroy the widget, make sure it is still
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2079 * a valid widget if it got removed from the grid.
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2080 */
2329 47f8f950f377 GTK4: Fix crash by stopping processing after removing widget from the box. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2328 diff changeset	2081 if(handle2 && GTK_IS_WIDGET(handle2))
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2082 g_object_unref(G_OBJECT(handle2));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2083 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2084 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2085 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2086 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2087
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2088 /* Causes entire window to be invalidated and redrawn.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2089 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2090 * handle: Toplevel window handle to be redrawn.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2091 */
2328 5363f953b22a GTK4: Implement dw_window_redraw() for render/drawing area widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2327 diff changeset	2092 DW_FUNCTION_DEFINITION(dw_window_redraw, void, HWND handle)
5363f953b22a GTK4: Implement dw_window_redraw() for render/drawing area widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2327 diff changeset	2093 DW_FUNCTION_ADD_PARAM1(handle)
5363f953b22a GTK4: Implement dw_window_redraw() for render/drawing area widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2327 diff changeset	2094 DW_FUNCTION_NO_RETURN(dw_window_redraw)
5363f953b22a GTK4: Implement dw_window_redraw() for render/drawing area widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2327 diff changeset	2095 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
5363f953b22a GTK4: Implement dw_window_redraw() for render/drawing area widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2327 diff changeset	2096 {
5363f953b22a GTK4: Implement dw_window_redraw() for render/drawing area widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2327 diff changeset	2097 if(handle && GTK_IS_DRAWING_AREA(handle))
5363f953b22a GTK4: Implement dw_window_redraw() for render/drawing area widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2327 diff changeset	2098 gtk_widget_queue_draw(GTK_WIDGET(handle));
5363f953b22a GTK4: Implement dw_window_redraw() for render/drawing area widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2327 diff changeset	2099 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2100 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2101
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2102 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2103 * Changes a window's parent to newparent.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2104 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2105 * handle: The window handle to destroy.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2106 * newparent: The window's new parent window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2107 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2108 DW_FUNCTION_DEFINITION(dw_window_reparent, void, HWND handle, HWND newparent)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2109 DW_FUNCTION_ADD_PARAM2(handle, newparent)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2110 DW_FUNCTION_NO_RETURN(dw_window_reparent)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2111 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, newparent, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2112 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2113 if(handle && GTK_IS_WIDGET(handle) && newparent && GTK_IS_WIDGET(newparent))
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2114 gtk_widget_set_parent(GTK_WIDGET(handle), GTK_WIDGET(newparent));
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2115 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2116 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2117
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2118 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2119 * Sets the default font used on text based widgets.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2120 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2121 * fontname: Font name in Dynamic Windows format.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2122 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2123 void API dw_font_set_default(const char *fontname)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2124 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2125 char *oldfont = _DWDefaultFont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2126
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2127 _DWDefaultFont = strdup(fontname);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2128
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2129 if(oldfont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2130 free(oldfont);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2131 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2132
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2133 /* Convert DW style font to CSS syntax (or Pango for older versions):
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2134 * font: font-style font-variant font-weight font-size/line-height font-family
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2135 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	2136 char _dw_convert_font(const char font)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2137 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2138 char *newfont = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2139
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2140 if(font)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2141 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2142 char *name = strchr(font, '.');
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2143 char *Italic = strstr(font, " Italic");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2144 char *Bold = strstr(font, " Bold");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2145
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2146 /* Detect Dynamic Windows style font name...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2147 * Format: ##.Fontname
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2148 * and convert to CSS or Pango syntax
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2149 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2150 if(name && (name++) && isdigit(*font))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2151 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2152 int size = atoi(font);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2153 int len = (Italic ? (Bold ? (Italic > Bold ? (Bold - name) : (Italic - name)) : (Italic - name)) : (Bold ? (Bold - name) : strlen(name)));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2154 char *newname = alloca(len+1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2155
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2156 memset(newname, 0, len+1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2157 strncpy(newname, name, len);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2158
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2159 newfont = g_strdup_printf("%s normal %s %dpx \"%s\"", Italic ? "italic" : "normal",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2160 Bold ? "bold" : "normal", size, newname);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2161 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2162 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2163 return newfont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2164 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2165
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2166 /* Internal functions to convert to GTK3 style CSS */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2167 static void _dw_override_color(GtkWidget widget, const char element, GdkRGBA *color)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2168 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2169 gchar *dataname = g_strdup_printf ("_dw_color_%s", element);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2170 GtkCssProvider *provider = g_object_get_data(G_OBJECT(widget), dataname);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2171 GtkStyleContext *scontext = gtk_widget_get_style_context(widget);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2172
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2173 /* If we have an old context from a previous override remove it */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2174 if(provider)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2175 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2176 gtk_style_context_remove_provider(scontext, GTK_STYLE_PROVIDER(provider));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2177 g_object_unref(provider);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2178 provider = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2179 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2180
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2181 /* If we have a new color, create a new provider and add it */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2182 if(color)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2183 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2184 gchar *scolor = gdk_rgba_to_string(color);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2185 gchar css = g_strdup_printf (" { %s: %s; }", element, scolor);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2186
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2187 provider = gtk_css_provider_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2188 g_free(scolor);
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2189 gtk_css_provider_load_from_data(provider, css, -1);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2190 g_free(css);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2191 gtk_style_context_add_provider(scontext, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2192 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2193 g_object_set_data(G_OBJECT(widget), dataname, (gpointer)provider);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2194 g_free(dataname);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2195 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2196
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2197 static void _dw_override_font(GtkWidget widget, const char font)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2198 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2199 GtkCssProvider *provider = g_object_get_data(G_OBJECT(widget), "_dw_font");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2200 GtkStyleContext *scontext = gtk_widget_get_style_context(widget);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2201
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2202 /* If we have an old context from a previous override remove it */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2203 if(provider)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2204 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2205 gtk_style_context_remove_provider(scontext, GTK_STYLE_PROVIDER(provider));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2206 g_object_unref(provider);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2207 provider = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2208 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2209
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2210 /* If we have a new font, create a new provider and add it */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2211 if(font)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2212 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2213 gchar css = g_strdup_printf (" { font: %s; }", font);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2214
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2215 provider = gtk_css_provider_new();
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2216 gtk_css_provider_load_from_data(provider, css, -1);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2217 g_free(css);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2218 gtk_style_context_add_provider(scontext, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2219 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2220 g_object_set_data(G_OBJECT(widget), "_dw_font", (gpointer)provider);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2221 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2222
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2223 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2224 * Sets the font used by a specified window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2225 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2226 * handle: The window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2227 * fontname: Name and size of the font in the form "size.fontname"
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2228 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2229 DW_FUNCTION_DEFINITION(dw_window_set_font, int, HWND handle, const char *fontname)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2230 DW_FUNCTION_ADD_PARAM2(handle, fontname)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2231 DW_FUNCTION_RETURN(dw_window_set_font, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2232 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, fontname, const char *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2233 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2234 GtkWidget *handle2 = handle;
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	2235 char *font = _dw_convert_font(fontname);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2236 gpointer data;
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2237 int retval = DW_ERROR_NONE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2238
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2239 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2240 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2241 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2242 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2243 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2244 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2245 /* If it is a groupox we want to operate on the frame label */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2246 else if(GTK_IS_FRAME(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2247 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2248 GtkWidget *tmp = gtk_frame_get_label_widget(GTK_FRAME(handle));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2249 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2250 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2251 }
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2252 else if(GTK_IS_COMBO_BOX(handle))
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2253 {
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2254 GtkWidget *tmp = gtk_combo_box_get_child(GTK_COMBO_BOX(handle));
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2255 if(tmp)
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2256 handle2 = tmp;
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2257 }
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2258 else if(GTK_IS_BUTTON(handle))
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2259 {
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2260 GtkWidget *tmp = gtk_button_get_child(GTK_BUTTON(handle));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2261 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2262 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2263 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2264
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2265 /* Free old font name if one is allocated */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2266 data = g_object_get_data(G_OBJECT(handle2), "_dw_fontname");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2267 g_object_set_data(G_OBJECT(handle2), "_dw_fontname", (gpointer)font);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2268 if(data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2269 free(data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2270
2325 55524dbe6a54 GTK4: The font crash seems to affect GtkDrawingArea. So reenable the widget bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2324 diff changeset	2271 if(!GTK_IS_DRAWING_AREA(handle2))
55524dbe6a54 GTK4: The font crash seems to affect GtkDrawingArea. So reenable the widget bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2324 diff changeset	2272 _dw_override_font(handle2, font);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2273
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2274 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2275 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2276
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2277 /* Allows the user to choose a font using the system's font chooser dialog.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2278 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2279 * currfont: current font
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2280 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2281 * A malloced buffer with the selected font or NULL on error.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2282 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2283 DW_FUNCTION_DEFINITION(dw_font_choose, char , const char currfont)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2284 DW_FUNCTION_ADD_PARAM1(currfont)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2285 DW_FUNCTION_RETURN(dw_font_choose, char *)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2286 DW_FUNCTION_RESTORE_PARAM1(currfont, const char *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2287 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2288 GtkFontChooser *fd;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2289 char *font = currfont ? strdup(currfont) : NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2290 char *name = font ? strchr(font, '.') : NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2291 char *retfont = NULL;
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	2292 DWDialog *tmp = dw_dialog_new(NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2293
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2294 /* Detect Dynamic Windows style font name...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2295 * Format: ##.Fontname
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2296 * and convert to a Pango name
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2297 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2298 if(name && isdigit(*font))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2299 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2300 int size = atoi(font);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2301 *name = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2302 name++;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2303 sprintf(font, "%s %d", name, size);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2304 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2305
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2306 fd = (GtkFontChooser *)gtk_font_chooser_dialog_new("Choose font", NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2307 if(font)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2308 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2309 gtk_font_chooser_set_font(fd, font);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2310 free(font);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2311 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2312
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2313 gtk_widget_show(GTK_WIDGET(fd));
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	2314 g_signal_connect(G_OBJECT(fd), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp);
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	2315
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	2316 if(DW_POINTER_TO_INT(dw_dialog_wait(tmp)) == GTK_RESPONSE_OK)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2317 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2318 char *fontname = gtk_font_chooser_get_font(fd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2319 if(fontname && (retfont = strdup(fontname)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2320 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2321 int len = strlen(fontname);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2322 /* Convert to Dynamic Windows format if we can... */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2323 if(len > 0 && isdigit(fontname[len-1]))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2324 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2325 int size, x=len-1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2326
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2327 while(x > 0 && fontname[x] != ' ')
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2328 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2329 x--;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2330 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2331 size = atoi(&fontname[x]);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2332 /* If we were able to find a valid size... */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2333 if(size > 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2334 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2335 /* Null terminate after the name...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2336 * and create the Dynamic Windows style font.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2337 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2338 fontname[x] = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2339 snprintf(retfont, len+1, "%d.%s", size, fontname);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2340 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2341 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2342 g_free(fontname);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2343 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2344 }
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	2345 if(GTK_IS_WINDOW(fd))
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	2346 gtk_window_destroy(GTK_WINDOW(fd));
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2347 DW_FUNCTION_RETURN_THIS(retfont);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2348 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2349
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2350 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2351 * Gets the font used by a specified window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2352 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2353 * handle: The window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2354 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2355 DW_FUNCTION_DEFINITION(dw_window_get_font, char *, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2356 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2357 DW_FUNCTION_RETURN(dw_window_get_font, char *)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2358 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2359 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2360 PangoFontDescription *pfont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2361 PangoContext *pcontext;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2362 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2363 char *font;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2364 char *retfont=NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2365
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2366 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2367 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2368 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2369 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2370 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2371 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2372 /* If it is a groupox we want to operate on the frame label */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2373 else if(GTK_IS_FRAME(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2374 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2375 GtkWidget *tmp = gtk_frame_get_label_widget(GTK_FRAME(handle));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2376 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2377 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2378 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2379
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	2380 pcontext = gtk_widget_get_pango_context(handle2);
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	2381 if(pcontext)
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	2382 {
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	2383 pfont = pango_context_get_font_description(pcontext);
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	2384 if(pfont)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2385 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2386 int len, x;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2387
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	2388 font = pango_font_description_to_string(pfont);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2389 retfont = strdup(font);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2390 len = strlen(font);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2391 /* Convert to Dynamic Windows format if we can... */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2392 if(len > 0 && isdigit(font[len-1]))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2393 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2394 int size;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2395
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2396 x=len-1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2397 while(x > 0 && font[x] != ' ')
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2398 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2399 x--;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2400 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2401 size = atoi(&font[x]);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2402 /* If we were able to find a valid size... */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2403 if(size > 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2404 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2405 /* Null terminate after the name...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2406 * and create the Dynamic Windows style font.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2407 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2408 font[x] = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2409 snprintf(retfont, len+1, "%d.%s", size, font);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2410 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2411 }
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	2412 g_free(font);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2413 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2414 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2415 DW_FUNCTION_RETURN_THIS(retfont);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2416 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2417
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2418 void _dw_free_gdk_colors(HWND handle)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2419 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2420 GdkRGBA old = (GdkRGBA )g_object_get_data(G_OBJECT(handle), "_dw_foregdk");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2421
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2422 if(old)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2423 free(old);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2424
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2425 old = (GdkRGBA *)g_object_get_data(G_OBJECT(handle), "_dw_backgdk");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2426
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2427 if(old)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2428 free(old);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2429 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2430
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2431 /* Free old color pointers and allocate new ones */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2432 static void _dw_save_gdk_colors(HWND handle, GdkRGBA fore, GdkRGBA back)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2433 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2434 GdkRGBA *foregdk = malloc(sizeof(GdkRGBA));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2435 GdkRGBA *backgdk = malloc(sizeof(GdkRGBA));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2436
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2437 _dw_free_gdk_colors(handle);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2438
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2439 *foregdk = fore;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2440 *backgdk = back;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2441
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2442 g_object_set_data(G_OBJECT(handle), "_dw_foregdk", (gpointer)foregdk);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2443 g_object_set_data(G_OBJECT(handle), "_dw_backgdk", (gpointer)backgdk);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2444 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2445
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2446 static int _dw_set_color(HWND handle, unsigned long fore, unsigned long back)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2447 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2448 /* Remember that each color component in X11 use 16 bit no matter
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2449 * what the destination display supports. (and thus GDK)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2450 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2451 GdkRGBA forecolor = {0}, backcolor = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2452
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2453 if(fore & DW_RGB_COLOR)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2454 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2455 forecolor.alpha = 1.0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2456 forecolor.red = (gdouble)DW_RED_VALUE(fore) / 255.0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2457 forecolor.green = (gdouble)DW_GREEN_VALUE(fore) / 255.0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2458 forecolor.blue = (gdouble)DW_BLUE_VALUE(fore) / 255.0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2459 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2460 else if(fore != DW_CLR_DEFAULT)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	2461 forecolor = _dw_colors[fore];
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2462
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2463 _dw_override_color(handle, "color", fore != DW_CLR_DEFAULT ? &forecolor : NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2464
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2465 if(back & DW_RGB_COLOR)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2466 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2467 backcolor.alpha = 1.0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2468 backcolor.red = (gdouble)DW_RED_VALUE(back) / 255.0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2469 backcolor.green = (gdouble)DW_GREEN_VALUE(back) / 255.0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2470 backcolor.blue = (gdouble)DW_BLUE_VALUE(back) / 255.0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2471 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2472 else if(back != DW_CLR_DEFAULT)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	2473 backcolor = _dw_colors[back];
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2474
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2475 _dw_override_color(handle, "background-color", back != DW_CLR_DEFAULT ? &backcolor : NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2476
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2477 _dw_save_gdk_colors(handle, forecolor, backcolor);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2478
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2479 return TRUE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2480 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2481 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2482 * Sets the colors used by a specified window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2483 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2484 * handle: The window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2485 * fore: Foreground color in RGB format.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2486 * back: Background color in RGB format.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2487 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2488 DW_FUNCTION_DEFINITION(dw_window_set_color, int, HWND handle, unsigned long fore, unsigned long back)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2489 DW_FUNCTION_ADD_PARAM3(handle, fore, back)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2490 DW_FUNCTION_RETURN(dw_window_set_color, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2491 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, fore, unsigned long, back, unsigned long)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2492 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2493 GtkWidget *handle2 = handle;
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2494 int retval = DW_ERROR_NONE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2495
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2496 if(GTK_IS_SCROLLED_WINDOW(handle) \|\| GTK_IS_BOX(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2497 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2498 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2499 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2500 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2501 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2502
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2503 _dw_set_color(handle2, fore, back);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2504
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2505 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2506 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2507
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2508 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2509 * Sets the font used by a specified window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2510 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2511 * handle: The window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2512 * border: Size of the window border in pixels.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2513 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	2514 int API dw_window_set_border(HWND handle, int border)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2515 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2516 /* TODO */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2517 return 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2518 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2519
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2520 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2521 * Changes the appearance of the mouse pointer.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2522 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2523 * handle: Handle to widget for which to change.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2524 * cursortype: ID of the pointer you want.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2525 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2526 DW_FUNCTION_DEFINITION(dw_window_set_pointer, void, HWND handle, int pointertype)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2527 DW_FUNCTION_ADD_PARAM2(handle, pointertype)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2528 DW_FUNCTION_NO_RETURN(dw_window_set_pointer)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2529 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, pointertype, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2530 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2531 if(pointertype > 65535)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2532 {
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2533 GdkPixbuf *pixbuf = _dw_find_pixbuf(GINT_TO_POINTER(pointertype), NULL, NULL);
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2534 GdkCursor *cursor = gdk_cursor_new_from_texture(gdk_texture_new_for_pixbuf(pixbuf), 0, 0, NULL);
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2535 if(cursor)
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2536 gtk_widget_set_cursor(GTK_WIDGET(handle), cursor);
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2537 }
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2538 if(pointertype == DW_POINTER_ARROW)
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2539 gtk_widget_set_cursor_from_name(GTK_WIDGET(handle), "default");
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2540 else if(pointertype == DW_POINTER_CLOCK)
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2541 gtk_widget_set_cursor_from_name(GTK_WIDGET(handle), "wait");
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2542 else if(pointertype == DW_POINTER_QUESTION)
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2543 gtk_widget_set_cursor_from_name(GTK_WIDGET(handle), "help");
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2544 else
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2545 gtk_widget_set_cursor(GTK_WIDGET(handle), NULL);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2546 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2547 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2548
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2549 /*
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2550 * Captures the mouse input to this window.
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2551 * Parameters:
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2552 * handle: Handle to receive mouse input.
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2553 */
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2554 #ifndef GDK_WINDOWING_X11
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	2555 void API dw_window_capture(HWND handle)
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2556 {
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2557 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2558 #else
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2559 static Display *_DWXGrabbedDisplay = NULL;
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2560
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2561 DW_FUNCTION_DEFINITION(dw_window_capture, void, HWND handle)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2562 DW_FUNCTION_ADD_PARAM1(handle)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2563 DW_FUNCTION_NO_RETURN(dw_window_capture)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2564 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2565 {
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	2566 GdkDisplay *display = gdk_display_get_default();
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	2567
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	2568 if(_DWXGrabbedDisplay == NULL && handle && GTK_IS_WINDOW(handle) && display && GDK_IS_X11_DISPLAY(display))
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2569 {
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2570 GdkSurface *surface = gtk_native_get_surface(GTK_NATIVE(handle));
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2571
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2572 if(surface)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2573 {
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2574 if(XGrabPointer(GDK_SURFACE_XDISPLAY(surface), GDK_SURFACE_XID(surface), FALSE,
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2575 ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| LeaveWindowMask,
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2576 GrabModeAsync, GrabModeAsync, None, None, CurrentTime) == GrabSuccess)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2577 _DWXGrabbedDisplay = GDK_SURFACE_XDISPLAY(surface);
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2578
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2579 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2580 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2581 DW_FUNCTION_RETURN_NOTHING;
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2582 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2583 #endif
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2584
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2585 /*
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2586 * Releases previous mouse capture.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2587 */
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2588 #ifndef GDK_WINDOWING_X11
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	2589 void API dw_window_release(void)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2590 {
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2591 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2592 #else
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2593 DW_FUNCTION_DEFINITION(dw_window_release, void)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2594 DW_FUNCTION_ADD_PARAM
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2595 DW_FUNCTION_NO_RETURN(dw_window_release)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2596 {
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	2597 /* Don't need X11 test, _DWXGrabbedDisplay won't get set unless X11 */
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2598 if(_DWXGrabbedDisplay)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2599 {
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2600 XUngrabPointer(_DWXGrabbedDisplay, CurrentTime);
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2601 _DWXGrabbedDisplay = NULL;
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2602 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2603 DW_FUNCTION_RETURN_NOTHING;
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2604 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2605 #endif
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2606
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2607 /* Window creation flags that will cause the window to have decorations */
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2608 #define _DW_DECORATION_FLAGS (DW_FCF_CLOSEBUTTON\|DW_FCF_SYSMENU\|DW_FCF_TITLEBAR\|DW_FCF_MINMAX\|DW_FCF_SIZEBORDER\|DW_FCF_BORDER\|DW_FCF_DLGBORDER)
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2609
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2610 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2611 * Create a new Window Frame.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2612 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2613 * owner: The Owner's window handle or HWND_DESKTOP.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2614 * title: The Window title.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2615 * flStyle: Style flags, see the PM reference.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2616 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2617 DW_FUNCTION_DEFINITION(dw_window_new, HWND, DW_UNUSED(HWND hwndOwner), const char *title, ULONG flStyle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2618 DW_FUNCTION_ADD_PARAM3(hwndOwner, title, flStyle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2619 DW_FUNCTION_RETURN(dw_window_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2620 DW_FUNCTION_RESTORE_PARAM3(DW_UNUSED(hwndOwner), HWND, title, char *, flStyle, ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2621 {
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2622 GtkWidget *box = dw_box_new(DW_VERT, 0);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2623 GtkWidget *grid = gtk_grid_new();
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2624 GtkWidget *tmp = gtk_window_new();
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2625
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2626 gtk_widget_show(grid);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2627
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2628 /* Handle the window style flags */
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2629 gtk_window_set_title(GTK_WINDOW(tmp), title);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2630 gtk_window_set_resizable(GTK_WINDOW(tmp), (flStyle & DW_FCF_SIZEBORDER) ? TRUE : FALSE);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2631 /* Either the CLOSEBUTTON or SYSMENU flags should make it deletable */
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2632 gtk_window_set_deletable(GTK_WINDOW(tmp), (flStyle & (DW_FCF_CLOSEBUTTON \| DW_FCF_SYSMENU)) ? TRUE : FALSE);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2633 gtk_window_set_decorated(GTK_WINDOW(tmp), (flStyle & _DW_DECORATION_FLAGS) ? TRUE : FALSE);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2634
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2635 gtk_widget_realize(tmp);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2636
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2637 if(flStyle & DW_FCF_FULLSCREEN)
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2638 gtk_window_fullscreen(GTK_WINDOW(tmp));
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2639 else
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2640 {
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2641 if(flStyle & DW_FCF_MAXIMIZE)
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2642 gtk_window_maximize(GTK_WINDOW(tmp));
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2643
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2644 if(flStyle & DW_FCF_MINIMIZE)
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2645 gtk_window_minimize(GTK_WINDOW(tmp));
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2646 }
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2647
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2648 gtk_grid_attach(GTK_GRID(grid), box, 0, 1, 1, 1);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2649 gtk_window_set_child(GTK_WINDOW(tmp), grid);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2650 g_object_set_data(G_OBJECT(tmp), "_dw_boxhandle", (gpointer)box);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2651 g_object_set_data(G_OBJECT(tmp), "_dw_grid", (gpointer)grid);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2652 g_object_set_data(G_OBJECT(tmp), "_dw_style", GINT_TO_POINTER(flStyle));
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2653 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2654 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2655
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2656 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2657 * Create a new Box to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2658 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2659 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2660 * pad: Number of pixels to pad around the box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2661 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	2662 DW_FUNCTION_DEFINITION(dw_box_new, HWND, int type, int pad)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	2663 DW_FUNCTION_ADD_PARAM2(type, pad)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	2664 DW_FUNCTION_RETURN(dw_box_new, HWND)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	2665 DW_FUNCTION_RESTORE_PARAM2(type, int, pad, int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	2666 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	2667 GtkWidget *tmp = gtk_grid_new();
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2668 g_object_set_data(G_OBJECT(tmp), "_dw_boxtype", GINT_TO_POINTER(type));
2276 d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	2669 _dw_widget_set_pad(tmp, pad);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2670 gtk_widget_show(tmp);
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	2671 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2672 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2673
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2674 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2675 * Create a new scrollable Box to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2676 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2677 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2678 * pad: Number of pixels to pad around the box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2679 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2680 DW_FUNCTION_DEFINITION(dw_scrollbox_new, HWND, int type, int pad)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2681 DW_FUNCTION_ADD_PARAM2(type, pad)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2682 DW_FUNCTION_RETURN(dw_scrollbox_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2683 DW_FUNCTION_RESTORE_PARAM2(type, int, pad, int)
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2684 {
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2685 GtkWidget tmp, box;
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2686
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2687 tmp = gtk_scrolled_window_new();
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2688 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tmp), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2689
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2690 box = gtk_grid_new();
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2691
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2692 g_object_set_data(G_OBJECT(box), "_dw_boxtype", GINT_TO_POINTER(type));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2693 g_object_set_data(G_OBJECT(tmp), "_dw_boxhandle", (gpointer)box);
2276 d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	2694 _dw_widget_set_pad(box, pad);
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	2695
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2696 gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(tmp), box);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2697 g_object_set_data(G_OBJECT(tmp), "_dw_user", box);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2698 gtk_widget_show(box);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2699 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2700
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2701 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2702 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2703
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2704 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2705 * Returns the position of the scrollbar in the scrollbox
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2706 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2707 * handle: Handle to the scrollbox to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2708 * orient: The vertical or horizontal scrollbar.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2709 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2710 DW_FUNCTION_DEFINITION(dw_scrollbox_get_pos, int, HWND handle, int orient)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2711 DW_FUNCTION_ADD_PARAM2(handle, orient)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2712 DW_FUNCTION_RETURN(dw_scrollbox_get_pos, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2713 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, orient, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2714 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2715 int val = DW_ERROR_UNKNOWN;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2716 GtkAdjustment *adjustment;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2717
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2718 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2719 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2720 if(orient == DW_HORZ)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2721 adjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(handle));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2722 else
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2723 adjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(handle));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2724 if(adjustment)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2725 val = _dw_round_value(gtk_adjustment_get_value(adjustment));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2726 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2727 DW_FUNCTION_RETURN_THIS(val);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2728 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2729
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2730 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2731 * Gets the range for the scrollbar in the scrollbox.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2732 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2733 * handle: Handle to the scrollbox to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2734 * orient: The vertical or horizontal scrollbar.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2735 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2736 DW_FUNCTION_DEFINITION(dw_scrollbox_get_range, int, HWND handle, int orient)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2737 DW_FUNCTION_ADD_PARAM2(handle, orient)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2738 DW_FUNCTION_RETURN(dw_scrollbox_get_range, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2739 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, orient, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2740 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2741 int range = DW_ERROR_UNKNOWN;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2742 GtkAdjustment *adjustment;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2743
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2744 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2745 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2746 if(orient == DW_HORZ)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2747 adjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(handle));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2748 else
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2749 adjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(handle));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2750 if(adjustment)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2751 range = _dw_round_value(gtk_adjustment_get_upper(adjustment));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2752 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2753 DW_FUNCTION_RETURN_THIS(range);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2754 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2755
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2756 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2757 * Create a new Group Box to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2758 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2759 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2760 * pad: Number of pixels to pad around the box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2761 * title: Text to be displayined in the group outline.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2762 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2763 DW_FUNCTION_DEFINITION(dw_groupbox_new, HWND, int type, int pad, const char *title)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2764 DW_FUNCTION_ADD_PARAM3(type, pad, title)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2765 DW_FUNCTION_RETURN(dw_groupbox_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2766 DW_FUNCTION_RESTORE_PARAM3(type, int, pad, int, title, const char *)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2767 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2768 GtkWidget tmp, frame = gtk_frame_new(NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2769 gtk_frame_set_label(GTK_FRAME(frame), title && *title ? title : NULL);
2276 d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	2770
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2771 tmp = gtk_grid_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2772 g_object_set_data(G_OBJECT(tmp), "_dw_boxtype", GINT_TO_POINTER(type));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2773 g_object_set_data(G_OBJECT(frame), "_dw_boxhandle", (gpointer)tmp);
2276 d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	2774 _dw_widget_set_pad(tmp, pad);
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2775 gtk_frame_set_child(GTK_FRAME(frame), tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2776 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2777 gtk_widget_show(frame);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2778 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2779 dw_window_set_font(frame, _DWDefaultFont);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2780 DW_FUNCTION_RETURN_THIS(frame);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2781 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2782
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2783 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2784 * Create a bitmap object to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2785 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2786 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2787 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2788 DW_FUNCTION_DEFINITION(dw_bitmap_new, HWND, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2789 DW_FUNCTION_ADD_PARAM1(cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2790 DW_FUNCTION_RETURN(dw_bitmap_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2791 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2792 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	2793 GtkWidget *tmp = gtk_picture_new();
b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	2794 gtk_picture_set_can_shrink(GTK_PICTURE(tmp), TRUE);
2860 9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	2795 #if GTK_CHECK_VERSION(4,8,0)
9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	2796 gtk_picture_set_content_fit(GTK_PICTURE(tmp), GTK_CONTENT_FIT_CONTAIN);
9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	2797 #else
2367 0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	2798 gtk_picture_set_keep_aspect_ratio(GTK_PICTURE(tmp), TRUE);
2860 9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	2799 #endif
2367 0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	2800 gtk_widget_set_halign(GTK_WIDGET(tmp), GTK_ALIGN_CENTER);
0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	2801 gtk_widget_set_valign(GTK_WIDGET(tmp), GTK_ALIGN_CENTER);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2802 gtk_widget_show(tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2803 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2804 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2805 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2806
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2807 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2808 * Create a notebook object to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2809 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2810 * id: An ID to be used for getting the resource from the
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2811 * resource file.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2812 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2813 DW_FUNCTION_DEFINITION(dw_notebook_new, HWND, ULONG cid, int top)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2814 DW_FUNCTION_ADD_PARAM2(cid, top)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2815 DW_FUNCTION_RETURN(dw_notebook_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2816 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, top, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2817 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2818 GtkWidget tmp, pagearray = calloc(sizeof(GtkWidget ), 256);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2819
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2820 tmp = gtk_notebook_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2821 if(top)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2822 gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tmp), GTK_POS_TOP);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2823 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2824 gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tmp), GTK_POS_BOTTOM);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2825 gtk_notebook_set_scrollable(GTK_NOTEBOOK(tmp), TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2826 gtk_widget_show(tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2827 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2828 g_object_set_data(G_OBJECT(tmp), "_dw_pagearray", (gpointer)pagearray);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2829 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2830 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2831
2290 3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2832 static unsigned int _dw_menugroup = 0;
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2833
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2834 /* Recurse into a menu setting the action groups on the menuparent widget */
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2835 void _dw_menu_set_group_recursive(HMENUI start, GtkWidget *menuparent)
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2836 {
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2837 int z, submenucount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(start), "_dw_submenucount"));
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2838
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2839 for(z=0;z<submenucount;z++)
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2840 {
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2841 char tempbuf[101] = {0};
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2842 HMENUI submenu;
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2843
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2844 snprintf(tempbuf, 100, "_dw_submenu%d", z);
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2845
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2846 if((submenu = g_object_get_data(G_OBJECT(start), tempbuf)))
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2847 {
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2848 if(!g_object_get_data(G_OBJECT(submenu), "_dw_menuparent"))
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2849 {
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2850 int menugroup = DW_POINTER_TO_INT(g_object_get_data(G_OBJECT(submenu), "_dw_menugroup"));
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2851 GSimpleActionGroup *group = g_object_get_data(G_OBJECT(submenu), "_dw_group");
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2852 char tempbuf[25] = {0};
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2853
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2854 snprintf(tempbuf, 24, "menu%d", menugroup);
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2855
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2856 gtk_widget_insert_action_group(GTK_WIDGET(menuparent), tempbuf, G_ACTION_GROUP(group));
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2857 g_object_set_data(G_OBJECT(submenu), "_dw_menuparent", (gpointer)menuparent);
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2858 }
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2859 _dw_menu_set_group_recursive(submenu, menuparent);
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2860 }
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2861 }
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2862 }
2289 26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2863
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2864 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2865 * Create a menu object to be popped up.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2866 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2867 * id: An ID to be used for getting the resource from the
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2868 * resource file.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2869 */
2310 5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	2870 DW_FUNCTION_DEFINITION(dw_menu_new, HMENUI, ULONG cid)
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	2871 DW_FUNCTION_ADD_PARAM1(cid)
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	2872 DW_FUNCTION_RETURN(dw_menu_new, HMENUI)
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	2873 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2874 {
2290 3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2875 GMenu *tmp = g_menu_new();
2288 d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2876 /* Create the initial section and add it to the menu */
d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2877 GMenu *section = g_menu_new();
d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2878 GMenuItem *item = g_menu_item_new_section(NULL, G_MENU_MODEL(section));
2289 26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2879 GSimpleActionGroup *group = g_simple_action_group_new();
26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2880
2290 3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2881 g_menu_append_item(tmp, item);
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2882
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2883 g_object_set_data(G_OBJECT(tmp), "_dw_menugroup", GINT_TO_POINTER(++_dw_menugroup));
2289 26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2884 g_object_set_data(G_OBJECT(tmp), "_dw_group", (gpointer)group);
2310 5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	2885 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2288 d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2886 g_object_set_data(G_OBJECT(tmp), "_dw_section", (gpointer)section);
2310 5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	2887 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2888 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2889
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2890 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2891 * Create a menubar on a window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2892 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2893 * location: Handle of a window frame to be attached to.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2894 * If there is no box already packed into the "location", the menu will not appear
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2895 * so tell the user.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2896 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2897 DW_FUNCTION_DEFINITION(dw_menubar_new, HMENUI, HWND location)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2898 DW_FUNCTION_ADD_PARAM1(location)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2899 DW_FUNCTION_RETURN(dw_menubar_new, HMENUI)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2900 DW_FUNCTION_RESTORE_PARAM1(location, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2901 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	2902 HMENUI tmp = 0;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2903 GtkWidget *box;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2904
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2905 if(GTK_IS_WINDOW(location) &&
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2906 (box = GTK_WIDGET(g_object_get_data(G_OBJECT(location), "_dw_grid"))))
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2907 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2908 /* If there is an existing menu bar, remove it */
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2909 GtkWidget *oldmenu = GTK_WIDGET(g_object_get_data(G_OBJECT(location), "_dw_menubar"));
2288 d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2910 GMenu *menu = g_menu_new();
d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2911 /* Create the initial section and add it to the menu */
d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2912 GMenu *section = g_menu_new();
d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2913 GMenuItem *item = g_menu_item_new_section(NULL, G_MENU_MODEL(section));
2289 26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2914 GSimpleActionGroup *group = g_simple_action_group_new();
26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2915 char tempbuf[25] = {0};
26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2916
2288 d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2917 g_menu_append_item(menu, item);
2272 2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2918
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2919 if(oldmenu && GTK_IS_WIDGET(oldmenu))
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2920 gtk_grid_remove(GTK_GRID(box), tmp);
2272 2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2921
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2922 /* Create a new menu bar */
2272 2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2923 tmp = gtk_popover_menu_bar_new_from_model(G_MENU_MODEL(menu));
2289 26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2924 snprintf(tempbuf, 24, "menu%d", ++_dw_menugroup);
26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2925 gtk_widget_insert_action_group(GTK_WIDGET(tmp), tempbuf, G_ACTION_GROUP(group));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2926 gtk_widget_show(tmp);
2289 26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2927
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2928 /* Save pointers to each other */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2929 g_object_set_data(G_OBJECT(location), "_dw_menubar", (gpointer)tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2930 g_object_set_data(G_OBJECT(tmp), "_dw_window", (gpointer)location);
2289 26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2931 g_object_set_data(G_OBJECT(tmp), "_dw_menugroup", GINT_TO_POINTER(_dw_menugroup));
26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2932 g_object_set_data(G_OBJECT(tmp), "_dw_group", (gpointer)group);
2288 d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2933 g_object_set_data(G_OBJECT(tmp), "_dw_section", (gpointer)section);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2934 gtk_grid_attach(GTK_GRID(box), tmp, 0, 0, 1, 1);
2290 3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2935 _dw_menu_set_group_recursive(tmp, GTK_WIDGET(tmp));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2936 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2937 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2938 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2939
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2940 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2941 * Destroys a menu created with dw_menubar_new or dw_menu_new.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2942 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2943 * menu: Handle of a menu.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2944 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2945 DW_FUNCTION_DEFINITION(dw_menu_destroy, void, HMENUI *menu)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2946 DW_FUNCTION_ADD_PARAM1(menu)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2947 DW_FUNCTION_NO_RETURN(dw_menu_destroy)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2948 DW_FUNCTION_RESTORE_PARAM1(menu, HMENUI *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2949 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2950 if(menu && *menu)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2951 {
2284 3361ce6070ce Add DW_FEATURE_TASK_BAR to the feature tests, for taskbar icon support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2282 diff changeset	2952 GtkWidget *window = NULL;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2953
2332 594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2954 /* If it is attached to a window, try to delete the reference to it */
594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2955 if((GTK_IS_POPOVER_MENU_BAR(menu) \|\| GTK_IS_POPOVER_MENU(menu)) &&
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2956 (window = GTK_WIDGET(g_object_get_data(G_OBJECT(*menu), "_dw_window"))))
2332 594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2957 {
594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2958 if(GTK_IS_POPOVER_MENU_BAR(*menu))
594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2959 g_object_set_data(G_OBJECT(window), "_dw_menubar", NULL);
594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2960 else
594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2961 g_object_set_data(G_OBJECT(window), "_dw_menu_popup", NULL);
594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2962 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2963 /* Actually destroy the menu */
2284 3361ce6070ce Add DW_FEATURE_TASK_BAR to the feature tests, for taskbar icon support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2282 diff changeset	2964 if(GTK_IS_WIDGET(*menu) && window)
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2965 {
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2966 GtkWidget *box = GTK_WIDGET(g_object_get_data(G_OBJECT(window), "_dw_grid"));
2332 594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2967
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2968 if(box && GTK_IS_GRID(box))
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2969 gtk_grid_remove(GTK_GRID(box), GTK_WIDGET(*menu));
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2970 else
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2971 g_object_unref(G_OBJECT(*menu));
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2972 }
2290 3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2973 else if(G_IS_MENU(*menu))
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2974 g_object_unref(G_OBJECT(*menu));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2975 *menu = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2976 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2977 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2978 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2979
2286 2d282d8fe911 GTK4: Change to how the action name is created, don't use the menu label... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2284 diff changeset	2980 char _dw_removetilde(char dest, const char src)
2272 2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2981 {
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2982 int z, cur=0;
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2983 char accel = '\0';
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2984
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2985 for(z=0;z<strlen(src);z++)
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2986 {
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2987 if(src[z] == '~')
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2988 {
2286 2d282d8fe911 GTK4: Change to how the action name is created, don't use the menu label... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2284 diff changeset	2989 dest[cur] = '_';
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2990 accel = src[z+1];
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2991 }
2272 2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2992 else
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2993 dest[cur] = src[z];
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2994 cur++;
2272 2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2995 }
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2996 dest[cur] = 0;
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2997 return accel;
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2998 }
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2999
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	3000
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3001 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3002 * Adds a menuitem or submenu to an existing menu.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3003 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3004 * menu: The handle to the existing menu.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3005 * title: The title text on the menu item to be added.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3006 * id: An ID to be used for message passing.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3007 * flags: Extended attributes to set on the menu.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3008 * end: If TRUE memu is positioned at the end of the menu.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3009 * check: If TRUE menu is "check"able.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3010 * submenu: Handle to an existing menu to be a submenu or NULL.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3011 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3012 DW_FUNCTION_DEFINITION(dw_menu_append_item, HWND, HMENUI menu, const char *title, unsigned long id, unsigned long flags, int end, DW_UNUSED(int check), HMENUI submenu)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3013 DW_FUNCTION_ADD_PARAM7(menu, title, id, flags, end, check, submenu)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3014 DW_FUNCTION_RETURN(dw_menu_append_item, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3015 DW_FUNCTION_RESTORE_PARAM7(menu, HMENUI, title, const char *, id, unsigned long, flags, unsigned long, end, int, DW_UNUSED(check), int, submenu, HMENUI)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3016 {
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3017 GSimpleAction *action = NULL;
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3018 HWND tmphandle = NULL;
2272 2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	3019 GMenuModel *menumodel;
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3020 char *temptitle = alloca(strlen(title)+1);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3021
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3022 if(menu)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3023 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3024 /* By default we add to the menu's current section */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3025 menumodel = g_object_get_data(G_OBJECT(menu), "_dw_section");
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3026 _dw_removetilde(temptitle, title);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3027
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3028 /* To add a separator we create a new section and add it */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3029 if (strlen(temptitle) == 0)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3030 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3031 GMenu *section = g_menu_new();
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3032
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3033 /* If we are creating a new section, add it to the core menu... not the section */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3034 if(GTK_IS_POPOVER_MENU_BAR(menu))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3035 menumodel = gtk_popover_menu_bar_get_menu_model(GTK_POPOVER_MENU_BAR(menu));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3036 else
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3037 menumodel = G_MENU_MODEL(menu);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3038
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3039 tmphandle = (HWND)g_menu_item_new_section(NULL, G_MENU_MODEL(section));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3040 g_object_set_data(G_OBJECT(menu), "_dw_section", (gpointer)section);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3041 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3042 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3043 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3044 char tempbuf[101] = {0};
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3045
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3046 if(submenu)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3047 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3048 if(G_IS_MENU(submenu))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3049 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3050 int submenucount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu), "_dw_submenucount"));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3051 GtkWidget *menuparent = GTK_WIDGET(g_object_get_data(G_OBJECT(menu), "_dw_menuparent"));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3052
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3053 /* If the menu being added to is a menu bar, that is the menuparent for submenus */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3054 if(GTK_IS_POPOVER_MENU_BAR(menu))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3055 menuparent = GTK_WIDGET(menu);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3056
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3057 snprintf(tempbuf, 100, "_dw_submenu%d", submenucount);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3058 submenucount++;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3059 tmphandle = (HWND)g_menu_item_new_submenu(temptitle, G_MENU_MODEL(submenu));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3060 g_object_set_data(G_OBJECT(menu), tempbuf, (gpointer)submenu);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3061 g_object_set_data(G_OBJECT(menu), "_dw_submenucount", GINT_TO_POINTER(submenucount));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3062
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3063 /* If we have a menu parent, use it to create the groups if needed */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3064 if(menuparent && !g_object_get_data(G_OBJECT(submenu), "_dw_menuparent"))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3065 _dw_menu_set_group_recursive(menu, menuparent);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3066 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3067 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3068 else
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3069 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3070 char numbuf[25] = {0};
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3071 GSimpleActionGroup *group = g_object_get_data(G_OBJECT(menu), "_dw_group");
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3072 int menugroup = DW_POINTER_TO_INT(g_object_get_data(G_OBJECT(menu), "_dw_menugroup"));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3073 char *actionname;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3074
2326 258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3075 /* Code to autogenerate a menu ID if not specified or invalid
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3076 * First pool is smaller for transient popup menus
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3077 */
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3078 if(id == (ULONG)-1)
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3079 {
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3080 static ULONG tempid = 60000;
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3081
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3082 tempid++;
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3083 id = tempid;
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3084
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3085 if(tempid > 65500)
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3086 tempid = 60000;
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3087 }
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3088 /* Second pool is larger for more static windows */
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3089 else if(!id \|\| id >= 30000)
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3090 {
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3091 static ULONG menuid = 30000;
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3092
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3093 menuid++;
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3094 if(menuid > 60000)
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3095 menuid = 30000;
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3096 id = menuid;
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3097 }
258c1b9c29f4 GTK4: Implement DW_MENU_AUTO and DW_MENU_POPUP. These weren't necessary on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2325 diff changeset	3098
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3099 snprintf(tempbuf, 100, "menu%d.action%lu", menugroup, id);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3100 actionname = strchr(tempbuf, '.');
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3101 if(check)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3102 action = g_simple_action_new_stateful(&actionname[1], NULL, g_variant_new_boolean (FALSE));
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3103 else
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3104 action = g_simple_action_new(&actionname[1], NULL);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3105 g_action_map_add_action(G_ACTION_MAP(group), G_ACTION(action));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3106 tmphandle=(HWND)g_menu_item_new(temptitle, tempbuf);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3107 snprintf(numbuf, 24, "%lu", id);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3108 g_object_set_data(G_OBJECT(menu), numbuf, (gpointer)tmphandle);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3109 g_object_set_data(G_OBJECT(tmphandle), "_dw_action", (gpointer)action);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3110 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3111 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3112
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3113 if(end)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3114 g_menu_append_item(G_MENU(menumodel), G_MENU_ITEM(tmphandle));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3115 else
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3116 g_menu_prepend_item(G_MENU(menumodel), G_MENU_ITEM(tmphandle));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3117
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3118 g_object_set_data(G_OBJECT(tmphandle), "_dw_id", GINT_TO_POINTER(id));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3119
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3120 if(action)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3121 g_simple_action_set_enabled(action, (flags & DW_MIS_DISABLED) ? FALSE : TRUE);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3122 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3123 DW_FUNCTION_RETURN_THIS(tmphandle);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3124 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3125
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3126 GMenuItem _dw_find_submenu_id(HMENUI start, const char name)
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3127 {
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3128 GMenuItem *tmp;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3129 int z, submenucount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(start), "_dw_submenucount"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3130
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3131 if((tmp = g_object_get_data(G_OBJECT(start), name)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3132 return tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3133
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3134 for(z=0;z<submenucount;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3135 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3136 char tempbuf[101] = {0};
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3137 GMenuItem *menuitem;
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3138 HMENUI submenu;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3139
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3140 snprintf(tempbuf, 100, "_dw_submenu%d", z);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3141
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3142 if((submenu = g_object_get_data(G_OBJECT(start), tempbuf)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3143 {
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3144 if((menuitem = _dw_find_submenu_id(submenu, name)))
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3145 return menuitem;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3146 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3147 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3148 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3149 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3150
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3151 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3152 * Sets the state of a menu item check.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3153 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3154 * menu: The handle the the existing menu.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3155 * id: Menuitem id.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3156 * check: TRUE for checked FALSE for not checked.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3157 * deprecated: use dw_menu_item_set_state()
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3158 */
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3159 DW_FUNCTION_DEFINITION(dw_menu_item_set_check, void, HMENUI menu, ULONG cid, int check)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3160 DW_FUNCTION_ADD_PARAM3(menu, cid, check)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3161 DW_FUNCTION_NO_RETURN(dw_menu_item_set_check)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3162 DW_FUNCTION_RESTORE_PARAM3(menu, HMENUI, cid, ULONG, check, int)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3163 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3164 if(menu)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3165 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3166 char numbuf[25] = {0};
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3167 GMenuItem *tmphandle;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3168
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3169 snprintf(numbuf, 24, "%lu", cid);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3170 tmphandle = _dw_find_submenu_id(menu, numbuf);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3171
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3172 if(tmphandle && G_IS_MENU_ITEM(tmphandle))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3173 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3174 GSimpleAction *action = g_object_get_data(G_OBJECT(tmphandle), "_dw_action");
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3175
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3176 if(action)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3177 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3178 GVariant *action_state = g_action_get_state(G_ACTION(action));
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3179 gboolean thischeck = check;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3180
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3181 if(!action_state \|\| (g_variant_get_boolean(action_state) != thischeck))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3182 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3183 GVariant *new_state = g_variant_new_boolean(thischeck);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3184 g_simple_action_set_state(action, new_state);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3185 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3186 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3187 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3188 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3189 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3190 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3191
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3192 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3193 * Sets the state of a menu item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3194 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3195 * menu: The handle the the existing menu.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3196 * id: Menuitem id.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3197 * state: TRUE for checked FALSE for not checked.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3198 */
2310 5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3199 DW_FUNCTION_DEFINITION(dw_menu_item_set_state, void, HMENUI menu, ULONG cid, ULONG state)
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3200 DW_FUNCTION_ADD_PARAM3(menu, cid, state)
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3201 DW_FUNCTION_NO_RETURN(dw_menu_item_set_state)
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3202 DW_FUNCTION_RESTORE_PARAM3(menu, HMENUI, cid, ULONG, state, ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3203 {
2310 5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3204 if(menu)
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3205 {
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3206 char numbuf[25] = {0};
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3207 GMenuItem *tmphandle;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3208
2310 5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3209 snprintf(numbuf, 24, "%lu", cid);
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3210 tmphandle = _dw_find_submenu_id(menu, numbuf);
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3211
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3212 if(tmphandle && G_IS_MENU_ITEM(tmphandle))
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3213 {
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3214 GSimpleAction *action = g_object_get_data(G_OBJECT(tmphandle), "_dw_action");
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3215
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3216 if(action)
2310 5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3217 {
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3218 if((state & DW_MIS_CHECKED) \|\| (state & DW_MIS_UNCHECKED))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3219 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3220 GVariant *action_state = g_action_get_state(G_ACTION(action));
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3221 gboolean check = false;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3222
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3223 if(state & DW_MIS_CHECKED)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3224 check = true;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3225
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3226 if(!action_state \|\| (g_variant_get_boolean(action_state) != check))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3227 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3228 GVariant *new_state = g_variant_new_boolean(check);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3229 g_simple_action_set_state(action, new_state);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3230 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3231 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3232 if((state & DW_MIS_ENABLED) \|\| (state & DW_MIS_DISABLED))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3233 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3234 if(state & DW_MIS_ENABLED)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3235 g_simple_action_set_enabled(action, TRUE);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3236 else
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3237 g_simple_action_set_enabled(action, FALSE);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3238 }
2310 5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3239 }
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3240 }
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3241 }
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3242 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3243 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3244
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3245 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3246 * Deletes the menu item specified.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3247 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3248 * menu: The handle to the menu in which the item was appended.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3249 * id: Menuitem id.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3250 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3251 * DW_ERROR_NONE (0) on success or DW_ERROR_UNKNOWN on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3252 */
2310 5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3253 DW_FUNCTION_DEFINITION(dw_menu_delete_item, int, HMENUI menu, ULONG cid)
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3254 DW_FUNCTION_ADD_PARAM2(menu, cid)
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3255 DW_FUNCTION_RETURN(dw_menu_delete_item, int)
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3256 DW_FUNCTION_RESTORE_PARAM2(menu, HMENUI, cid, ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3257 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3258 int ret = DW_ERROR_UNKNOWN;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3259 char numbuf[25] = {0};
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3260 GMenuItem *tmphandle;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3261
2310 5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3262 if(menu)
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3263 {
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3264 snprintf(numbuf, 24, "%lu", cid);
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3265 tmphandle = _dw_find_submenu_id(menu, numbuf);
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3266
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3267 if(tmphandle && G_IS_MENU_ITEM(tmphandle))
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3268 {
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3269 /* g_menu_remove(menu, position); */
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3270 g_object_unref(G_OBJECT(tmphandle));
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3271 g_object_set_data(G_OBJECT(menu), numbuf, NULL);
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3272 ret = DW_ERROR_NONE;
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3273 }
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3274 }
5df7b1431d1a GTK4: Moved the rest of the menu functions into thread safety to try to fix bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2309 diff changeset	3275 DW_FUNCTION_RETURN_THIS(ret);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3276 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3277
2300 6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3278 /* Delayed unparent of the popup menu from the parent */
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3279 gboolean _dw_idle_popover_unparent(gpointer data)
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3280 {
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3281 GtkWidget *self = GTK_WIDGET(data);
2331 addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3282 GtkWidget box, window = g_object_get_data(G_OBJECT(self), "_dw_window");
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3283
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3284 if(window && GTK_IS_WINDOW(window) &&
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3285 (box = g_object_get_data(G_OBJECT(window), "_dw_grid")) && GTK_IS_GRID(box))
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3286 gtk_grid_remove(GTK_GRID(box), self);
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3287 else
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3288 gtk_widget_unparent(self);
2300 6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3289 return false;
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3290 }
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3291
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3292 void _dw_popover_menu_closed(GtkPopover *self, gpointer data)
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3293 {
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3294 GtkWidget *parent = GTK_WIDGET(data);
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3295
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3296 /* Can't unparent immediately, since the "activate" signal happens second...
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3297 * so we have to delay unparenting until the "activate" handler runs.
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3298 */
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3299 if(GTK_IS_WIDGET(parent) && GTK_IS_POPOVER(self))
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3300 g_idle_add(G_SOURCE_FUNC(_dw_idle_popover_unparent), (gpointer)self);
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3301 }
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3302
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3303 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3304 * Pops up a context menu at given x and y coordinates.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3305 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3306 * menu: The handle the the existing menu.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3307 * parent: Handle to the window initiating the popup.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3308 * x: X coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3309 * y: Y coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3310 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3311 DW_FUNCTION_DEFINITION(dw_menu_popup, void, HMENUI *menu, HWND parent, int x, int y)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3312 DW_FUNCTION_ADD_PARAM4(menu, parent, x, y)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3313 DW_FUNCTION_NO_RETURN(dw_menu_popup)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3314 DW_FUNCTION_RESTORE_PARAM4(menu, HMENUI *, parent, HWND, x, int, y, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3315 {
2290 3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	3316 if(menu && menu && G_MENU(menu))
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3317 {
2290 3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	3318 GtkWidget tmp = gtk_popover_menu_new_from_model_full(G_MENU_MODEL(menu), GTK_POPOVER_MENU_NESTED);
2302 785775b9002f GTK4: Use gtk_popover_set_pointing_to() to position the popover instead of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2301 diff changeset	3319 GdkRectangle rect = { x, y, 1, 1 };
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	3320
2331 addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3321 if(GTK_IS_WINDOW(parent))
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3322 {
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3323 GtkWidget *box = g_object_get_data(G_OBJECT(parent), "_dw_grid");
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3324
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3325 if(box && GTK_IS_GRID(box))
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3326 {
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3327 gtk_grid_attach(GTK_GRID(box), tmp, 65535, 65535, 1, 1);
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3328 g_object_set_data(G_OBJECT(tmp), "_dw_window", (gpointer)parent);
2332 594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	3329 g_object_set_data(G_OBJECT(parent), "_dw_menu_popup", (gpointer)tmp);
2331 addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3330 }
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3331 }
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3332 else
addbd7db1e5c GTK4: If parent passed to dw_menu_popup() is a GtkWindow, add the popup to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	3333 gtk_widget_set_parent(tmp, GTK_WIDGET(parent));
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	3334
2303 cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3335 if(!g_object_get_data(G_OBJECT(*menu), "_dw_menuparent"))
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3336 {
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3337 int menugroup = DW_POINTER_TO_INT(g_object_get_data(G_OBJECT(*menu), "_dw_menugroup"));
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3338 GSimpleActionGroup group = g_object_get_data(G_OBJECT(menu), "_dw_group");
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3339 char tempbuf[25] = {0};
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3340
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3341 snprintf(tempbuf, 24, "menu%d", menugroup);
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3342
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3343 gtk_widget_insert_action_group(GTK_WIDGET(tmp), tempbuf, G_ACTION_GROUP(group));
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3344 g_object_set_data(G_OBJECT(*menu), "_dw_menuparent", (gpointer)tmp);
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3345 }
2290 3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	3346 _dw_menu_set_group_recursive(*menu, GTK_WIDGET(tmp));
2300 6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3347 gtk_popover_set_autohide(GTK_POPOVER(tmp), TRUE);
2302 785775b9002f GTK4: Use gtk_popover_set_pointing_to() to position the popover instead of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2301 diff changeset	3348 gtk_popover_set_has_arrow (GTK_POPOVER(tmp), FALSE);
785775b9002f GTK4: Use gtk_popover_set_pointing_to() to position the popover instead of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2301 diff changeset	3349 gtk_popover_set_pointing_to(GTK_POPOVER(tmp), &rect);
2300 6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3350 g_signal_connect(G_OBJECT(tmp), "closed", G_CALLBACK(_dw_popover_menu_closed), (gpointer)parent);
2299 27c20fa1615e GTK4: Fix a crash while trying to create a popup menu... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2295 diff changeset	3351 gtk_popover_popup(GTK_POPOVER(tmp));
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3352 *menu = NULL;
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3353 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3354 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3355 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3356
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3357
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3358 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3359 * Returns the current X and Y coordinates of the mouse pointer.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3360 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3361 * x: Pointer to variable to store X coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3362 * y: Pointer to variable to store Y coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3363 */
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	3364 void API dw_pointer_query_pos(long x, long y)
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	3365 {
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3366 if(x)
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	3367 *x = (long)_dw_mouse_last_x;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3368 if(y)
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	3369 *y = (long)_dw_mouse_last_y;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3370 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3371
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3372 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3373 * Sets the X and Y coordinates of the mouse pointer.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3374 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3375 * x: X coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3376 * y: Y coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3377 */
2322 ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3378 #ifndef GDK_WINDOWING_X11
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	3379 void API dw_pointer_set_pos(long x, long y)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3380 {
2322 ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3381 }
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3382 #else
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3383 DW_FUNCTION_DEFINITION(dw_pointer_set_pos, void, long x, long y)
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3384 DW_FUNCTION_ADD_PARAM2(x, y)
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3385 DW_FUNCTION_NO_RETURN(dw_pointer_set_pos)
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3386 DW_FUNCTION_RESTORE_PARAM2(x, long, y, long)
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3387 {
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3388 GdkDisplay *display = gdk_display_get_default();
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3389
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	3390 if(display && GDK_IS_X11_DISPLAY(display))
2322 ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3391 {
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3392 Display *xdisplay = gdk_x11_display_get_xdisplay(display);
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3393 Window xrootwin = gdk_x11_display_get_xrootwindow(display);
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3394
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3395 if(xdisplay)
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3396 XWarpPointer(xdisplay, None, xrootwin, 0, 0, 0, 0, (int)x, (int)y);
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3397 }
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3398 DW_FUNCTION_RETURN_NOTHING;
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3399 }
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3400 #endif
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3401
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3402 #define _DW_TREE_CONTAINER 1
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3403 #define _DW_TREE_TREE 2
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3404 #define _DW_TREE_LISTBOX 3
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3405
2287 680212c356e3 GTK4: Refactor tree and fix DW_SIGNAL_ITEM_CONTEXT signals on tree view bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2286 diff changeset	3406 GtkWidget *_dw_tree_create(unsigned long id)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3407 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3408 GtkWidget *tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3409
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3410 tmp = gtk_scrolled_window_new();
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3411 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (tmp),
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3412 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3413
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3414 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3415 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3416 return tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3417 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3418
2287 680212c356e3 GTK4: Refactor tree and fix DW_SIGNAL_ITEM_CONTEXT signals on tree view bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2286 diff changeset	3419 GtkWidget _dw_tree_view_setup(GtkWidget tmp, GtkTreeModel *store)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3420 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3421 GtkWidget *tree = gtk_tree_view_new_with_model(store);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3422 gtk_tree_view_set_enable_search(GTK_TREE_VIEW(tree), FALSE);
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3423 gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(tmp), tree);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3424 g_object_set_data(G_OBJECT(tmp), "_dw_user", (gpointer)tree);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3425 return tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3426 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3427
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3428 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3429 * Create a container object to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3430 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3431 * id: An ID to be used for getting the resource from the
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3432 * resource file.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3433 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3434 DW_FUNCTION_DEFINITION(dw_container_new, HWND, ULONG cid, int multi)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3435 DW_FUNCTION_ADD_PARAM2(cid, multi)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3436 DW_FUNCTION_RETURN(dw_container_new, HWND)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3437 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, multi, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3438 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3439 GtkWidget *tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3440
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3441 if((tmp = _dw_tree_create(cid)))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3442 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3443 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3444 g_object_set_data(G_OBJECT(tmp), "_dw_multi_sel", GINT_TO_POINTER(multi));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3445 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3446 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3447 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3448
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3449 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3450 * Create a tree object to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3451 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3452 * id: An ID to be used for getting the resource from the
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3453 * resource file.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3454 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3455 DW_FUNCTION_DEFINITION(dw_tree_new, HWND, ULONG cid)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3456 DW_FUNCTION_ADD_PARAM1(cid)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3457 DW_FUNCTION_RETURN(dw_tree_new, HWND)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3458 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3459 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3460 GtkWidget tmp, tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3461 GtkTreeStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3462 GtkTreeViewColumn *col;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3463 GtkCellRenderer *rend;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3464 GtkTreeSelection *sel;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3465
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3466 if((tmp = _dw_tree_create(cid)))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3467 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3468 store = gtk_tree_store_new(4, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_POINTER);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3469 tree = _dw_tree_view_setup(tmp, GTK_TREE_MODEL(store));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3470 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_TREE));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3471 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_TREE));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3472 col = gtk_tree_view_column_new();
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3473
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3474 rend = gtk_cell_renderer_pixbuf_new();
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3475 gtk_tree_view_column_pack_start(col, rend, FALSE);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3476 gtk_tree_view_column_add_attribute(col, rend, "pixbuf", 1);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3477 rend = gtk_cell_renderer_text_new();
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3478 gtk_tree_view_column_pack_start(col, rend, TRUE);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3479 gtk_tree_view_column_add_attribute(col, rend, "text", 0);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3480
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3481 gtk_tree_view_append_column(GTK_TREE_VIEW (tree), col);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3482 gtk_tree_view_set_expander_column(GTK_TREE_VIEW(tree), col);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3483 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3484
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3485 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3486 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3487 gtk_widget_show(tree);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3488
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3489 if(_DWDefaultFont)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3490 dw_window_set_font(tmp, _DWDefaultFont);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3491 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3492 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3493 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3494
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3495
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3496 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3497 * Create a new static text window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3498 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3499 * text: The text to be display by the static text widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3500 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3501 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3502 DW_FUNCTION_DEFINITION(dw_text_new, HWND, const char *text, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3503 DW_FUNCTION_ADD_PARAM2(text, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3504 DW_FUNCTION_RETURN(dw_text_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3505 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3506 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3507 GtkWidget *tmp = gtk_label_new(text);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3508
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3509 /* Left and centered */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3510 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3511 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3512 gtk_widget_show(tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3513 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3514 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3515 dw_window_set_font(tmp, _DWDefaultFont);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3516 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3517 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3518
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3519 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3520 * Create a new status text window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3521 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3522 * text: The text to be display by the static text widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3523 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3524 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3525 DW_FUNCTION_DEFINITION(dw_status_text_new, HWND, const char *text, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3526 DW_FUNCTION_ADD_PARAM2(text, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3527 DW_FUNCTION_RETURN(dw_status_text_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3528 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3529 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3530 GtkWidget tmp, frame = gtk_frame_new(NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3531 tmp = gtk_label_new(text);
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3532 gtk_frame_set_child(GTK_FRAME(frame), tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3533 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3534 gtk_widget_show(frame);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3535
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3536 /* Left and centered */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3537 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3538 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3539 g_object_set_data(G_OBJECT(frame), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3540 g_object_set_data(G_OBJECT(frame), "_dw_label", (gpointer)tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3541 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3542 dw_window_set_font(tmp, _DWDefaultFont);
2306 558959a64772 GTK4: Fix thread safety while using dw_main() and fix an status text issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2305 diff changeset	3543 DW_FUNCTION_RETURN_THIS(frame);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3544 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3545
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3546 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3547 * Create a new Multiline Editbox window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3548 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3549 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3550 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3551 DW_FUNCTION_DEFINITION(dw_mle_new, HWND, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3552 DW_FUNCTION_ADD_PARAM1(cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3553 DW_FUNCTION_RETURN(dw_mle_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3554 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3555 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3556 GtkWidget tmp, tmpbox = gtk_scrolled_window_new();
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3557 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tmpbox),
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3558 GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3559 tmp = gtk_text_view_new();
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3560 gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(tmpbox), tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3561 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_WORD);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3562
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3563 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3564 g_object_set_data(G_OBJECT(tmpbox), "_dw_user", (gpointer)tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3565 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3566 gtk_widget_show(tmpbox);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3567 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3568 dw_window_set_font(tmpbox, _DWDefaultFont);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3569 DW_FUNCTION_RETURN_THIS(tmpbox);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3570 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3571
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3572 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3573 * Create a new Entryfield window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3574 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3575 * text: The default text to be in the entryfield widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3576 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3577 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3578 DW_FUNCTION_DEFINITION(dw_entryfield_new, HWND, const char *text, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3579 DW_FUNCTION_ADD_PARAM2(text, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3580 DW_FUNCTION_RETURN(dw_entryfield_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3581 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3582 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3583 GtkEntryBuffer *buffer = gtk_entry_buffer_new(text, -1);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3584 GtkWidget *tmp = gtk_entry_new_with_buffer(buffer);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3585
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3586 gtk_widget_show(tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3587 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3588
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3589 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3590 dw_window_set_font(tmp, _DWDefaultFont);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3591 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3592 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3593
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3594 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3595 * Create a new Entryfield (password) window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3596 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3597 * text: The default text to be in the entryfield widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3598 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3599 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3600 DW_FUNCTION_DEFINITION(dw_entryfield_password_new, HWND, const char *text, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3601 DW_FUNCTION_ADD_PARAM2(text, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3602 DW_FUNCTION_RETURN(dw_entryfield_password_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3603 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3604 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3605 GtkEntryBuffer *buffer = gtk_entry_buffer_new(text, -1);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3606 GtkWidget *tmp = gtk_entry_new_with_buffer(buffer);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3607
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3608 gtk_entry_set_visibility(GTK_ENTRY(tmp), FALSE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3609
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3610 gtk_widget_show(tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3611 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3612
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3613 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3614 dw_window_set_font(tmp, _DWDefaultFont);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3615 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3616 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3617
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3618 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3619 * Create a new Combobox window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3620 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3621 * text: The default text to be in the combpbox widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3622 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3623 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3624 DW_FUNCTION_DEFINITION(dw_combobox_new, HWND, const char *text, ULONG cid)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3625 DW_FUNCTION_ADD_PARAM2(text, cid)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3626 DW_FUNCTION_RETURN(dw_combobox_new, HWND)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3627 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3628 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3629 GtkWidget *tmp;
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3630 GtkEntryBuffer *buffer;
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3631 GtkListStore *store = gtk_list_store_new(1, G_TYPE_STRING);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3632 tmp = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(store));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3633 gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(tmp), 0);
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3634 buffer = gtk_entry_get_buffer(GTK_ENTRY(gtk_combo_box_get_child(GTK_COMBO_BOX(tmp))));
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3635 gtk_entry_buffer_set_max_length(buffer, 0);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3636 gtk_entry_buffer_set_text(buffer, text, -1);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3637 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3638 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_COMBOBOX));
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3639 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3640 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3641 dw_window_set_font(tmp, _DWDefaultFont);
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3642 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3643 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3644
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3645 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3646 * Create a new button window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3647 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3648 * text: The text to be display by the static text widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3649 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3650 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3651 DW_FUNCTION_DEFINITION(dw_button_new, HWND, const char *text, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3652 DW_FUNCTION_ADD_PARAM2(text, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3653 DW_FUNCTION_RETURN(dw_button_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3654 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3655 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3656 GtkWidget *tmp = gtk_button_new_with_label(text);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3657 gtk_widget_show(tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3658 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3659 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3660 dw_window_set_font(tmp, _DWDefaultFont);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3661 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3662 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3663
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3664 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3665 * Create a new bitmap button window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3666 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3667 * text: Bubble help text to be displayed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3668 * id: An ID of a bitmap in the resource file.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3669 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3670 DW_FUNCTION_DEFINITION(dw_bitmapbutton_new, HWND, const char *text, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3671 DW_FUNCTION_ADD_PARAM2(text, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3672 DW_FUNCTION_RETURN(dw_bitmapbutton_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3673 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3674 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3675 GtkWidget *tmp = gtk_button_new();
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3676 GtkWidget *bitmap = dw_bitmap_new(cid);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3677
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3678 if(bitmap)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3679 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3680 dw_window_set_bitmap(bitmap, cid, NULL);
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3681 gtk_button_set_child(GTK_BUTTON(tmp), bitmap);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3682 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3683 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3684 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3685 if(text)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3686 gtk_widget_set_tooltip_text(tmp, text);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3687 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3688 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3689 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3690
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3691 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3692 * Create a new bitmap button window (widget) to be packed from a file.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3693 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3694 * label_text: Text to display on button. TBD when Windows works
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3695 * text: Bubble help text to be displayed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3696 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3697 * filename: Name of the file, omit extention to have
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3698 * DW pick the appropriate file extension.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3699 * (BMP on OS/2 or Windows, XPM on Unix)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3700 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3701 DW_FUNCTION_DEFINITION(dw_bitmapbutton_new_from_file, HWND, const char text, ULONG cid, const char filename)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3702 DW_FUNCTION_ADD_PARAM3(text, cid, filename)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3703 DW_FUNCTION_RETURN(dw_bitmapbutton_new_from_file, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3704 DW_FUNCTION_RESTORE_PARAM3(text, const char , cid, ULONG, filename, const char )
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3705 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3706 GtkWidget *tmp = gtk_button_new();
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3707 GtkWidget *bitmap = dw_bitmap_new(cid);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3708
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3709 if(bitmap)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3710 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3711 dw_window_set_bitmap(bitmap, 0, filename);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3712 gtk_button_set_child(GTK_BUTTON(tmp), bitmap);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3713 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3714 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3715 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3716 if(text)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3717 gtk_widget_set_tooltip_text(tmp, text);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3718 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3719 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3720 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3721
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3722 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3723 * Create a new bitmap button window (widget) to be packed from data.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3724 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3725 * text: Bubble help text to be displayed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3726 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3727 * data: Raw data of image.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3728 * (BMP on OS/2 or Windows, XPM on Unix)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3729 * len: Length of raw data
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3730 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3731 DW_FUNCTION_DEFINITION(dw_bitmapbutton_new_from_data, HWND, const char text, ULONG cid, const char data, int len)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3732 DW_FUNCTION_ADD_PARAM4(text, cid, data, len)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3733 DW_FUNCTION_RETURN(dw_bitmapbutton_new_from_data, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3734 DW_FUNCTION_RESTORE_PARAM4(text, const char , cid, ULONG, data, const char , len, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3735 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3736 GtkWidget *tmp = gtk_button_new();
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3737 GtkWidget *bitmap = dw_bitmap_new(cid);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3738
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3739 if(bitmap)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3740 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3741 dw_window_set_bitmap_from_data(bitmap, 0, data, len);
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3742 gtk_button_set_child(GTK_BUTTON(tmp), bitmap);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3743 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3744 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3745 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3746 if(text)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3747 gtk_widget_set_tooltip_text(tmp, text);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3748 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3749 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3750 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3751
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3752 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3753 * Create a new spinbutton window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3754 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3755 * text: The text to be display by the static text widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3756 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3757 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3758 DW_FUNCTION_DEFINITION(dw_spinbutton_new, HWND, const char *text, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3759 DW_FUNCTION_ADD_PARAM2(text, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3760 DW_FUNCTION_RETURN(dw_spinbutton_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3761 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3762 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3763 GtkAdjustment adj = (GtkAdjustment )gtk_adjustment_new((float)atoi(text), -65536.0, 65536.0, 1.0, 5.0, 0.0);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3764 GtkWidget *tmp = gtk_spin_button_new(adj, 0, 0);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3765
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3766 gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(tmp), TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3767 gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(tmp), TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3768 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3769 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adj);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3770 g_object_set_data(G_OBJECT(adj), "_dw_spinbutton", (gpointer)tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3771 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3772 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3773 dw_window_set_font(tmp, _DWDefaultFont);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3774 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3775 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3776
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3777 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3778 * Create a new radiobutton window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3779 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3780 * text: The text to be display by the static text widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3781 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3782 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3783 DW_FUNCTION_DEFINITION(dw_radiobutton_new, HWND, const char *text, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3784 DW_FUNCTION_ADD_PARAM2(text, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3785 DW_FUNCTION_RETURN(dw_radiobutton_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3786 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3787 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3788 GtkWidget *tmp = gtk_toggle_button_new_with_label(text);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3789 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3790 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3791
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3792 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3793 dw_window_set_font(tmp, _DWDefaultFont);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3794 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3795 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3796
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3797 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3798 * Create a new slider window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3799 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3800 * vertical: TRUE or FALSE if slider is vertical.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3801 * increments: Number of increments available.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3802 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3803 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3804 DW_FUNCTION_DEFINITION(dw_slider_new, HWND, int vertical, int increments, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3805 DW_FUNCTION_ADD_PARAM3(vertical, increments, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3806 DW_FUNCTION_RETURN(dw_slider_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3807 DW_FUNCTION_RESTORE_PARAM3(vertical, int, increments, int, cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3808
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3809 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3810 GtkAdjustment adjustment = (GtkAdjustment )gtk_adjustment_new(0, 0, (gfloat)increments, 1, 1, 1);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3811 GtkWidget *tmp = gtk_scale_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3812
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3813 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3814 gtk_scale_set_draw_value(GTK_SCALE(tmp), 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3815 gtk_scale_set_digits(GTK_SCALE(tmp), 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3816 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3817 g_object_set_data(G_OBJECT(adjustment), "_dw_slider", (gpointer)tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3818 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3819 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3820 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3821
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3822 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3823 * Create a new scrollbar window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3824 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3825 * vertical: TRUE or FALSE if scrollbar is vertical.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3826 * increments: Number of increments available.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3827 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3828 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3829 DW_FUNCTION_DEFINITION(dw_scrollbar_new, HWND, int vertical, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3830 DW_FUNCTION_ADD_PARAM2(vertical, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3831 DW_FUNCTION_RETURN(dw_scrollbar_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3832 DW_FUNCTION_RESTORE_PARAM2(vertical, int, cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3833 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3834 GtkAdjustment adjustment = (GtkAdjustment )gtk_adjustment_new(0, 0, 0, 1, 1, 1);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3835 GtkWidget *tmp = gtk_scrollbar_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3836
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3837 gtk_widget_set_can_focus(tmp, FALSE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3838 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3839 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3840 g_object_set_data(G_OBJECT(adjustment), "_dw_scrollbar", (gpointer)tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3841 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3842 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3843 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3844
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3845 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3846 * Create a new percent bar window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3847 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3848 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3849 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3850 DW_FUNCTION_DEFINITION(dw_percent_new, HWND, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3851 DW_FUNCTION_ADD_PARAM1(cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3852 DW_FUNCTION_RETURN(dw_percent_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3853 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3854
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3855 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3856 GtkWidget *tmp = gtk_progress_bar_new();
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3857 gtk_widget_show(tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3858 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3859 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3860 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3861
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3862 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3863 * Create a new checkbox window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3864 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3865 * text: The text to be display by the static text widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3866 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3867 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3868 DW_FUNCTION_DEFINITION(dw_checkbox_new, HWND, const char *text, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3869 DW_FUNCTION_ADD_PARAM2(text, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3870 DW_FUNCTION_RETURN(dw_checkbox_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3871 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3872 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3873 GtkWidget *tmp = gtk_check_button_new_with_label(text);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3874 gtk_widget_show(tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3875 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3876 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3877 dw_window_set_font(tmp, _DWDefaultFont);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3878 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3879 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3880
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3881 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3882 * Create a new listbox window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3883 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3884 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3885 * multi: Multiple select TRUE or FALSE.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3886 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3887 DW_FUNCTION_DEFINITION(dw_listbox_new, HWND, ULONG cid, int multi)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3888 DW_FUNCTION_ADD_PARAM2(cid, multi)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3889 DW_FUNCTION_RETURN(dw_listbox_new, HWND)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3890 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, multi, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3891 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3892 GtkWidget tmp, tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3893 GtkListStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3894 GtkTreeViewColumn *col;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3895 GtkCellRenderer *rend;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3896 GtkTreeSelection *sel;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3897
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3898 if((tmp = _dw_tree_create(cid)))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3899 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3900 store = gtk_list_store_new(1, G_TYPE_STRING);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3901 tree = _dw_tree_view_setup(tmp, GTK_TREE_MODEL(store));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3902 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3903 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3904
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3905 col = gtk_tree_view_column_new();
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3906 rend = gtk_cell_renderer_text_new();
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3907 gtk_tree_view_column_pack_start(col, rend, TRUE);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3908 gtk_tree_view_column_add_attribute(col, rend, "text", 0);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3909
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3910 gtk_tree_view_append_column(GTK_TREE_VIEW (tree), col);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3911 gtk_tree_view_set_expander_column(GTK_TREE_VIEW(tree), col);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3912 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3913
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3914 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3915 if(multi)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3916 gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3917 else
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3918 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3919 gtk_widget_show(tree);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3920 if(_DWDefaultFont)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3921 dw_window_set_font(tmp, _DWDefaultFont);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3922 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3923 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3924 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3925
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3926 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3927 * Sets the icon used for a given window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3928 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3929 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3930 * id: An ID to be used to specify the icon.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3931 */
2319 36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3932 DW_FUNCTION_DEFINITION(dw_window_set_icon, void, HWND handle, HICN icon)
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3933 DW_FUNCTION_ADD_PARAM2(handle, icon)
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3934 DW_FUNCTION_NO_RETURN(dw_window_set_icon)
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3935 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, icon, HICN)
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3936 {
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3937 if(handle && GTK_IS_WINDOW(handle))
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3938 {
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3939 int rid = GPOINTER_TO_INT(icon);
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3940
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3941 if(rid < 65536)
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3942 {
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3943 GdkDisplay *display = gdk_display_get_default();
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3944 GtkIconTheme *theme = gtk_icon_theme_get_for_display(display);
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3945
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3946 if(theme)
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3947 {
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3948 char resource_path[201] = {0};
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3949 char window_icon[25] = {0};
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3950
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3951 snprintf(resource_path, 200, "%s%u.png", _DW_RESOURCE_PATH, rid);
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3952 gtk_icon_theme_add_resource_path(theme, _DW_RESOURCE_PATH);
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3953 snprintf(window_icon, 24, "%u", rid);
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3954 gtk_window_set_icon_name(GTK_WINDOW(handle), window_icon);
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3955 }
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3956 }
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3957 }
36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	3958 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3959 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3960
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3961 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3962 * Sets the bitmap used for a given static window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3963 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3964 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3965 * id: An ID to be used to specify the icon,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3966 * (pass 0 if you use the filename param)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3967 * filename: a path to a file (Bitmap on OS/2 or
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3968 * Windows and a pixmap on Unix, pass
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3969 * NULL if you use the id param)
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	3970 * Returns:
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	3971 * DW_ERROR_NONE on success.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	3972 * DW_ERROR_UNKNOWN if the parameters were invalid.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	3973 * DW_ERROR_GENERAL if the bitmap was unable to be loaded.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	3974 */
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	3975 DW_FUNCTION_DEFINITION(dw_window_set_bitmap, int, HWND handle, unsigned long id, const char *filename)
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3976 DW_FUNCTION_ADD_PARAM3(handle, id, filename)
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	3977 DW_FUNCTION_RETURN(dw_window_set_bitmap, int)
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3978 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, id, ULONG, filename, const char *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3979 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3980 GdkPixbuf *tmp = NULL;
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	3981 int retval = DW_ERROR_UNKNOWN;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3982
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3983 if(id)
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	3984 tmp = _dw_find_pixbuf((HICN)id, NULL, NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3985 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3986 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3987 char *file = alloca(strlen(filename) + 6);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3988
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3989 strcpy(file, filename);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3990
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3991 /* check if we can read from this file (it exists and read permission) */
2282 b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	3992 if(access(file, 04) != 0)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3993 {
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	3994 int i = 0;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	3995
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3996 /* Try with various extentions */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	3997 while(_dw_image_exts[i] && !tmp)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3998 {
2282 b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	3999 strcpy(file, filename);
2312 ada8f7610df0 GTK4: Fix building with -D_DW_SINGLE_THREADED and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2311 diff changeset	4000 strcat(file, _dw_image_exts[i]);
2282 b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	4001 if(access(file, 04) == 0)
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	4002 tmp = gdk_pixbuf_new_from_file(file, NULL);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	4003 i++;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4004 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4005 }
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	4006 else
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4007 tmp = gdk_pixbuf_new_from_file(file, NULL);
2282 b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	4008 }
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	4009
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	4010 if(tmp)
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	4011 {
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	4012 if(GTK_IS_BUTTON(handle))
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	4013 {
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	4014 GtkWidget pixmap = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_bitmap");
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4015 if(pixmap)
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4016 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4017 gtk_picture_set_pixbuf(GTK_PICTURE(pixmap), tmp);
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4018 retval = DW_ERROR_NONE;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4019 }
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4020 }
b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4021 else if(GTK_IS_PICTURE(handle))
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4022 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4023 gtk_picture_set_pixbuf(GTK_PICTURE(handle), tmp);
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4024 retval = DW_ERROR_NONE;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4025 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4026 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4027 else
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4028 retval = DW_ERROR_GENERAL;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4029 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4030 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4031
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4032 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4033 * Sets the bitmap used for a given static window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4034 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4035 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4036 * id: An ID to be used to specify the icon,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4037 * (pass 0 if you use the filename param)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4038 * data: the image data
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4039 * Bitmap on Windows and a pixmap on Unix, pass
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4040 * NULL if you use the id param)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4041 * len: length of data
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4042 * Returns:
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4043 * DW_ERROR_NONE on success.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4044 * DW_ERROR_UNKNOWN if the parameters were invalid.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4045 * DW_ERROR_GENERAL if the bitmap was unable to be loaded.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4046 */
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4047 DW_FUNCTION_DEFINITION(dw_window_set_bitmap_from_data, int, HWND handle, unsigned long id, const char *data, int len)
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4048 DW_FUNCTION_ADD_PARAM4(handle, id, data, len)
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4049 DW_FUNCTION_RETURN(dw_window_set_bitmap_from_data, int)
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4050 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, id, ULONG, data, const char *, len, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4051 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4052 GdkPixbuf *tmp = NULL;
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4053 int retval = DW_ERROR_UNKNOWN;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4054
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4055 if(data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4056 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4057 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4058 * A real hack; create a temporary file and write the contents
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4059 * of the data to the file
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4060 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4061 char template[] = "/tmp/dwpixmapXXXXXX";
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4062 int written = -1, fd = mkstemp(template);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4063
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4064 if(fd != -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4065 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4066 written = write(fd, data, len);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4067 close(fd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4068 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4069 /* Bail if we couldn't write full file */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4070 if(fd != -1 && written == len)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4071 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4072 tmp = gdk_pixbuf_new_from_file(template, NULL);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4073 /* remove our temporary file */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4074 unlink(template);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4075 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4076 }
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4077 else if(id)
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	4078 tmp = _dw_find_pixbuf((HICN)id, NULL, NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4079
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4080 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4081 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4082 if(GTK_IS_BUTTON(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4083 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4084 GtkWidget pixmap = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_bitmap");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4085
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4086 if(pixmap)
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4087 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4088 gtk_picture_set_pixbuf(GTK_PICTURE(pixmap), tmp);
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4089 retval = DW_ERROR_NONE;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4090 }
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4091 }
b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4092 else if(GTK_IS_PICTURE(handle))
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4093 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4094 gtk_picture_set_pixbuf(GTK_PICTURE(handle), tmp);
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4095 retval = DW_ERROR_NONE;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4096 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4097 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4098 else
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4099 retval = DW_ERROR_GENERAL;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4100 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4101 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4102
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4103 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4104 * Sets the text used for a given window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4105 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4106 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4107 * text: The text associated with a given window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4108 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4109 DW_FUNCTION_DEFINITION(dw_window_set_text, void, HWND handle, const char *text)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4110 DW_FUNCTION_ADD_PARAM2(handle, text)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4111 DW_FUNCTION_NO_RETURN(dw_window_set_text)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4112 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4113 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4114 if(GTK_IS_ENTRY(handle))
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4115 {
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4116 GtkEntryBuffer *buffer = gtk_entry_get_buffer(GTK_ENTRY(handle));
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4117 if(buffer)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4118 gtk_entry_buffer_set_text(buffer, text, -1);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4119 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4120 else if(GTK_IS_COMBO_BOX(handle))
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4121 {
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4122 GtkWidget *entry = gtk_combo_box_get_child(GTK_COMBO_BOX(handle));
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4123 GtkEntryBuffer *buffer = gtk_entry_get_buffer(GTK_ENTRY(entry));
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4124 if(buffer)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4125 gtk_entry_buffer_set_text(buffer, text, -1);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4126 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4127 else if(GTK_IS_LABEL(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4128 gtk_label_set_text(GTK_LABEL(handle), text);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4129 else if(GTK_IS_BUTTON(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4130 gtk_button_set_label(GTK_BUTTON(handle), text);
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4131 else if(GTK_IS_WINDOW(handle))
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4132 gtk_window_set_title(GTK_WINDOW(handle), text);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4133 else if (GTK_IS_FRAME(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4134 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4135 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4136 * This is a groupbox or status_text
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4137 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4138 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_label");
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4139 if (tmp && GTK_IS_LABEL(tmp))
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4140 gtk_label_set_text(GTK_LABEL(tmp), text);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4141 else /* assume groupbox */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4142 gtk_frame_set_label(GTK_FRAME(handle), text && *text ? text : NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4143 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4144 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4145 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4146
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4147 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4148 * Sets the text used for a given window's floating bubble help.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4149 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4150 * handle: Handle to the window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4151 * bubbletext: The text in the floating bubble tooltip.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4152 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4153 DW_FUNCTION_DEFINITION(dw_window_set_tooltip, void, HWND handle, const char *bubbletext)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4154 DW_FUNCTION_ADD_PARAM2(handle, bubbletext)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4155 DW_FUNCTION_NO_RETURN(dw_window_set_tooltip)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4156 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, bubbletext, char *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4157 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4158 if(bubbletext && *bubbletext)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4159 gtk_widget_set_tooltip_text(handle, bubbletext);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4160 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4161 gtk_widget_set_has_tooltip(handle, FALSE);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4162 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4163 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4164
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4165 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4166 * Gets the text used for a given window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4167 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4168 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4169 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4170 * text: The text associsated with a given window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4171 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4172 DW_FUNCTION_DEFINITION(dw_window_get_text, char *, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4173 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4174 DW_FUNCTION_RETURN(dw_window_get_text, char *)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4175 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4176 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4177 const char *possible = NULL;
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4178 char *retval = NULL;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4179
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4180 if(GTK_IS_ENTRY(handle))
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4181 {
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4182 GtkEntryBuffer *buffer = gtk_entry_get_buffer(GTK_ENTRY(handle));
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4183 possible = gtk_entry_buffer_get_text(buffer);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4184 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4185 else if(GTK_IS_COMBO_BOX(handle))
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4186 {
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4187 GtkWidget *entry = gtk_combo_box_get_child(GTK_COMBO_BOX(handle));
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4188 GtkEntryBuffer *buffer = gtk_entry_get_buffer(GTK_ENTRY(entry));
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4189 possible = gtk_entry_buffer_get_text(buffer);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4190 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4191 else if(GTK_IS_LABEL(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4192 possible = gtk_label_get_text(GTK_LABEL(handle));
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4193 retval = strdup(possible ? possible : "");
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4194 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4195 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4196
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4197 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4198 * Disables given window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4199 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4200 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4201 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4202 DW_FUNCTION_DEFINITION(dw_window_disable, void, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4203 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4204 DW_FUNCTION_NO_RETURN(dw_window_disable)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4205 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4206 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4207 gtk_widget_set_sensitive(handle, FALSE);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4208 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4209 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4210
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4211 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4212 * Enables given window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4213 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4214 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4215 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4216 DW_FUNCTION_DEFINITION(dw_window_enable, void, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4217 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4218 DW_FUNCTION_NO_RETURN(dw_window_enable)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4219 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4220 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4221 gtk_widget_set_sensitive(handle, TRUE);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4222 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4223 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4224
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4225 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4226 * Gets the child window handle with specified ID.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4227 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4228 * handle: Handle to the parent window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4229 * id: Integer ID of the child.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4230 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4231 DW_FUNCTION_DEFINITION(dw_window_from_id, HWND, HWND handle, int id)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4232 DW_FUNCTION_ADD_PARAM2(handle, id)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4233 DW_FUNCTION_RETURN(dw_window_from_id, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4234 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, id, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4235 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4236 GtkWidget *retval = NULL;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4237
2275 51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4238 if(handle && GTK_WIDGET(handle) && id)
51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4239 {
51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4240 GtkWidget *widget = gtk_widget_get_first_child(GTK_WIDGET(handle));
51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4241
51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4242 while(widget)
51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4243 {
51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4244 if(id == GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_dw_id")))
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4245 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4246 retval = widget;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4247 widget = NULL;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4248 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4249 else
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4250 widget = gtk_widget_get_next_sibling(GTK_WIDGET(widget));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4251 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4252 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4253 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4254 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4255
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4256 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4257 * Adds text to an MLE box and returns the current point.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4258 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4259 * handle: Handle to the MLE to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4260 * buffer: Text buffer to be imported.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4261 * startpoint: Point to start entering text.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4262 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4263 DW_FUNCTION_DEFINITION(dw_mle_import, unsigned int, HWND handle, const char *buffer, int startpoint)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4264 DW_FUNCTION_ADD_PARAM3(handle, buffer, startpoint)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4265 DW_FUNCTION_RETURN(dw_mle_import, unsigned int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4266 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, buffer, const char *, startpoint, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4267 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4268 unsigned int tmppoint = startpoint;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4269
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4270 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4271 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4272 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4273
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4274 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4275 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4276 GtkTextBuffer *tbuffer;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4277 GtkTextIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4278
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4279 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4280 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, startpoint);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4281 gtk_text_buffer_place_cursor(tbuffer, &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4282 gtk_text_buffer_insert_at_cursor(tbuffer, buffer, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4283 tmppoint = (startpoint > -1 ? startpoint : 0) + strlen(buffer);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4284 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4285 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4286 DW_FUNCTION_RETURN_THIS(tmppoint);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4287 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4288
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4289 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4290 * Grabs text from an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4291 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4292 * handle: Handle to the MLE to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4293 * buffer: Text buffer to be exported. MUST allow for trailing nul character.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4294 * startpoint: Point to start grabbing text.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4295 * length: Amount of text to be grabbed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4296 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4297 DW_FUNCTION_DEFINITION(dw_mle_export, void, HWND handle, char *buffer, int startpoint, int length)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4298 DW_FUNCTION_ADD_PARAM4(handle, buffer, startpoint, length)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4299 DW_FUNCTION_NO_RETURN(dw_mle_export)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4300 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, buffer, char *, startpoint, int, length, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4301 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4302 gchar *text;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4303
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4304 /* force the return value to nul in case the following tests fail */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4305 if(buffer)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4306 buffer[0] = '\0';
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4307 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4308 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4309 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4310
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4311 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4312 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4313 GtkTextBuffer *tbuffer;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4314 GtkTextIter start, end;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4315
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4316 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4317 gtk_text_buffer_get_iter_at_offset(tbuffer, &start, startpoint);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4318 gtk_text_buffer_get_iter_at_offset(tbuffer, &end, startpoint + length);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4319 text = gtk_text_iter_get_text(&start, &end);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4320 if(text) /* Should this get freed? */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4321 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4322 if(buffer)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4323 strcpy(buffer, text);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4324 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4325 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4326 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4327 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4328 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4329
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4330 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4331 * Obtains information about an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4332 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4333 * handle: Handle to the MLE to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4334 * bytes: A pointer to a variable to return the total bytes.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4335 * lines: A pointer to a variable to return the number of lines.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4336 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4337 DW_FUNCTION_DEFINITION(dw_mle_get_size, void, HWND handle, unsigned long bytes, unsigned long lines)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4338 DW_FUNCTION_ADD_PARAM3(handle, bytes, lines)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4339 DW_FUNCTION_NO_RETURN(dw_mle_get_size)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4340 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, bytes, unsigned long , lines, unsigned long )
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4341 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4342 if(bytes)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4343 *bytes = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4344 if(lines)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4345 *lines = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4346
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4347 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4348 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4349 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4350
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4351 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4352 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4353 GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tmp));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4354
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4355 if(bytes)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4356 *bytes = gtk_text_buffer_get_char_count(buffer);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4357 if(lines)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4358 *lines = gtk_text_buffer_get_line_count(buffer);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4359 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4360 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4361 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4362 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4363
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4364 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4365 * Deletes text from an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4366 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4367 * handle: Handle to the MLE to be deleted from.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4368 * startpoint: Point to start deleting text.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4369 * length: Amount of text to be deleted.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4370 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4371 DW_FUNCTION_DEFINITION(dw_mle_delete, void, HWND handle, int startpoint, int length)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4372 DW_FUNCTION_ADD_PARAM3(handle, startpoint, length)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4373 DW_FUNCTION_NO_RETURN(dw_mle_delete)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4374 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, startpoint, int, length, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4375 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4376 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4377 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4378 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4379
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4380 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4381 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4382 GtkTextBuffer *tbuffer;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4383 GtkTextIter start, end;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4384
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4385 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4386 gtk_text_buffer_get_iter_at_offset(tbuffer, &start, startpoint);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4387 gtk_text_buffer_get_iter_at_offset(tbuffer, &end, startpoint + length);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4388 gtk_text_buffer_delete(tbuffer, &start, &end);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4389 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4390 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4391 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4392 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4393
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4394 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4395 * Clears all text from an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4396 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4397 * handle: Handle to the MLE to be cleared.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4398 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4399 DW_FUNCTION_DEFINITION(dw_mle_clear, void, HWND handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4400 DW_FUNCTION_ADD_PARAM1(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4401 DW_FUNCTION_NO_RETURN(dw_mle_clear)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4402 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4403 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4404 int length;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4405
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4406 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4407 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4408 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4409
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4410 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4411 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4412 GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tmp));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4413
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4414 length = -1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4415 gtk_text_buffer_set_text(buffer, "", length);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4416 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4417 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4418 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4419 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4420
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4421 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4422 * Sets the visible line of an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4423 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4424 * handle: Handle to the MLE.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4425 * line: Line to be visible.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4426 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4427 DW_FUNCTION_DEFINITION(dw_mle_set_visible, void, HWND handle, int line)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4428 DW_FUNCTION_ADD_PARAM2(handle, line)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4429 DW_FUNCTION_NO_RETURN(dw_mle_set_visible)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4430 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, line, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4431 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4432 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4433 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4434 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4435
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4436 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4437 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4438 GtkTextBuffer *tbuffer;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4439 GtkTextIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4440 GtkTextMark mark = (GtkTextMark )g_object_get_data(G_OBJECT(handle), "_dw_mark");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4441
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4442 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4443 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4444 gtk_text_iter_set_line(&iter, line);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4445 if(!mark)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4446 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4447 mark = gtk_text_buffer_create_mark(tbuffer, NULL, &iter, FALSE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4448 g_object_set_data(G_OBJECT(handle), "_dw_mark", (gpointer)mark);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4449 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4450 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4451 gtk_text_buffer_move_mark(tbuffer, mark, &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4452 gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(tmp), mark,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4453 0, FALSE, 0, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4454 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4455 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4456 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4457 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4458
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4459 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4460 * Sets the editablity of an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4461 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4462 * handle: Handle to the MLE.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4463 * state: TRUE if it can be edited, FALSE for readonly.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4464 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4465 DW_FUNCTION_DEFINITION(dw_mle_set_editable, void, HWND handle, int state)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4466 DW_FUNCTION_ADD_PARAM2(handle, state)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4467 DW_FUNCTION_NO_RETURN(dw_mle_set_editable)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4468 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, state, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4469 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4470 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4471 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4472 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4473
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4474 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4475 gtk_text_view_set_editable(GTK_TEXT_VIEW(tmp), state);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4476 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4477 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4478 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4479
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4480 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4481 * Sets the word wrap state of an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4482 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4483 * handle: Handle to the MLE.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4484 * state: TRUE if it wraps, FALSE if it doesn't.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4485 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4486 DW_FUNCTION_DEFINITION(dw_mle_set_word_wrap, void, HWND handle, int state)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4487 DW_FUNCTION_ADD_PARAM2(handle, state)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4488 DW_FUNCTION_NO_RETURN(dw_mle_set_word_wrap)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4489 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, state, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4490 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4491 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4492 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4493 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4494
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4495 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4496 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), state ? GTK_WRAP_WORD : GTK_WRAP_NONE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4497 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4498 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4499 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4500
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4501 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4502 * Sets the word auto complete state of an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4503 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4504 * handle: Handle to the MLE.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4505 * state: Bitwise combination of DW_MLE_COMPLETE_TEXT/DASH/QUOTE
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4506 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	4507 void API dw_mle_set_auto_complete(HWND handle, int state)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4508 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4509 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4510
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4511 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4512 * Sets the current cursor position of an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4513 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4514 * handle: Handle to the MLE to be positioned.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4515 * point: Point to position cursor.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4516 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4517 DW_FUNCTION_DEFINITION(dw_mle_set_cursor, void, HWND handle, int point)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4518 DW_FUNCTION_ADD_PARAM2(handle, point)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4519 DW_FUNCTION_NO_RETURN(dw_mle_set_cursor)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4520 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, point, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4521 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4522 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4523 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4524 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4525
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4526 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4527 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4528 GtkTextBuffer *tbuffer;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4529 GtkTextIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4530 GtkTextMark mark = (GtkTextMark )g_object_get_data(G_OBJECT(handle), "_dw_mark");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4531
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4532 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4533 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, point);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4534 if(!mark)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4535 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4536 mark = gtk_text_buffer_create_mark(tbuffer, NULL, &iter, FALSE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4537 g_object_set_data(G_OBJECT(handle), "_dw_mark", (gpointer)mark);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4538 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4539 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4540 gtk_text_buffer_move_mark(tbuffer, mark, &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4541 gtk_text_buffer_place_cursor(tbuffer, &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4542 gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(tmp), mark,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4543 0, FALSE, 0, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4544 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4545 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4546 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4547 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4548
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4549 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4550 * Finds text in an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4551 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4552 * handle: Handle to the MLE to be cleared.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4553 * text: Text to search for.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4554 * point: Start point of search.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4555 * flags: Search specific flags.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4556 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4557 DW_FUNCTION_DEFINITION(dw_mle_search, int, HWND handle, const char *text, int point, DW_UNUSED(unsigned long flags))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4558 DW_FUNCTION_ADD_PARAM4(handle, text, point, flags)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4559 DW_FUNCTION_RETURN(dw_mle_search, int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4560 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, text, const char *, point, int, DW_UNUSED(flags), unsigned long)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4561 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4562 int retval = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4563
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4564 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4565 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4566 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4567
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4568 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4569 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4570 GtkTextBuffer *tbuffer;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4571 GtkTextIter iter, found;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4572
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4573 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4574 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, point);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4575 gtk_text_iter_forward_search(&iter, text, GTK_TEXT_SEARCH_TEXT_ONLY, &found, NULL, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4576 retval = gtk_text_iter_get_offset(&found);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4577 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4578 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4579 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4580 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4581
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4582 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4583 * Stops redrawing of an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4584 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4585 * handle: Handle to the MLE to freeze.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4586 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	4587 void API dw_mle_freeze(HWND handle)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4588 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4589 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4590
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4591 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4592 * Resumes redrawing of an MLE box.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4593 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4594 * handle: Handle to the MLE to thaw.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4595 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	4596 void API dw_mle_thaw(HWND handle)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4597 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4598 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4599
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4600 /* Internal function to update the progress bar
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4601 * while in an indeterminate state.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4602 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4603 gboolean _dw_update_progress_bar(gpointer data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4604 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4605 if(g_object_get_data(G_OBJECT(data), "_dw_alive"))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4606 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4607 gtk_progress_bar_pulse(GTK_PROGRESS_BAR(data));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4608 return TRUE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4609 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4610 return FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4611 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4612
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4613 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4614 * Sets the percent bar position.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4615 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4616 * handle: Handle to the percent bar to be set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4617 * position: Position of the percent bar withing the range.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4618 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4619 DW_FUNCTION_DEFINITION(dw_percent_set_pos, void, HWND handle, unsigned int position)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4620 DW_FUNCTION_ADD_PARAM2(handle, position)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4621 DW_FUNCTION_NO_RETURN(dw_percent_set_pos)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4622 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, position, unsigned int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4623 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4624 if(position == DW_PERCENT_INDETERMINATE)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4625 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4626 /* Check if we are indeterminate already */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4627 if(!g_object_get_data(G_OBJECT(handle), "_dw_alive"))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4628 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4629 /* If not become indeterminate... and start a timer to continue */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4630 gtk_progress_bar_pulse(GTK_PROGRESS_BAR(handle));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4631 g_object_set_data(G_OBJECT(handle), "_dw_alive", GINT_TO_POINTER(1));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4632 g_timeout_add(100, (GSourceFunc)_dw_update_progress_bar, (gpointer)handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4633 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4634 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4635 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4636 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4637 /* Cancel the existing timer if one is there */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4638 g_object_set_data(G_OBJECT(handle), "_dw_alive", NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4639 /* Set the position like normal */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4640 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(handle), (gfloat)position/100);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4641 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4642 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4643 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4644
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4645 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4646 * Returns the position of the slider.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4647 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4648 * handle: Handle to the slider to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4649 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4650 DW_FUNCTION_DEFINITION(dw_slider_get_pos, unsigned int, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4651 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4652 DW_FUNCTION_RETURN(dw_slider_get_pos, unsigned int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4653 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4654 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4655 int val = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4656 GtkAdjustment *adjustment;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4657
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4658 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4659 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4660 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4661 if(adjustment)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4662 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4663 int max = _dw_round_value(gtk_adjustment_get_upper(adjustment)) - 1;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4664 int thisval = _dw_round_value(gtk_adjustment_get_value(adjustment));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4665
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4666 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(handle)) == GTK_ORIENTATION_VERTICAL)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4667 val = max - thisval;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4668 else
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4669 val = thisval;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4670 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4671 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4672 DW_FUNCTION_RETURN_THIS(val);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4673 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4674
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4675 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4676 * Sets the slider position.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4677 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4678 * handle: Handle to the slider to be set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4679 * position: Position of the slider withing the range.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4680 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4681 DW_FUNCTION_DEFINITION(dw_slider_set_pos, void, HWND handle, unsigned int position)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4682 DW_FUNCTION_ADD_PARAM2(handle, position)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4683 DW_FUNCTION_NO_RETURN(dw_slider_set_pos)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4684 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, position, unsigned int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4685 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4686 GtkAdjustment *adjustment;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4687
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4688 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4689 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4690 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4691 if(adjustment)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4692 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4693 int max = _dw_round_value(gtk_adjustment_get_upper(adjustment)) - 1;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4694
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4695 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(handle)) == GTK_ORIENTATION_VERTICAL)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4696 gtk_adjustment_set_value(adjustment, (gfloat)(max - position));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4697 else
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4698 gtk_adjustment_set_value(adjustment, (gfloat)position);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4699 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4700 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4701 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4702 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4703
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4704 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4705 * Returns the position of the scrollbar.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4706 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4707 * handle: Handle to the scrollbar to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4708 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4709 DW_FUNCTION_DEFINITION(dw_scrollbar_get_pos, unsigned int, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4710 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4711 DW_FUNCTION_RETURN(dw_scrollbar_get_pos, unsigned int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4712 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4713 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4714 int val = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4715 GtkAdjustment *adjustment;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4716
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4717 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4718 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4719 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4720 if(adjustment)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4721 val = _dw_round_value(gtk_adjustment_get_value(adjustment));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4722 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4723 DW_FUNCTION_RETURN_THIS(val);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4724 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4725
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4726 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4727 * Sets the scrollbar position.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4728 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4729 * handle: Handle to the scrollbar to be set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4730 * position: Position of the scrollbar withing the range.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4731 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4732 DW_FUNCTION_DEFINITION(dw_scrollbar_set_pos, void, HWND handle, unsigned int position)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4733 DW_FUNCTION_ADD_PARAM2(handle, position)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4734 DW_FUNCTION_NO_RETURN(dw_scrollbar_set_pos)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4735 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, position, unsigned int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4736
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4737 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4738 GtkAdjustment *adjustment;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4739
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4740 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4741 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4742 if((adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment")))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4743 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4744 g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_value_changed_event", GINT_TO_POINTER(1));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4745 gtk_adjustment_set_value(adjustment, (gfloat)position);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4746 g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_value_changed_event", GINT_TO_POINTER(0));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4747 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4748 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4749 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4750 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4751
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4752 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4753 * Sets the scrollbar range.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4754 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4755 * handle: Handle to the scrollbar to be set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4756 * range: Maximum range value.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4757 * visible: Visible area relative to the range.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4758 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4759 DW_FUNCTION_DEFINITION(dw_scrollbar_set_range, void, HWND handle, unsigned int range, unsigned int visible)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4760 DW_FUNCTION_ADD_PARAM3(handle, range, visible)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4761 DW_FUNCTION_NO_RETURN(dw_scrollbar_set_range)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4762 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, range, unsigned int, visible, unsigned int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4763 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4764 GtkAdjustment *adjustment;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4765
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4766 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4767 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4768 if((adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment")))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4769 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4770 gtk_adjustment_set_upper(adjustment, (gdouble)range);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4771 gtk_adjustment_set_page_increment(adjustment,(gdouble)visible);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4772 gtk_adjustment_set_page_size(adjustment, (gdouble)visible);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4773 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4774 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4775 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4776 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4777
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4778 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4779 * Sets the spinbutton value.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4780 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4781 * handle: Handle to the spinbutton to be set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4782 * position: Current value of the spinbutton.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4783 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4784 DW_FUNCTION_DEFINITION(dw_spinbutton_set_pos, void, HWND handle, long position)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4785 DW_FUNCTION_ADD_PARAM2(handle, position)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4786 DW_FUNCTION_NO_RETURN(dw_spinbutton_set_pos)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4787 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, position, long)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4788 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4789 gtk_spin_button_set_value(GTK_SPIN_BUTTON(handle), (gfloat)position);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4790 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4791 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4792
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4793 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4794 * Sets the spinbutton limits.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4795 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4796 * handle: Handle to the spinbutton to be set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4797 * position: Current value of the spinbutton.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4798 * position: Current value of the spinbutton.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4799 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4800 DW_FUNCTION_DEFINITION(dw_spinbutton_set_limits, void, HWND handle, long upper, long lower)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4801 DW_FUNCTION_ADD_PARAM3(handle, upper, lower)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4802 DW_FUNCTION_NO_RETURN(dw_spinbutton_set_limits)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4803 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, upper, long, lower, long)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4804 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4805 long curval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4806 GtkAdjustment *adj;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4807
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4808 curval = dw_spinbutton_get_pos(handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4809 adj = (GtkAdjustment *)gtk_adjustment_new((gfloat)curval, (gfloat)lower, (gfloat)upper, 1.0, 5.0, 0.0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4810 gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(handle), adj);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4811 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4812 * Set our internal relationships between the adjustment and the spinbutton
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4813 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4814 g_object_set_data(G_OBJECT(handle), "_dw_adjustment", (gpointer)adj);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4815 g_object_set_data(G_OBJECT(adj), "_dw_spinbutton", (gpointer)handle);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4816 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4817 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4818
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4819 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4820 * Sets the entryfield character limit.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4821 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4822 * handle: Handle to the spinbutton to be set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4823 * limit: Number of characters the entryfield will take.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4824 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4825 DW_FUNCTION_DEFINITION(dw_entryfield_set_limit, void, HWND handle, ULONG limit)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4826 DW_FUNCTION_ADD_PARAM2(handle, limit)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4827 DW_FUNCTION_NO_RETURN(dw_entryfield_set_limit)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4828 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, limit, ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4829 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4830 gtk_entry_set_max_length(GTK_ENTRY(handle), limit);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4831 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4832 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4833
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4834 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4835 * Returns the current value of the spinbutton.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4836 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4837 * handle: Handle to the spinbutton to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4838 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4839 DW_FUNCTION_DEFINITION(dw_spinbutton_get_pos, long, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4840 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4841 DW_FUNCTION_RETURN(dw_spinbutton_get_pos, long)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4842 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4843 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4844 long retval = (long)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(handle));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4845 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4846 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4847
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4848 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4849 * Returns the state of the checkbox.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4850 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4851 * handle: Handle to the checkbox to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4852 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4853 DW_FUNCTION_DEFINITION(dw_checkbox_get, int, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4854 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4855 DW_FUNCTION_RETURN(dw_checkbox_get, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4856 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4857 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4858 int retval = 0;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4859
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4860 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4861 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4862 if(GTK_IS_TOGGLE_BUTTON(handle))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4863 retval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(handle));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4864 retval = gtk_check_button_get_active(GTK_CHECK_BUTTON(handle));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4865 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4866 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4867 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4868
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4869 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4870 * Sets the state of the checkbox.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4871 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4872 * handle: Handle to the checkbox to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4873 * value: TRUE for checked, FALSE for unchecked.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4874 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4875 DW_FUNCTION_DEFINITION(dw_checkbox_set, void, HWND handle, int value)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4876 DW_FUNCTION_ADD_PARAM2(handle, value)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4877 DW_FUNCTION_NO_RETURN(dw_checkbox_set)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4878 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, value, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4879 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4880 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4881 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4882 if(GTK_IS_TOGGLE_BUTTON(handle))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4883 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(handle), value);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4884 else
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4885 gtk_check_button_set_active(GTK_CHECK_BUTTON(handle), value);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4886 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4887 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4888 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4889
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4890 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4891 * Inserts an item into a tree window (widget) after another item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4892 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4893 * handle: Handle to the tree to be inserted.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4894 * item: Handle to the item to be positioned after.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4895 * title: The text title of the entry.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4896 * icon: Handle to coresponding icon.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4897 * parent: Parent handle or 0 if root.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4898 * itemdata: Item specific data.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4899 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4900 DW_FUNCTION_DEFINITION(dw_tree_insert_after, HTREEITEM, HWND handle, HTREEITEM item, const char title, HICN icon, HTREEITEM parent, void itemdata)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4901 DW_FUNCTION_ADD_PARAM6(handle, item, title, icon, parent, itemdata)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4902 DW_FUNCTION_RETURN(dw_tree_insert_after, HTREEITEM)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4903 DW_FUNCTION_RESTORE_PARAM6(handle, HWND, item, HTREEITEM, title, char , icon, HICN, parent, HTREEITEM, itemdata, void )
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4904 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4905 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4906 GtkTreeIter *iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4907 GtkTreeStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4908 GdkPixbuf *pixbuf;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4909 HTREEITEM retval = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4910
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4911 if(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4912 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4913 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4914 && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4915 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4916 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4917 iter = (GtkTreeIter *)malloc(sizeof(GtkTreeIter));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4918
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4919 pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4920
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4921 gtk_tree_store_insert_after(store, iter, (GtkTreeIter )parent, (GtkTreeIter )item);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4922 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4923 retval = (HTREEITEM)iter;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4924 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4925 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4926 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4927 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4928
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4929 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4930 * Inserts an item into a tree window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4931 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4932 * handle: Handle to the tree to be inserted.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4933 * title: The text title of the entry.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4934 * icon: Handle to coresponding icon.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4935 * parent: Parent handle or 0 if root.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4936 * itemdata: Item specific data.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4937 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4938 DW_FUNCTION_DEFINITION(dw_tree_insert, HTREEITEM, HWND handle, const char title, HICN icon, HTREEITEM parent, void itemdata)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4939 DW_FUNCTION_ADD_PARAM5(handle, title, icon, parent, itemdata)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4940 DW_FUNCTION_RETURN(dw_tree_insert, HTREEITEM)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4941 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, title, char , icon, HICN, parent, HTREEITEM, itemdata, void )
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4942 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4943 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4944 GtkTreeIter *iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4945 GtkTreeStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4946 GdkPixbuf *pixbuf;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4947 HTREEITEM retval = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4948
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4949 if(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4950 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4951 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4952 && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4953 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4954 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4955 iter = (GtkTreeIter *)malloc(sizeof(GtkTreeIter));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4956
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4957 pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4958
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4959 gtk_tree_store_append (store, iter, (GtkTreeIter *)parent);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4960 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4961 retval = (HTREEITEM)iter;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4962 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4963 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4964 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4965 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4966
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4967 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4968 * Sets the text and icon of an item in a tree window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4969 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4970 * handle: Handle to the tree containing the item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4971 * item: Handle of the item to be modified.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4972 * title: The text title of the entry.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4973 * icon: Handle to coresponding icon.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4974 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4975 DW_FUNCTION_DEFINITION(dw_tree_item_change, void, HWND handle, HTREEITEM item, const char *title, HICN icon)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4976 DW_FUNCTION_ADD_PARAM4(handle, item, title, icon)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4977 DW_FUNCTION_NO_RETURN(dw_tree_item_change)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4978 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, item, HTREEITEM, title, char *, icon, HICN)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4979 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4980 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4981 GtkTreeStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4982 GdkPixbuf *pixbuf;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4983
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4984 if(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4985 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4986 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4987 && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4988 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4989 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4990 pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4991
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4992 gtk_tree_store_set(store, (GtkTreeIter *)item, 0, title, 1, pixbuf, -1);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4993 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4994 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4995 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4996 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4997
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4998 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4999 * Sets the item data of a tree item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5000 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5001 * handle: Handle to the tree containing the item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5002 * item: Handle of the item to be modified.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5003 * itemdata: User defined data to be associated with item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5004 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5005 DW_FUNCTION_DEFINITION(dw_tree_item_set_data, void, HWND handle, HTREEITEM item, void *itemdata)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5006 DW_FUNCTION_ADD_PARAM3(handle, item, itemdata)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5007 DW_FUNCTION_NO_RETURN(dw_tree_item_set_data)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5008 DW_FUNCTION_RESTORE_PARAM3(DW_UNUSED(handle), HWND, item, HTREEITEM, itemdata, void *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5009 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5010 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5011 GtkTreeStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5012
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5013 if(handle && item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5014 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5015 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5016 && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5017 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5018 gtk_tree_store_set(store, (GtkTreeIter *)item, 2, itemdata, -1);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5019 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5020 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5021 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5022
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5023 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5024 * Gets the text an item in a tree window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5025 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5026 * handle: Handle to the tree containing the item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5027 * item: Handle of the item to be modified.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5028 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5029 DW_FUNCTION_DEFINITION(dw_tree_get_title, char *, HWND handle, HTREEITEM item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5030 DW_FUNCTION_ADD_PARAM2(handle, item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5031 DW_FUNCTION_RETURN(dw_tree_get_title, char *)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5032 DW_FUNCTION_RESTORE_PARAM2(DW_UNUSED(handle), HWND, item, HTREEITEM)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5033 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5034 char *text = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5035 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5036 GtkTreeModel *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5037
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5038 if(handle && item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5039 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5040 tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5041
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5042 if(tree && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5043 (store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5044 gtk_tree_model_get(store, (GtkTreeIter *)item, _DW_DATA_TYPE_STRING, &text, -1);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5045 if(text)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5046 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5047 char *temp = text;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5048 text = strdup(temp);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5049 g_free(temp);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5050 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5051 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5052 DW_FUNCTION_RETURN_THIS(text);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5053 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5054
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5055 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5056 * Gets the text an item in a tree window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5057 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5058 * handle: Handle to the tree containing the item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5059 * item: Handle of the item to be modified.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5060 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5061 DW_FUNCTION_DEFINITION(dw_tree_get_parent, HTREEITEM, HWND handle, HTREEITEM item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5062 DW_FUNCTION_ADD_PARAM2(handle, item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5063 DW_FUNCTION_RETURN(dw_tree_get_parent, HTREEITEM)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5064 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5065 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5066 HTREEITEM parent = (HTREEITEM)0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5067 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5068 GtkTreeModel *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5069
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5070 if(handle && item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5071 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5072 tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5073
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5074 if(tree && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5075 (store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5076 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5077 GtkTreeIter iter;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5078
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5079 if(gtk_tree_model_iter_parent(store, &iter, (GtkTreeIter *)item))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5080 gtk_tree_model_get(store, &iter, 3, &parent, -1);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5081 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5082 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5083 DW_FUNCTION_RETURN_THIS(parent);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5084 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5085
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5086 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5087 * Gets the item data of a tree item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5088 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5089 * handle: Handle to the tree containing the item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5090 * item: Handle of the item to be modified.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5091 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5092 DW_FUNCTION_DEFINITION(dw_tree_item_get_data, void *, HWND handle, HTREEITEM item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5093 DW_FUNCTION_ADD_PARAM2(handle, item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5094 DW_FUNCTION_RETURN(dw_tree_item_get_data, void *)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5095 DW_FUNCTION_RESTORE_PARAM2(DW_UNUSED(handle), HWND, item, HTREEITEM)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5096 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5097 void *ret = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5098 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5099 GtkTreeModel *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5100
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5101 if(handle && item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5102 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5103 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5104 && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5105 (store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5106 gtk_tree_model_get(store, (GtkTreeIter *)item, 2, &ret, -1);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5107 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5108 DW_FUNCTION_RETURN_THIS(ret);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5109 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5110
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5111 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5112 * Sets this item as the active selection.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5113 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5114 * handle: Handle to the tree window (widget) to be selected.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5115 * item: Handle to the item to be selected.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5116 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5117 DW_FUNCTION_DEFINITION(dw_tree_item_select, void, HWND handle, HTREEITEM item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5118 DW_FUNCTION_ADD_PARAM2(handle, item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5119 DW_FUNCTION_NO_RETURN(dw_tree_item_select)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5120 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5121 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5122 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5123 GtkTreeStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5124
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5125 if(handle && item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5126 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5127 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5128 && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5129 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5130 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5131 GtkTreePath path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), (GtkTreeIter )item);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5132 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5133
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5134 gtk_tree_view_set_cursor(GTK_TREE_VIEW(tree), path, NULL, FALSE);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5135 gtk_tree_selection_select_iter(sel, (GtkTreeIter *)item);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5136 gtk_tree_path_free(path);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5137 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5138 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5139 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5140 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5141
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5142 static void _dw_recursive_free(GtkTreeModel *store, GtkTreeIter parent)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5143 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5144 void *data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5145 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5146
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5147 gtk_tree_model_get(store, &parent, 3, &data, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5148 if(data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5149 free(data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5150 gtk_tree_store_set(GTK_TREE_STORE(store), &parent, 3, NULL, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5151
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5152 if(gtk_tree_model_iter_children(store, &iter, &parent))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5153 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5154 do {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5155 _dw_recursive_free(GTK_TREE_MODEL(store), iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5156 } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5157 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5158 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5159
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5160 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5161 * Removes all nodes from a tree.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5162 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5163 * handle: Handle to the window (widget) to be cleared.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5164 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5165 DW_FUNCTION_DEFINITION(dw_tree_clear, void, HWND handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5166 DW_FUNCTION_ADD_PARAM1(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5167 DW_FUNCTION_NO_RETURN(dw_tree_clear)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5168 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5169 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5170 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5171 GtkTreeStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5172
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5173 if(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5174 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5175 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5176 && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5177 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5178 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5179 GtkTreeIter iter;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5180
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5181 if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5182 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5183 do {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5184 _dw_recursive_free(GTK_TREE_MODEL(store), iter);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5185 } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5186 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5187 gtk_tree_store_clear(store);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5188 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5189 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5190 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5191 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5192
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5193 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5194 * Expands a node on a tree.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5195 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5196 * handle: Handle to the tree window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5197 * item: Handle to node to be expanded.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5198 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5199 DW_FUNCTION_DEFINITION(dw_tree_item_expand, void, HWND handle, HTREEITEM item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5200 DW_FUNCTION_ADD_PARAM2(handle, item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5201 DW_FUNCTION_NO_RETURN(dw_tree_item_expand)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5202 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5203 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5204 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5205 GtkTreeStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5206
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5207 if(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5208 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5209 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5210 && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5211 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5212 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5213 GtkTreePath path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), (GtkTreeIter )item);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5214 gtk_tree_view_expand_row(GTK_TREE_VIEW(tree), path, FALSE);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5215 gtk_tree_path_free(path);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5216 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5217 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5218 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5219 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5220
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5221 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5222 * Collapses a node on a tree.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5223 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5224 * handle: Handle to the tree window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5225 * item: Handle to node to be collapsed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5226 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5227 DW_FUNCTION_DEFINITION(dw_tree_item_collapse, void, HWND handle, HTREEITEM item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5228 DW_FUNCTION_ADD_PARAM2(handle, item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5229 DW_FUNCTION_NO_RETURN(dw_tree_item_collapse)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5230 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5231 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5232 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5233 GtkTreeStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5234
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5235 if(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5236 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5237 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5238 && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5239 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5240 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5241 GtkTreePath path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), (GtkTreeIter )item);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5242 gtk_tree_view_collapse_row(GTK_TREE_VIEW(tree), path);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5243 gtk_tree_path_free(path);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5244 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5245 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5246 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5247 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5248
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5249 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5250 * Removes a node from a tree.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5251 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5252 * handle: Handle to the window (widget) to be cleared.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5253 * item: Handle to node to be deleted.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5254 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5255 DW_FUNCTION_DEFINITION(dw_tree_item_delete, void, HWND handle, HTREEITEM item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5256 DW_FUNCTION_ADD_PARAM2(handle, item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5257 DW_FUNCTION_NO_RETURN(dw_tree_item_delete)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5258 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5259 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5260 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5261 GtkTreeStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5262
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5263 if(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5264 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5265 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5266 && GTK_IS_TREE_VIEW(tree) &&
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5267 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5268 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5269 gtk_tree_store_remove(store, (GtkTreeIter *)item);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5270 free(item);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5271 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5272 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5273 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5274 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5275
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5276 #define _DW_CONTAINER_STORE_EXTRA 2
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5277
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5278 static int _dw_container_setup_int(HWND handle, unsigned long flags, char *titles, int count, int separator, int extra)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5279 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5280 int z;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5281 char numbuf[25] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5282 GtkWidget *tree;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5283 GtkListStore *store;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5284 GtkTreeViewColumn *col;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5285 GtkCellRenderer *rend;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5286 GtkTreeSelection *sel;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5287 GType *array = calloc(count + _DW_CONTAINER_STORE_EXTRA + 1, sizeof(GType));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5288
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5289 /* Save some of the info so it is easily accessible */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5290 g_object_set_data(G_OBJECT(handle), "_dw_cont_columns", GINT_TO_POINTER(count));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5291 g_object_set_data(G_OBJECT(handle), "_dw_cont_extra", GINT_TO_POINTER(extra));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5292
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5293 /* First param is row title */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5294 array[0] = G_TYPE_STRING;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5295 /* Second param is row data */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5296 array[1] = G_TYPE_POINTER;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5297 array[2] = G_TYPE_POINTER;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5298 /* First loop... create array to create the store */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5299 for(z=0;z<count;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5300 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5301 if(z == 0 && flags[z] & DW_CFA_STRINGANDICON)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5302 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5303 array[_DW_CONTAINER_STORE_EXTRA] = GDK_TYPE_PIXBUF;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5304 array[_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5305 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5306 else if(flags[z] & DW_CFA_BITMAPORICON)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5307 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5308 array[z+_DW_CONTAINER_STORE_EXTRA+1] = GDK_TYPE_PIXBUF;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5309 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5310 else if(flags[z] & DW_CFA_STRING)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5311 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5312 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5313 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5314 else if(flags[z] & DW_CFA_ULONG)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5315 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5316 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_ULONG;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5317 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5318 else if(flags[z] & DW_CFA_TIME)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5319 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5320 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5321 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5322 else if(flags[z] & DW_CFA_DATE)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5323 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5324 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5325 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5326 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5327 /* Create the store and then the tree */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5328 store = gtk_list_store_newv(count + _DW_CONTAINER_STORE_EXTRA + 1, array);
2287 680212c356e3 GTK4: Refactor tree and fix DW_SIGNAL_ITEM_CONTEXT signals on tree view bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2286 diff changeset	5329 tree = _dw_tree_view_setup(handle, GTK_TREE_MODEL(store));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5330 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5331 /* Second loop... create the columns */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5332 for(z=0;z<count;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5333 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5334 snprintf(numbuf, 24, "_dw_cont_col%d", z);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5335 g_object_set_data(G_OBJECT(tree), numbuf, GINT_TO_POINTER(flags[z]));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5336 col = gtk_tree_view_column_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5337 rend = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5338 void *params = calloc(sizeof(void ), 3);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5339
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5340 if(z == 0 && flags[z] & DW_CFA_STRINGANDICON)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5341 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5342 rend = gtk_cell_renderer_pixbuf_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5343 gtk_tree_view_column_pack_start(col, rend, FALSE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5344 gtk_tree_view_column_add_attribute(col, rend, "pixbuf", _DW_CONTAINER_STORE_EXTRA);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5345 rend = gtk_cell_renderer_text_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5346 gtk_tree_view_column_pack_start(col, rend, TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5347 gtk_tree_view_column_add_attribute(col, rend, "text", _DW_CONTAINER_STORE_EXTRA+1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5348 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5349 else if(flags[z] & DW_CFA_BITMAPORICON)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5350 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5351 rend = gtk_cell_renderer_pixbuf_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5352 gtk_tree_view_column_pack_start(col, rend, FALSE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5353 gtk_tree_view_column_add_attribute(col, rend, "pixbuf", z+_DW_CONTAINER_STORE_EXTRA+1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5354 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5355 else if(flags[z] & DW_CFA_STRING)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5356 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5357 rend = gtk_cell_renderer_text_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5358 gtk_tree_view_column_pack_start(col, rend, TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5359 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5360 gtk_tree_view_column_set_resizable(col, TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5361 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5362 else if(flags[z] & DW_CFA_ULONG)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5363 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5364 rend = gtk_cell_renderer_text_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5365 gtk_tree_view_column_pack_start(col, rend, TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5366 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5367 gtk_tree_view_column_set_resizable(col, TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5368 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5369 else if(flags[z] & DW_CFA_TIME)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5370 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5371 rend = gtk_cell_renderer_text_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5372 gtk_tree_view_column_pack_start(col, rend, TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5373 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5374 gtk_tree_view_column_set_resizable(col, TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5375 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5376 else if(flags[z] & DW_CFA_DATE)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5377 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5378 rend = gtk_cell_renderer_text_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5379 gtk_tree_view_column_pack_start(col, rend, TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5380 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5381 gtk_tree_view_column_set_resizable(col, TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5382 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5383 g_object_set_data(G_OBJECT(col), "_dw_column", GINT_TO_POINTER(z));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5384 params[2] = tree;
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	5385 g_signal_connect_data(G_OBJECT(col), "clicked", G_CALLBACK(_dw_column_click_event), (gpointer)params, _dw_signal_disconnect, 0);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5386 gtk_tree_view_column_set_title(col, titles[z]);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5387 if(flags[z] & DW_CFA_RIGHT)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5388 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5389 gtk_tree_view_column_set_alignment(col, 1.0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5390 if(rend)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5391 gtk_cell_renderer_set_alignment(rend, 1.0, 0.5);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5392 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5393 else if(flags[z] & DW_CFA_CENTER)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5394 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5395 gtk_tree_view_column_set_alignment(col, 0.5);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5396 if(rend)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5397 gtk_cell_renderer_set_alignment(rend, 0.5, 0.5);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5398 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5399 gtk_tree_view_append_column(GTK_TREE_VIEW (tree), col);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5400 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5401 /* Finish up */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5402 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5403 gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(tree), TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5404 gtk_tree_view_set_rubber_banding(GTK_TREE_VIEW(tree), TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5405 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5406 if(g_object_get_data(G_OBJECT(handle), "_dw_multi_sel"))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5407 gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5408 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5409 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5410 gtk_widget_show(tree);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5411 free(array);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5412 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5413 dw_window_set_font(handle, _DWDefaultFont);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5414 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5415 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5416
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5417 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5418 * Sets up the container columns.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5419 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5420 * handle: Handle to the container to be configured.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5421 * flags: An array of unsigned longs with column flags.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5422 * titles: An array of strings with column text titles.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5423 * count: The number of columns (this should match the arrays).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5424 * separator: The column number that contains the main separator.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5425 * (this item may only be used in OS/2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5426 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5427 DW_FUNCTION_DEFINITION(dw_container_setup, int, HWND handle, unsigned long flags, char *titles, int count, int separator)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5428 DW_FUNCTION_ADD_PARAM5(handle, flags, titles, count, separator)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5429 DW_FUNCTION_RETURN(dw_container_setup, int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5430 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, flags, unsigned long , titles, char *, count, int, DW_UNUSED(separator), int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5431 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5432 int retval = _dw_container_setup_int(handle, flags, titles, count, separator, 0);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5433 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5434 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5435
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5436 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5437 * Configures the main filesystem columnn title for localization.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5438 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5439 * handle: Handle to the container to be configured.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5440 * title: The title to be displayed in the main column.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5441 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5442 void API dw_filesystem_set_column_title(HWND handle, const char *title)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5443 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5444 char *newtitle = strdup(title ? title : "");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5445
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5446 g_object_set_data(G_OBJECT(handle), "_dw_coltitle", newtitle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5447 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5448
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5449 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5450 * Sets up the filesystem columns, note: filesystem always has an icon/filename field.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5451 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5452 * handle: Handle to the container to be configured.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5453 * flags: An array of unsigned longs with column flags.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5454 * titles: An array of strings with column text titles.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5455 * count: The number of columns (this should match the arrays).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5456 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5457 DW_FUNCTION_DEFINITION(dw_filesystem_setup, int, HWND handle, unsigned long flags, char *titles, int count)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5458 DW_FUNCTION_ADD_PARAM4(handle, flags, titles, count)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5459 DW_FUNCTION_RETURN(dw_filesystem_setup, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5460 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, flags, unsigned long , titles, char *, count, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5461 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5462 char *newtitles = malloc(sizeof(char ) * (count + 1));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5463 unsigned long newflags = malloc(sizeof(unsigned long) (count + 1));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5464 char coltitle = (char )g_object_get_data(G_OBJECT(handle), "_dw_coltitle");
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5465 int retval;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5466
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5467 newtitles[0] = coltitle ? coltitle : "Filename";
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5468 newflags[0] = DW_CFA_STRINGANDICON \| DW_CFA_LEFT \| DW_CFA_HORZSEPARATOR;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5469
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5470 memcpy(&newtitles[1], titles, sizeof(char ) count);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5471 memcpy(&newflags[1], flags, sizeof(unsigned long) * count);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5472
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5473 retval = _dw_container_setup_int(handle, newflags, newtitles, count + 1, 1, 1);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5474
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5475 if(coltitle)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5476 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5477 g_object_set_data(G_OBJECT(handle), "_dw_coltitle", NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5478 free(coltitle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5479 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5480 if(newtitles)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5481 free(newtitles);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5482 if(newflags)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5483 free(newflags);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5484 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5485 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5486
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5487 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5488 * Obtains an icon from a module (or header in GTK).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5489 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5490 * module: Handle to module (DLL) in OS/2 and Windows.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5491 * id: A unsigned long id int the resources on OS/2 and
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5492 * Windows, on GTK this is converted to a pointer
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5493 * to an embedded XPM.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5494 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	5495 HICN API dw_icon_load(unsigned long module, unsigned long id)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5496 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5497 return (HICN)id;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5498 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5499
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5500 /* Internal function to keep HICNs from getting too big */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5501 GdkPixbuf _dw_icon_resize(GdkPixbuf ret)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5502 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5503 if(ret)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5504 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5505 int pwidth = gdk_pixbuf_get_width(ret);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5506 int pheight = gdk_pixbuf_get_height(ret);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5507
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5508 if(pwidth > 24 \|\| pheight > 24)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5509 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5510 GdkPixbuf *orig = ret;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5511 ret = gdk_pixbuf_scale_simple(ret, pwidth > 24 ? 24 : pwidth, pheight > 24 ? 24 : pheight, GDK_INTERP_BILINEAR);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5512 g_object_unref(G_OBJECT(orig));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5513 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5514 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5515 return ret;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5516 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5517
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5518 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5519 * Obtains an icon from a file.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5520 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5521 * filename: Name of the file, omit extention to have
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5522 * DW pick the appropriate file extension.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5523 * (ICO on OS/2 or Windows, XPM on Unix)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5524 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5525 HICN API dw_icon_load_from_file(const char *filename)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5526 {
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5527 HICN retval = 0;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5528
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5529 if(filename && *filename)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5530 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5531 char *file = alloca(strlen(filename) + 6);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5532
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5533 strcpy(file, filename);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5534
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5535 /* check if we can read from this file (it exists and read permission) */
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5536 if(access(file, 04) != 0)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5537 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5538 int i = 0;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5539
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5540 /* Try with various extentions */
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5541 while(_dw_image_exts[i] && !retval)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5542 {
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5543 strcpy(file, filename);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5544 strcat(file, _dw_image_exts[i]);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5545 if(access(file, 04) == 0)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5546 retval = _dw_icon_resize(gdk_pixbuf_new_from_file(file, NULL));
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5547 i++;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5548 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5549 }
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5550 else
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5551 retval = _dw_icon_resize(gdk_pixbuf_new_from_file(file, NULL));
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5552 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5553 return retval;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5554 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5555
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5556 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5557 * Obtains an icon from data.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5558 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5559 * data: Source of data for image.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5560 * len: length of data
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5561 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5562 HICN API dw_icon_load_from_data(const char *data, int len)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5563 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5564 int fd, written = -1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5565 char template[] = "/tmp/dwiconXXXXXX";
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5566 HICN ret = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5567
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5568 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5569 * A real hack; create a temporary file and write the contents
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5570 * of the data to the file
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5571 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5572 if((fd = mkstemp(template)) != -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5573 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5574 written = write(fd, data, len);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5575 close(fd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5576 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5577 /* Bail if we couldn't write full file */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5578 if(fd == -1 \|\| written != len)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5579 return 0;
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5580 ret = _dw_icon_resize(gdk_pixbuf_new_from_file(template, NULL));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5581 unlink(template);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5582 return ret;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5583 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5584
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5585 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5586 * Frees a loaded resource in OS/2 and Windows.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5587 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5588 * handle: Handle to icon returned by dw_icon_load().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5589 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	5590 void API dw_icon_free(HICN handle)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5591 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5592 int iicon = GPOINTER_TO_INT(handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5593
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5594 if(iicon > 65535)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5595 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5596 g_object_unref(handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5597 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5598 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5599
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5600 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5601 * Allocates memory used to populate a container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5602 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5603 * handle: Handle to the container window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5604 * rowcount: The number of items to be populated.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5605 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5606 DW_FUNCTION_DEFINITION(dw_container_alloc, void *, HWND handle, int rowcount)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5607 DW_FUNCTION_ADD_PARAM2(handle, rowcount)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5608 DW_FUNCTION_RETURN(dw_container_alloc, void *)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5609 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, rowcount, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5610 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5611 int z, prevrowcount = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5612 GtkWidget *cont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5613 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5614
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5615 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5616
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5617 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5618 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5619 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5620
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5621 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5622 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5623 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5624
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5625 prevrowcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5626
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5627 for(z=0;z<rowcount;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5628 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5629 gtk_list_store_append(store, &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5630 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5631 g_object_set_data(G_OBJECT(cont), "_dw_insertpos", GINT_TO_POINTER(prevrowcount));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5632 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(rowcount + prevrowcount));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5633 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5634 DW_FUNCTION_RETURN_THIS(cont);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5635 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5636
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5637 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5638 * Internal representation of dw_container_set_item() extracted so we can pass
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5639 * two data pointers; icon and text for dw_filesystem_set_item().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5640 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5641 void _dw_container_set_item_int(HWND handle, void pointer, int column, int row, void data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5642 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5643 char numbuf[25] = {0}, textbuffer[101] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5644 int flag = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5645 GtkWidget *cont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5646 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5647
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5648 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5649
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5650 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5651 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5652 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5653
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5654 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5655 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5656 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5657
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5658 snprintf(numbuf, 24, "_dw_cont_col%d", column);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5659 flag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), numbuf));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5660 if(pointer)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5661 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5662 row += GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_insertpos"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5663 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5664
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5665 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, row))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5666 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5667 if(flag & DW_CFA_STRINGANDICON)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5668 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5669 void thisdata = (void )data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5670 HICN hicon = data ? ((HICN )thisdata[0]) : 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5671 char tmp = data ? (char )thisdata[1] : NULL;
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	5672 GdkPixbuf *pixbuf = hicon ? _dw_find_pixbuf(hicon, NULL, NULL) : NULL;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5673
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5674 gtk_list_store_set(store, &iter, _DW_CONTAINER_STORE_EXTRA, pixbuf, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5675 gtk_list_store_set(store, &iter, _DW_CONTAINER_STORE_EXTRA + 1, tmp, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5676 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5677 else if(flag & DW_CFA_BITMAPORICON)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5678 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5679 HICN hicon = data ? ((HICN )data) : 0;
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	5680 GdkPixbuf *pixbuf = hicon ? _dw_find_pixbuf(hicon, NULL, NULL) : NULL;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5681
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5682 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, pixbuf, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5683 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5684 else if(flag & DW_CFA_STRING)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5685 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5686 char tmp = data ? ((char **)data) : NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5687 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, tmp, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5688 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5689 else if(flag & DW_CFA_ULONG)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5690 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5691 ULONG tmp = data ? ((ULONG )data): 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5692
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5693 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, tmp, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5694 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5695 else if(flag & DW_CFA_DATE)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5696 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5697 if(data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5698 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5699 struct tm curtm;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5700 CDATE cdate = ((CDATE )data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5701
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5702 memset( &curtm, 0, sizeof(curtm) );
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5703 curtm.tm_mday = cdate.day;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5704 curtm.tm_mon = cdate.month - 1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5705 curtm.tm_year = cdate.year - 1900;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5706
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5707 strftime(textbuffer, 100, "%x", &curtm);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5708 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5709 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, textbuffer, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5710 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5711 else if(flag & DW_CFA_TIME)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5712 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5713 if(data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5714 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5715 struct tm curtm;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5716 CTIME ctime = ((CTIME )data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5717
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5718 memset( &curtm, 0, sizeof(curtm) );
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5719 curtm.tm_hour = ctime.hours;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5720 curtm.tm_min = ctime.minutes;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5721 curtm.tm_sec = ctime.seconds;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5722
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5723 strftime(textbuffer, 100, "%X", &curtm);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5724 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5725 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, textbuffer, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5726 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5727 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5728 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5729 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5730
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5731 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5732 * Sets an item in specified row and column to the given data.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5733 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5734 * handle: Handle to the container window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5735 * pointer: Pointer to the allocated memory in dw_container_alloc().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5736 * column: Zero based column of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5737 * row: Zero based row of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5738 * data: Pointer to the data to be added.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5739 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5740 DW_FUNCTION_DEFINITION(dw_container_set_item, void, HWND handle, void pointer, int column, int row, void data)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5741 DW_FUNCTION_ADD_PARAM5(handle, pointer, column, row, data)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5742 DW_FUNCTION_NO_RETURN(dw_container_set_item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5743 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pointer, void , column, int, row, int, data, void )
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5744 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5745 _dw_container_set_item_int(handle, pointer, column, row, data);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5746 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5747 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5748
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5749 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5750 * Changes an existing item in specified row and column to the given data.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5751 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5752 * handle: Handle to the container window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5753 * column: Zero based column of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5754 * row: Zero based row of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5755 * data: Pointer to the data to be added.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5756 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5757 DW_FUNCTION_DEFINITION(dw_container_change_item, void, HWND handle, int column, int row, void *data)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5758 DW_FUNCTION_ADD_PARAM4(handle, column, row, data)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5759 DW_FUNCTION_NO_RETURN(dw_container_change_item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5760 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, column, int, row, int, data, void *)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5761 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5762 _dw_container_set_item_int(handle, NULL, column, row, data);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5763 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5764 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5765
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5766 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5767 * Changes an existing item in specified row and column to the given data.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5768 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5769 * handle: Handle to the container window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5770 * column: Zero based column of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5771 * row: Zero based row of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5772 * data: Pointer to the data to be added.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5773 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5774 void API dw_filesystem_change_item(HWND handle, int column, int row, void *data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5775 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5776 dw_filesystem_set_item(handle, NULL, column, row, data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5777 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5778
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5779 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5780 * Changes an item in specified row and column to the given data.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5781 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5782 * handle: Handle to the container window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5783 * pointer: Pointer to the allocated memory in dw_container_alloc().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5784 * column: Zero based column of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5785 * row: Zero based row of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5786 * data: Pointer to the data to be added.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5787 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5788 void API dw_filesystem_change_file(HWND handle, int row, const char *filename, HICN icon)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5789 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5790 dw_filesystem_set_file(handle, NULL, row, filename, icon);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5791 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5792
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5793 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5794 * Sets an item in specified row and column to the given data.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5795 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5796 * handle: Handle to the container window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5797 * pointer: Pointer to the allocated memory in dw_container_alloc().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5798 * column: Zero based column of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5799 * row: Zero based row of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5800 * data: Pointer to the data to be added.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5801 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5802 DW_FUNCTION_DEFINITION(dw_filesystem_set_file, void, HWND handle, void pointer, int row, const char filename, HICN icon)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5803 DW_FUNCTION_ADD_PARAM5(handle, pointer, row, filename, icon)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5804 DW_FUNCTION_NO_RETURN(dw_filesystem_set_file)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5805 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pointer, void , row, int, filename, char , icon, HICN)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5806 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5807 void data[2] = { (void )&icon, (void *)filename };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5808
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5809 _dw_container_set_item_int(handle, pointer, 0, row, (void *)data);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5810 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5811 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5812
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5813 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5814 * Sets an item in specified row and column to the given data.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5815 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5816 * handle: Handle to the container window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5817 * pointer: Pointer to the allocated memory in dw_container_alloc().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5818 * column: Zero based column of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5819 * row: Zero based row of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5820 * data: Pointer to the data to be added.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5821 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5822 DW_FUNCTION_DEFINITION(dw_filesystem_set_item, void, HWND handle, void pointer, int column, int row, void data)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5823 DW_FUNCTION_ADD_PARAM5(handle, pointer, column, row, data)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5824 DW_FUNCTION_NO_RETURN(dw_filesystem_set_item)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5825 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pointer, void , column, int, row, int, data, void )
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5826 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5827 _dw_container_set_item_int(handle, pointer, column + 1, row, data);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5828 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5829 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5830
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5831 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5832 * Gets column type for a container column
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5833 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5834 * handle: Handle to the container window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5835 * column: Zero based column.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5836 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5837 DW_FUNCTION_DEFINITION(dw_container_get_column_type, int, HWND handle, int column)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5838 DW_FUNCTION_ADD_PARAM2(handle, column)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5839 DW_FUNCTION_RETURN(dw_container_get_column_type, int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5840 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, column, int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5841 {
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5842 int flag, rc = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5843 GtkWidget *cont = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5844
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5845 if((cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user")))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5846 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5847 char numbuf[25] = {0};
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5848
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5849 snprintf(numbuf, 24, "_dw_cont_col%d", column);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5850 flag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), numbuf));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5851
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5852 if(flag & DW_CFA_BITMAPORICON)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5853 rc = DW_CFA_BITMAPORICON;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5854 else if(flag & DW_CFA_STRING)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5855 rc = DW_CFA_STRING;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5856 else if(flag & DW_CFA_ULONG)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5857 rc = DW_CFA_ULONG;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5858 else if(flag & DW_CFA_DATE)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5859 rc = DW_CFA_DATE;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5860 else if(flag & DW_CFA_TIME)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5861 rc = DW_CFA_TIME;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5862 else
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5863 rc = 0;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5864 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5865 DW_FUNCTION_RETURN_THIS(rc);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5866 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5867
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5868 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5869 * Gets column type for a filesystem container column
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5870 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5871 * handle: Handle to the container window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5872 * column: Zero based column.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5873 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5874 int API dw_filesystem_get_column_type(HWND handle, int column)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5875 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5876 return dw_container_get_column_type( handle, column + 1 );
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5877 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5878
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5879 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5880 * Sets the alternating row colors for container window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5881 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5882 * handle: The window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5883 * oddcolor: Odd row background color in DW_RGB format or a default color index.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5884 * evencolor: Even row background color in DW_RGB format or a default color index.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5885 * DW_RGB_TRANSPARENT will disable coloring rows.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5886 * DW_CLR_DEFAULT will use the system default alternating row colors.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5887 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5888 void API dw_container_set_stripe(HWND handle, unsigned long oddcolor, unsigned long evencolor)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5889 {
2441 a80df2e7195d GTK4: Add a comment with the information about striped controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2410 diff changeset	5890 /* TODO: If we want to accomplish this, according to mclasen we can do it
a80df2e7195d GTK4: Add a comment with the information about striped controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2410 diff changeset	5891 * with CSS on a GtkListBox widget using the following CSS:
a80df2e7195d GTK4: Add a comment with the information about striped controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2410 diff changeset	5892 * "row: nth-child(even) { background: red; }"
a80df2e7195d GTK4: Add a comment with the information about striped controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2410 diff changeset	5893 * However he does not recommend we do it for performance reasons.
a80df2e7195d GTK4: Add a comment with the information about striped controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2410 diff changeset	5894 */
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5895 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5896
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5897 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5898 * Sets the width of a column in the container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5899 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5900 * handle: Handle to window (widget) of container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5901 * column: Zero based column of width being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5902 * width: Width of column in pixels.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5903 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5904 DW_FUNCTION_DEFINITION(dw_container_set_column_width, void, HWND handle, int column, int width)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5905 DW_FUNCTION_ADD_PARAM3(handle, column, width)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5906 DW_FUNCTION_NO_RETURN(dw_container_set_column_width)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5907 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, column, int, width, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5908 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5909 GtkWidget *cont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5910
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5911 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5912
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5913 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5914 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5915 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5916 GtkTreeViewColumn *col = gtk_tree_view_get_column(GTK_TREE_VIEW(cont), column);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5917
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5918 if(col && GTK_IS_TREE_VIEW_COLUMN(col))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5919 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5920 gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN(col), width);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5921 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5922 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5923 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5924 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5925
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5926 /* Internal version for both */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5927 void _dw_container_set_row_data_int(HWND handle, void pointer, int row, int type, void data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5928 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5929 GtkWidget *cont = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5930 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5931
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5932 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5933 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5934 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5935
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5936 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5937 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5938 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5939
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5940 if(pointer)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5941 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5942 row += GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_insertpos"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5943 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5944
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5945 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, row))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5946 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5947 gtk_list_store_set(store, &iter, type, (gpointer)data, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5948 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5949 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5950 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5951
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5952 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5953 * Sets the title of a row in the container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5954 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5955 * pointer: Pointer to the allocated memory in dw_container_alloc().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5956 * row: Zero based row of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5957 * title: String title of the item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5958 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5959 DW_FUNCTION_DEFINITION(dw_container_set_row_title, void, void pointer, int row, const char title)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5960 DW_FUNCTION_ADD_PARAM3(pointer, row, title)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5961 DW_FUNCTION_NO_RETURN(dw_container_set_row_title)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5962 DW_FUNCTION_RESTORE_PARAM3(pointer, void , row, int, title, char )
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5963 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5964 _dw_container_set_row_data_int(pointer, pointer, row, _DW_DATA_TYPE_STRING, (void *)title);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5965 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5966 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5967
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5968 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5969 * Changes the title of a row already inserted in the container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5970 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5971 * handle: Handle to window (widget) of container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5972 * row: Zero based row of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5973 * title: String title of the item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5974 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5975 DW_FUNCTION_DEFINITION(dw_container_change_row_title, void, HWND handle, int row, const char *title)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5976 DW_FUNCTION_ADD_PARAM3(handle, row, title)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5977 DW_FUNCTION_NO_RETURN(dw_container_change_row_title)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5978 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, row, int, title, char *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5979 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5980 _dw_container_set_row_data_int(handle, NULL, row, _DW_DATA_TYPE_STRING, (void *)title);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5981 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5982 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5983
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5984 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5985 * Sets the data of a row in the container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5986 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5987 * pointer: Pointer to the allocated memory in dw_container_alloc().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5988 * row: Zero based row of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5989 * data: Data pointer.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5990 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5991 DW_FUNCTION_DEFINITION(dw_container_set_row_data, void, void pointer, int row, void data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5992 DW_FUNCTION_ADD_PARAM3(pointer, row, data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5993 DW_FUNCTION_NO_RETURN(dw_container_set_row_data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5994 DW_FUNCTION_RESTORE_PARAM3(pointer, void , row, int, data, void )
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5995 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5996 _dw_container_set_row_data_int(pointer, pointer, row, _DW_DATA_TYPE_POINTER, data);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5997 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5998 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5999
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6000 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6001 * Changes the data of a row already inserted in the container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6002 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6003 * handle: Handle to window (widget) of container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6004 * row: Zero based row of data being set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6005 * data: Data pointer.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6006 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6007 DW_FUNCTION_DEFINITION(dw_container_change_row_data, void, HWND handle, int row, void *data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6008 DW_FUNCTION_ADD_PARAM3(handle, row, data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6009 DW_FUNCTION_NO_RETURN(dw_container_change_row_data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6010 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, row, int, data, void *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6011 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6012 _dw_container_set_row_data_int(handle, NULL, row, _DW_DATA_TYPE_POINTER, data);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6013 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6014 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6015
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6016 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6017 * Sets the title of a row in the container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6018 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6019 * handle: Handle to the container window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6020 * pointer: Pointer to the allocated memory in dw_container_alloc().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6021 * rowcount: The number of rows to be inserted.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6022 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	6023 void API dw_container_insert(HWND handle, void *pointer, int rowcount)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6024 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6025 /* Don't need to do anything here */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6026 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6027
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6028 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6029 * Removes the first x rows from a container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6030 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6031 * handle: Handle to the window (widget) to be deleted from.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6032 * rowcount: The number of rows to be deleted.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6033 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6034 DW_FUNCTION_DEFINITION(dw_container_delete, void, HWND handle, int rowcount)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6035 DW_FUNCTION_ADD_PARAM2(handle, rowcount)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6036 DW_FUNCTION_NO_RETURN(dw_container_delete)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6037 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, rowcount, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6038 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6039 GtkWidget *cont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6040 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6041
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6042 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6043
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6044 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6045 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6046 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6047
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6048 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6049 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6050 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6051 int rows, z;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6052
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6053 rows = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6054
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6055 for(z=0;z<rowcount;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6056 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6057 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, 0))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6058 gtk_list_store_remove(store, &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6059 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6060
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6061 if(rows - rowcount < 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6062 rows = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6063 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6064 rows -= rowcount;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6065
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6066 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(rows));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6067 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6068 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6069 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6070
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6071 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6072 * Removes all rows from a container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6073 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6074 * handle: Handle to the window (widget) to be cleared.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6075 * redraw: TRUE to cause the container to redraw immediately.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6076 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6077 DW_FUNCTION_DEFINITION(dw_container_clear, void, HWND handle, DW_UNUSED(int redraw))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6078 DW_FUNCTION_ADD_PARAM2(handle, redraw)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6079 DW_FUNCTION_NO_RETURN(dw_container_clear)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6080 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, DW_UNUSED(redraw), int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6081 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6082 GtkWidget *cont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6083 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6084
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6085 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6086
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6087 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6088 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6089 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6090
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6091 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6092 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6093 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(0));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6094 g_object_set_data(G_OBJECT(cont), "_dw_insertpos", GINT_TO_POINTER(0));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6095
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6096 gtk_list_store_clear(store);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6097 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6098 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6099 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6100
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6101 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6102 * Scrolls container up or down.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6103 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6104 * handle: Handle to the window (widget) to be scrolled.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6105 * direction: DW_SCROLL_UP, DW_SCROLL_DOWN, DW_SCROLL_TOP or
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6106 * DW_SCROLL_BOTTOM. (rows is ignored for last two)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6107 * rows: The number of rows to be scrolled.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6108 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6109 DW_FUNCTION_DEFINITION(dw_container_scroll, void, HWND handle, int direction, long rows)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6110 DW_FUNCTION_ADD_PARAM3(handle, direction, rows)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6111 DW_FUNCTION_NO_RETURN(dw_container_scroll)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6112 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, direction, int, rows, long)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6113 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6114 GtkWidget *cont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6115
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6116 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6117
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6118 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6119 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6120 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6121 GtkAdjustment *adjust = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6122
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6123 if(adjust)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6124 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6125 gint rowcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6126 gdouble currpos = gtk_adjustment_get_value(adjust);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6127 gdouble upper = gtk_adjustment_get_upper(adjust);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6128 gdouble lower = gtk_adjustment_get_lower(adjust);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6129 gdouble change;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6130
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6131 /* Safety check */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6132 if(rowcount > 0)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6133 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6134 change = ((gdouble)rows/(gdouble)rowcount) * (upper - lower);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6135
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6136 switch(direction)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6137 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6138 case DW_SCROLL_TOP:
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6139 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6140 gtk_adjustment_set_value(adjust, lower);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6141 break;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6142 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6143 case DW_SCROLL_BOTTOM:
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6144 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6145 gtk_adjustment_set_value(adjust, upper);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6146 break;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6147 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6148 case DW_SCROLL_UP:
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6149 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6150 gdouble newpos = currpos - change;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6151 if(newpos < lower)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6152 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6153 newpos = lower;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6154 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6155 gtk_adjustment_set_value(adjust, newpos);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6156 break;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6157 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6158 case DW_SCROLL_DOWN:
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6159 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6160 gdouble newpos = currpos + change;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6161 if(newpos > upper)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6162 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6163 newpos = upper;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6164 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6165 gtk_adjustment_set_value(adjust, newpos);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6166 break;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6167 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6168 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6169 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6170 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6171 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6172 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6173 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6174
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6175 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6176 * Starts a new query of a container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6177 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6178 * handle: Handle to the window (widget) to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6179 * flags: If this parameter is DW_CRA_SELECTED it will only
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6180 * return items that are currently selected. Otherwise
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6181 * it will return all records in the container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6182 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6183 DW_FUNCTION_DEFINITION(dw_container_query_start, char *, HWND handle, unsigned long flags)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6184 DW_FUNCTION_ADD_PARAM2(handle, flags)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6185 DW_FUNCTION_RETURN(dw_container_query_start, char *)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6186 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, flags, unsigned long)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6187 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6188 GtkWidget *cont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6189 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6190 char *retval = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6191 int type = flags & DW_CR_RETDATA ? _DW_DATA_TYPE_POINTER : _DW_DATA_TYPE_STRING;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6192
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6193 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6194
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6195 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6196 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6197 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6198
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6199 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6200 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6201 /* These should be separate but right now this will work */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6202 if(flags & DW_CRA_SELECTED)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6203 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6204 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6205 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6206 if(list)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6207 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6208 GtkTreePath *path = g_list_nth_data(list, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6209
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6210 if(path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6211 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6212 gint *indices = gtk_tree_path_get_indices(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6213
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6214 if(indices)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6215 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6216 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6217
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6218 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, indices[0]))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6219 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6220 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6221 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(1));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6222 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6223 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6224 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6225 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6226 g_list_free(list);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6227 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6228 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6229 else if(flags & DW_CRA_CURSORED)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6230 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6231 GtkTreePath *path;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6232
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6233 gtk_tree_view_get_cursor(GTK_TREE_VIEW(cont), &path, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6234 if(path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6235 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6236 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6237
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6238 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6239 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6240 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6241 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6242 gtk_tree_path_free(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6243 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6244 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6245 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6246 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6247 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6248
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6249 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, 0))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6250 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6251 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6252 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(1));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6253 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6254 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6255 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6256 /* If there is a title, duplicate it and free the temporary copy */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6257 if(retval && type == _DW_DATA_TYPE_STRING)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6258 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6259 char *temp = retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6260 retval = strdup(temp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6261 g_free(temp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6262 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6263 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6264 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6265
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6266 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6267 * Continues an existing query of a container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6268 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6269 * handle: Handle to the window (widget) to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6270 * flags: If this parameter is DW_CRA_SELECTED it will only
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6271 * return items that are currently selected. Otherwise
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6272 * it will return all records in the container.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6273 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6274 DW_FUNCTION_DEFINITION(dw_container_query_next, char *, HWND handle, unsigned long flags)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6275 DW_FUNCTION_ADD_PARAM2(handle, flags)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6276 DW_FUNCTION_RETURN(dw_container_query_next, char *)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6277 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, flags, unsigned long)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6278 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6279 GtkWidget *cont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6280 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6281 char *retval = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6282 int type = flags & DW_CR_RETDATA ? _DW_DATA_TYPE_POINTER : _DW_DATA_TYPE_STRING;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6283
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6284 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6285
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6286 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6287 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6288 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6289
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6290 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6291 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6292 int pos = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_querypos"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6293 int count = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6294
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6295 /* These should be separate but right now this will work */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6296 if(flags & DW_CRA_SELECTED)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6297 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6298 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6299 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6300
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6301 if(list)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6302 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6303 GtkTreePath *path = g_list_nth_data(list, pos);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6304
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6305 if(path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6306 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6307 gint *indices = gtk_tree_path_get_indices(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6308
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6309 if(indices)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6310 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6311 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6312
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6313 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, indices[0]))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6314 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6315 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6316 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(pos+1));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6317 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6318 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6319 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6320 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6321 g_list_free(list);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6322 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6323 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6324 else if(flags & DW_CRA_CURSORED)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6325 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6326 /* There will only be one item cursored,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6327 * retrieve it with dw_container_query_start()
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6328 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6329 retval = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6330 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6331 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6332 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6333 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6334
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6335 if(pos < count && gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, pos))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6336 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6337 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6338 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(pos+1));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6339 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6340 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6341 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6342 /* If there is a title, duplicate it and free the temporary copy */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6343 if(retval && type == _DW_DATA_TYPE_STRING)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6344 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6345 char *temp = retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6346 retval = strdup(temp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6347 g_free(temp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6348 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6349 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6350 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6351
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	6352 int _dw_find_iter(GtkListStore store, GtkTreeIter iter, void *data, int textcomp)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6353 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6354 int z, rows = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6355 void *thisdata;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6356 int retval = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6357
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6358 for(z=0;z<rows;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6359 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6360 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), iter, NULL, z))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6361 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6362 /* Get either string from position 0 or pointer from position 1 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6363 gtk_tree_model_get(GTK_TREE_MODEL(store), iter, textcomp ? _DW_DATA_TYPE_STRING : _DW_DATA_TYPE_POINTER, &thisdata, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6364 if((textcomp && thisdata && strcmp((char )thisdata, (char )data) == 0) \|\| (!textcomp && thisdata == data))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6365 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6366 retval = TRUE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6367 z = rows;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6368 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6369 if(textcomp && thisdata)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6370 g_free(thisdata);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6371 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6372 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6373 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6374 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6375
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6376 void _dw_container_cursor_int(HWND handle, void *data, int textcomp)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6377 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6378 GtkWidget *cont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6379 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6380
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6381 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6382
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6383 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6384 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6385 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6386
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6387 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6388 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6389 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6390
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	6391 if(_dw_find_iter(store, &iter, data, textcomp))
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6392 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6393 GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6394
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6395 if(path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6396 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6397 gtk_tree_view_row_activated(GTK_TREE_VIEW(cont), path, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6398 gtk_tree_path_free(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6399 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6400 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6401 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6402 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6403
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6404 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6405 * Cursors the item with the text speficied, and scrolls to that item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6406 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6407 * handle: Handle to the window (widget) to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6408 * text: Text usually returned by dw_container_query().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6409 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6410 DW_FUNCTION_DEFINITION(dw_container_cursor, void, HWND handle, const char *text)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6411 DW_FUNCTION_ADD_PARAM2(handle, text)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6412 DW_FUNCTION_NO_RETURN(dw_container_cursor)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6413 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6414 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6415 _dw_container_cursor_int(handle, (void *)text, TRUE);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6416 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6417 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6418
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6419 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6420 * Cursors the item with the text speficied, and scrolls to that item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6421 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6422 * handle: Handle to the window (widget) to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6423 * text: Text usually returned by dw_container_query().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6424 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6425 DW_FUNCTION_DEFINITION(dw_container_cursor_by_data, void, HWND handle, void *data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6426 DW_FUNCTION_ADD_PARAM2(handle, data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6427 DW_FUNCTION_NO_RETURN(dw_container_cursor_by_data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6428 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, data, void *)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6429 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6430 _dw_container_cursor_int(handle, data, FALSE);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6431 DW_FUNCTION_RETURN_NOTHING;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6432 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6433
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6434 void _dw_container_delete_row_int(HWND handle, void *data, int textcomp)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6435 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6436 GtkWidget *cont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6437 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6438
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6439 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6440
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6441 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6442 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6443 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6444
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6445 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6446 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6447 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6448 int rows = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6449
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	6450 if(_dw_find_iter(store, &iter, data, textcomp))
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6451 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6452 gtk_list_store_remove(store, &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6453 rows--;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6454 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6455
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6456 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(rows));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6457 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6458 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6459
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6460 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6461 * Deletes the item with the text speficied.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6462 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6463 * handle: Handle to the window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6464 * text: Text usually returned by dw_container_query().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6465 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6466 DW_FUNCTION_DEFINITION(dw_container_delete_row, void, HWND handle, const char *text)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6467 DW_FUNCTION_ADD_PARAM2(handle, text)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6468 DW_FUNCTION_NO_RETURN(dw_container_delete_row)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6469 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6470 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6471 _dw_container_delete_row_int(handle, (void *)text, TRUE);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6472 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6473 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6474
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6475 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6476 * Deletes the item with the text speficied.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6477 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6478 * handle: Handle to the window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6479 * text: Text usually returned by dw_container_query().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6480 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6481 DW_FUNCTION_DEFINITION(dw_container_delete_row_by_data, void, HWND handle, void *data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6482 DW_FUNCTION_ADD_PARAM2(handle, data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6483 DW_FUNCTION_NO_RETURN(dw_container_delete_row_by_data)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6484 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, data, void *)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6485 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6486 _dw_container_delete_row_int(handle, data, FALSE);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6487 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6488 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6489
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6490 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6491 * Optimizes the column widths so that all data is visible.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6492 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6493 * handle: Handle to the window (widget) to be optimized.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6494 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6495 DW_FUNCTION_DEFINITION(dw_container_optimize, void, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6496 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6497 DW_FUNCTION_NO_RETURN(dw_container_optimize)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6498 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6499 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6500 GtkWidget *cont;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6501
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6502 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6503
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6504 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6505 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6506 gtk_tree_view_columns_autosize(GTK_TREE_VIEW(cont));
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6507 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6508 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6509
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6510 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6511 * Inserts an icon into the taskbar.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6512 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6513 * handle: Window handle that will handle taskbar icon messages.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6514 * icon: Icon handle to display in the taskbar.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6515 * bubbletext: Text to show when the mouse is above the icon.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6516 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	6517 void API dw_taskbar_insert(HWND handle, HICN icon, const char *bubbletext)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6518 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6519 /* TODO: Removed in GTK4.... no replacement? */
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6520 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6521
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6522 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6523 * Deletes an icon from the taskbar.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6524 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6525 * handle: Window handle that was used with dw_taskbar_insert().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6526 * icon: Icon handle that was used with dw_taskbar_insert().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6527 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	6528 void API dw_taskbar_delete(HWND handle, HICN icon)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6529 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6530 /* TODO: Removed in GTK4.... no replacement? */
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6531 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6532
2341 1a630cddf384 GTK4: Remove render widgets from the dirty list when they are destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2340 diff changeset	6533 /* Make sure the widget is out of the dirty list if it is destroyed */
1a630cddf384 GTK4: Remove render widgets from the dirty list when they are destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2340 diff changeset	6534 static void _dw_render_destroy(GtkWidget *widget, gpointer data)
1a630cddf384 GTK4: Remove render widgets from the dirty list when they are destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2340 diff changeset	6535 {
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6536 cairo_surface_t surface = (cairo_surface_t )g_object_get_data(G_OBJECT(widget), "_dw_cr_surface");
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6537
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6538 if(surface)
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6539 cairo_surface_destroy(surface);
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6540
2341 1a630cddf384 GTK4: Remove render widgets from the dirty list when they are destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2340 diff changeset	6541 _dw_dirty_list = g_list_remove(_dw_dirty_list, widget);
1a630cddf384 GTK4: Remove render widgets from the dirty list when they are destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2340 diff changeset	6542 }
1a630cddf384 GTK4: Remove render widgets from the dirty list when they are destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2340 diff changeset	6543
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6544 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6545 * Creates a rendering context widget (window) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6546 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6547 * id: An id to be used with dw_window_from_id.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6548 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6549 * A handle to the widget or NULL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6550 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6551 DW_FUNCTION_DEFINITION(dw_render_new, HWND, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6552 DW_FUNCTION_ADD_PARAM1(cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6553 DW_FUNCTION_RETURN(dw_render_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6554 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6555 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6556 GtkWidget *tmp = gtk_drawing_area_new();
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6557 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2341 1a630cddf384 GTK4: Remove render widgets from the dirty list when they are destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2340 diff changeset	6558 g_signal_connect(G_OBJECT(tmp), "destroy", G_CALLBACK(_dw_render_destroy), NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6559 gtk_widget_set_can_focus(tmp, TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6560 gtk_widget_show(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6561 if(_DWDefaultFont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6562 dw_window_set_font(tmp, _DWDefaultFont);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6563 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6564 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6565
2355 fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6566 /*
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6567 * Invalidate the render widget triggering an expose event.
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6568 * Parameters:
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6569 * handle: A handle to a render widget to be redrawn.
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6570 */
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6571 DW_FUNCTION_DEFINITION(dw_render_redraw, void, HWND handle)
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6572 DW_FUNCTION_ADD_PARAM1(handle)
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6573 DW_FUNCTION_NO_RETURN(dw_render_redraw)
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6574 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6575 {
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6576 if(handle && GTK_IS_WIDGET(handle))
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6577 gtk_widget_queue_draw(handle);
2356 6f4f7882363c GTK4: Fix compilation after last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	6578 DW_FUNCTION_RETURN_NOTHING;
2355 fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6579 }
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2347 diff changeset	6580
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6581 /* Returns a GdkRGBA from a DW color */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6582 static GdkRGBA _dw_internal_color(unsigned long value)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6583 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6584 if(DW_RGB_COLOR & value)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6585 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6586 GdkRGBA color = { (gfloat)DW_RED_VALUE(value) / 255.0, (gfloat)DW_GREEN_VALUE(value) / 255.0, (gfloat)DW_BLUE_VALUE(value) / 255.0, 1.0 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6587 return color;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6588 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6589 if (value < 16)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	6590 return _dw_colors[value];
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	6591 return _dw_colors[0];
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6592 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6593
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6594 /* Sets the current foreground drawing color.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6595 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6596 * red: red value.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6597 * green: green value.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6598 * blue: blue value.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6599 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	6600 void API dw_color_foreground_set(unsigned long value)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6601 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6602 GdkRGBA color = _dw_internal_color(value);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6603 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6604
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6605 *foreground = color;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6606 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6607
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6608 /* Sets the current background drawing color.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6609 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6610 * red: red value.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6611 * green: green value.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6612 * blue: blue value.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6613 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	6614 void API dw_color_background_set(unsigned long value)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6615 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6616 GdkRGBA *background = pthread_getspecific(_dw_bg_color_key);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6617
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6618 if(value == DW_CLR_DEFAULT)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6619 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6620 if(background)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6621 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6622 pthread_setspecific(_dw_bg_color_key, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6623 free(background);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6624 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6625 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6626 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6627 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6628 GdkRGBA color = _dw_internal_color(value);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6629
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6630 if(!background)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6631 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6632 background = malloc(sizeof(GdkRGBA));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6633 pthread_setspecific(_dw_bg_color_key, background);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6634 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6635 *background = color;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6636 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6637 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6638
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6639 /* Allows the user to choose a color using the system's color chooser dialog.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6640 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6641 * value: current color
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6642 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6643 * The selected color or the current color if cancelled.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6644 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6645 DW_FUNCTION_DEFINITION(dw_color_choose, ULONG, ULONG value)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6646 DW_FUNCTION_ADD_PARAM1(value)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6647 DW_FUNCTION_RETURN(dw_color_choose, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6648 DW_FUNCTION_RESTORE_PARAM1(value, ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6649 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6650 GtkColorChooser *cd;
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6651 GdkRGBA color = _dw_internal_color(value);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6652 unsigned long retcolor = value;
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6653 DWDialog *tmp = dw_dialog_new(NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6654
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6655 cd = (GtkColorChooser *)gtk_color_chooser_dialog_new("Choose color", NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6656 gtk_color_chooser_set_use_alpha(cd, FALSE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6657 gtk_color_chooser_set_rgba(cd, &color);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6658
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6659 gtk_widget_show(GTK_WIDGET(cd));
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	6660 g_signal_connect(G_OBJECT(cd), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6661
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6662 if(DW_POINTER_TO_INT(dw_dialog_wait(tmp)) == GTK_RESPONSE_OK)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6663 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6664 gtk_color_chooser_get_rgba(cd, &color);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6665 retcolor = DW_RGB((int)(color.red * 255), (int)(color.green * 255), (int)(color.blue * 255));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6666 }
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6667 if(GTK_IS_WINDOW(cd))
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6668 gtk_window_destroy(GTK_WINDOW(cd));
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6669 DW_FUNCTION_RETURN_THIS(retcolor);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6670 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6671
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6672 /* Draw a point on a window (preferably a render window).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6673 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6674 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6675 * pixmap: Handle to the pixmap. (choose only one of these)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6676 * x: X coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6677 * y: Y coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6678 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6679 DW_FUNCTION_DEFINITION(dw_draw_point, void, HWND handle, HPIXMAP pixmap, int x, int y)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6680 DW_FUNCTION_ADD_PARAM4(handle, pixmap, x, y)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6681 DW_FUNCTION_NO_RETURN(dw_draw_point)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6682 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, pixmap, HPIXMAP, x, int, y, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6683 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6684 cairo_t *cr = NULL;
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	6685 int cached = FALSE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6686
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6687 if(handle)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6688 {
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6689 cairo_surface_t *surface;
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6690
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6691 if((cr = _dw_cairo_update(handle, -1, -1)))
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	6692 cached = TRUE;
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6693 else if((surface = g_object_get_data(G_OBJECT(handle), "_dw_cr_surface")))
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6694 cr = cairo_create(surface);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6695 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6696 else if(pixmap)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6697 cr = cairo_create(pixmap->image);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6698 if(cr)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6699 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6700 #ifdef _DW_SINGLE_THREADED
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6701 GdkRGBA *_dw_fg_color = pthread_getspecific(_dw_fg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6702 #endif
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6703
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6704 gdk_cairo_set_source_rgba(cr, _dw_fg_color);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6705 cairo_set_line_width(cr, 1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6706 cairo_move_to(cr, x, y);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6707 cairo_stroke(cr);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6708 /* If we are using a drawing context...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6709 * we don't own the cairo context so don't destroy it.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6710 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6711 if(!cached)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6712 cairo_destroy(cr);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6713 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6714 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6715 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6716
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6717 /* Draw a line on a window (preferably a render window).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6718 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6719 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6720 * pixmap: Handle to the pixmap. (choose only one of these)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6721 * x1: First X coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6722 * y1: First Y coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6723 * x2: Second X coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6724 * y2: Second Y coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6725 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6726 DW_FUNCTION_DEFINITION(dw_draw_line, void, HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6727 DW_FUNCTION_ADD_PARAM6(handle, pixmap, x1, y1, x2, y2)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6728 DW_FUNCTION_NO_RETURN(dw_draw_line)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6729 DW_FUNCTION_RESTORE_PARAM6(handle, HWND, pixmap, HPIXMAP, x1, int, y1, int, x2, int, y2, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6730 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6731 cairo_t *cr = NULL;
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	6732 int cached = FALSE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6733
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6734 if(handle)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6735 {
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6736 cairo_surface_t *surface;
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6737
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6738 if((cr = _dw_cairo_update(handle, -1, -1)))
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	6739 cached = TRUE;
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6740 else if((surface = g_object_get_data(G_OBJECT(handle), "_dw_cr_surface")))
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6741 cr = cairo_create(surface);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6742 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6743 else if(pixmap)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6744 cr = cairo_create(pixmap->image);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6745 if(cr)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6746 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6747 #ifdef _DW_SINGLE_THREADED
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6748 GdkRGBA *_dw_fg_color = pthread_getspecific(_dw_fg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6749 #endif
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6750
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6751 gdk_cairo_set_source_rgba(cr, _dw_fg_color);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6752 cairo_set_line_width(cr, 1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6753 cairo_move_to(cr, x1, y1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6754 cairo_line_to(cr, x2, y2);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6755 cairo_stroke(cr);
2280 7902be60c542 GTK4: More work on the draw and bitblt functions... still doesn't work bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2279 diff changeset	6756 /* If we are using a drawing context...
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6757 * we don't own the cairo context so don't destroy it.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6758 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6759 if(!cached)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6760 cairo_destroy(cr);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6761 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6762 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6763 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6764
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6765 /* Draw a closed polygon on a window (preferably a render window).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6766 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6767 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6768 * pixmap: Handle to the pixmap. (choose only one of these)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6769 * flags: DW_DRAW_FILL (1) to fill the polygon or DW_DRAW_DEFAULT (0).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6770 * number of points
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6771 * x[]: X coordinates.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6772 * y[]: Y coordinates.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6773 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6774 DW_FUNCTION_DEFINITION(dw_draw_polygon, void, HWND handle, HPIXMAP pixmap, int flags, int npoints, int x, int y)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6775 DW_FUNCTION_ADD_PARAM6(handle, pixmap, flags, npoints, x, y)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6776 DW_FUNCTION_NO_RETURN(dw_draw_polygon)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6777 DW_FUNCTION_RESTORE_PARAM6(handle, HWND, pixmap, HPIXMAP, flags, int, npoints, int, x, int , y, int )
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6778 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6779 cairo_t *cr = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6780 int z;
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	6781 int cached = FALSE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6782
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6783 if(handle)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6784 {
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6785 cairo_surface_t *surface;
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6786
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6787 if((cr = _dw_cairo_update(handle, -1, -1)))
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	6788 cached = TRUE;
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6789 else if((surface = g_object_get_data(G_OBJECT(handle), "_dw_cr_surface")))
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6790 cr = cairo_create(surface);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6791 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6792 else if(pixmap)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6793 cr = cairo_create(pixmap->image);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6794 if(cr)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6795 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6796 #ifdef _DW_SINGLE_THREADED
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6797 GdkRGBA *_dw_fg_color = pthread_getspecific(_dw_fg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6798 #endif
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6799
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6800 if(flags & DW_DRAW_NOAA)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6801 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6802
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6803 gdk_cairo_set_source_rgba(cr, _dw_fg_color);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6804 cairo_set_line_width(cr, 1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6805 cairo_move_to(cr, x[0], y[0]);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6806 for(z=1;z<npoints;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6807 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6808 cairo_line_to(cr, x[z], y[z]);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6809 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6810 if(flags & DW_DRAW_FILL)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6811 cairo_fill(cr);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6812 cairo_stroke(cr);
2280 7902be60c542 GTK4: More work on the draw and bitblt functions... still doesn't work bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2279 diff changeset	6813 /* If we are using a drawing context...
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6814 * we don't own the cairo context so don't destroy it.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6815 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6816 if(!cached)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6817 cairo_destroy(cr);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6818 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6819 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6820 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6821
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6822 /* Draw a rectangle on a window (preferably a render window).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6823 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6824 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6825 * pixmap: Handle to the pixmap. (choose only one of these)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6826 * flags: DW_DRAW_FILL (1) to fill the box or DW_DRAW_DEFAULT (0).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6827 * x: X coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6828 * y: Y coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6829 * width: Width of rectangle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6830 * height: Height of rectangle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6831 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6832 DW_FUNCTION_DEFINITION(dw_draw_rect, void, HWND handle, HPIXMAP pixmap, int flags, int x, int y, int width, int height)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6833 DW_FUNCTION_ADD_PARAM7(handle, pixmap, flags, x, y, width, height)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6834 DW_FUNCTION_NO_RETURN(dw_draw_rect)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6835 DW_FUNCTION_RESTORE_PARAM7(handle, HWND, pixmap, HPIXMAP, flags, int, x, int, y, int, width, int, height, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6836 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6837 cairo_t *cr = NULL;
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	6838 int cached = FALSE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6839
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6840 if(handle)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6841 {
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6842 cairo_surface_t *surface;
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6843
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6844 if((cr = _dw_cairo_update(handle, -1, -1)))
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	6845 cached = TRUE;
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6846 else if((surface = g_object_get_data(G_OBJECT(handle), "_dw_cr_surface")))
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6847 cr = cairo_create(surface);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6848 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6849 else if(pixmap)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6850 cr = cairo_create(pixmap->image);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6851 if(cr)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6852 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6853 #ifdef _DW_SINGLE_THREADED
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6854 GdkRGBA *_dw_fg_color = pthread_getspecific(_dw_fg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6855 #endif
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6856
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6857 if(flags & DW_DRAW_NOAA)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6858 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6859
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6860 gdk_cairo_set_source_rgba(cr, _dw_fg_color);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6861 cairo_set_line_width(cr, 1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6862 cairo_move_to(cr, x, y);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6863 cairo_line_to(cr, x, y + height);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6864 cairo_line_to(cr, x + width, y + height);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6865 cairo_line_to(cr, x + width, y);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6866 if(flags & DW_DRAW_FILL)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6867 cairo_fill(cr);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6868 cairo_stroke(cr);
2280 7902be60c542 GTK4: More work on the draw and bitblt functions... still doesn't work bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2279 diff changeset	6869 /* If we are using a drawing context...
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6870 * we don't own the cairo context so don't destroy it.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6871 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6872 if(!cached)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6873 cairo_destroy(cr);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6874 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6875 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6876 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6877
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6878 /* Draw an arc on a window (preferably a render window).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6879 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6880 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6881 * pixmap: Handle to the pixmap. (choose only one of these)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6882 * flags: DW_DRAW_FILL (1) to fill the arc or DW_DRAW_DEFAULT (0).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6883 * DW_DRAW_FULL will draw a complete circle/elipse.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6884 * xorigin: X coordinate of center of arc.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6885 * yorigin: Y coordinate of center of arc.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6886 * x1: X coordinate of first segment of arc.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6887 * y1: Y coordinate of first segment of arc.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6888 * x2: X coordinate of second segment of arc.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6889 * y2: Y coordinate of second segment of arc.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6890 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6891 DW_FUNCTION_DEFINITION(dw_draw_arc, void, HWND handle, HPIXMAP pixmap, int flags, int xorigin, int yorigin, int x1, int y1, int x2, int y2)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6892 DW_FUNCTION_ADD_PARAM9(handle, pixmap, flags, xorigin, yorigin, x1, y1, x2, y2)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6893 DW_FUNCTION_NO_RETURN(dw_draw_arc)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6894 DW_FUNCTION_RESTORE_PARAM9(handle, HWND, pixmap, HPIXMAP, flags, int, xorigin, int, yorigin, int, x1, int, y1, int, x2, int, y2, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6895 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6896 cairo_t *cr = NULL;
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	6897 int cached = FALSE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6898
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6899 if(handle)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6900 {
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6901 cairo_surface_t *surface;
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6902
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6903 if((cr = _dw_cairo_update(handle, -1, -1)))
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	6904 cached = TRUE;
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6905 else if((surface = g_object_get_data(G_OBJECT(handle), "_dw_cr_surface")))
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6906 cr = cairo_create(surface);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6907 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6908 else if(pixmap)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6909 cr = cairo_create(pixmap->image);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6910 if(cr)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6911 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6912 #ifdef _DW_SINGLE_THREADED
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6913 GdkRGBA *_dw_fg_color = pthread_getspecific(_dw_fg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6914 #endif
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6915 int width = abs(x2-x1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6916 float scale = fabs((float)(y2-y1))/(float)width;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6917
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6918 if(flags & DW_DRAW_NOAA)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6919 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6920
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6921 gdk_cairo_set_source_rgba(cr, _dw_fg_color);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6922 cairo_set_line_width(cr, 1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6923 if(scale != 1.0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6924 cairo_scale(cr, 1.0, scale);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6925 if(flags & DW_DRAW_FULL)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6926 cairo_arc(cr, xorigin, yorigin / scale, width/2, 0, M_PI*2);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6927 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6928 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6929 double dx = xorigin - x1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6930 double dy = yorigin - y1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6931 double r = sqrt(dxdx + dydy);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6932 double a1 = atan2((y1-yorigin), (x1-xorigin));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6933 double a2 = atan2((y2-yorigin), (x2-xorigin));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6934
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6935 cairo_arc(cr, xorigin, yorigin, r, a1, a2);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6936 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6937 if(flags & DW_DRAW_FILL)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6938 cairo_fill(cr);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6939 cairo_stroke(cr);
2280 7902be60c542 GTK4: More work on the draw and bitblt functions... still doesn't work bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2279 diff changeset	6940 /* If we are using a drawing context...
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6941 * we don't own the cairo context so don't destroy it.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6942 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6943 if(!cached)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6944 cairo_destroy(cr);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6945 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6946 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6947 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6948
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6949 /* Draw text on a window (preferably a render window).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6950 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6951 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6952 * pixmap: Handle to the pixmap. (choose only one of these)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6953 * x: X coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6954 * y: Y coordinate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6955 * text: Text to be displayed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6956 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6957 DW_FUNCTION_DEFINITION(dw_draw_text, void, HWND handle, HPIXMAP pixmap, int x, int y, const char *text)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6958 DW_FUNCTION_ADD_PARAM5(handle, pixmap, x, y, text)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6959 DW_FUNCTION_NO_RETURN(dw_draw_text)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6960 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pixmap, HPIXMAP, x, int, y, int, text, const char *)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6961 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6962 if(text)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6963 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6964 cairo_t *cr = NULL;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6965 PangoFontDescription *font;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6966 char tmpname, fontname = "monospace 10";
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6967 int cached = FALSE;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6968
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6969 if(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6970 {
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6971 cairo_surface_t *surface;
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6972
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6973 if((cr = _dw_cairo_update(handle, -1, -1)))
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6974 cached = TRUE;
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6975 else if((surface = g_object_get_data(G_OBJECT(handle), "_dw_cr_surface")))
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6976 cr = cairo_create(surface);
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6977 if((tmpname = (char *)g_object_get_data(G_OBJECT(handle), "_dw_fontname")))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6978 fontname = tmpname;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6979 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6980 else if(pixmap)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6981 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6982 if(pixmap->font)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6983 fontname = pixmap->font;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6984 else if(pixmap->handle && (tmpname = (char *)g_object_get_data(G_OBJECT(pixmap->handle), "_dw_fontname")))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6985 fontname = tmpname;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6986 cr = cairo_create(pixmap->image);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6987 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6988 if(cr)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6989 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6990 font = pango_font_description_from_string(fontname);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6991 if(font)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6992 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6993 PangoContext *context = pango_cairo_create_context(cr);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6994
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6995 if(context)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6996 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6997 PangoLayout *layout = pango_layout_new(context);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6998
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6999 if(layout)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7000 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	7001 #ifdef _DW_SINGLE_THREADED
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	7002 GdkRGBA *_dw_fg_color = pthread_getspecific(_dw_fg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	7003 GdkRGBA *_dw_bg_color = pthread_getspecific(_dw_bg_color_key);
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	7004 #endif
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7005
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7006 pango_layout_set_font_description(layout, font);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7007 pango_layout_set_text(layout, text, strlen(text));
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7008
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	7009 gdk_cairo_set_source_rgba(cr, _dw_fg_color);
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7010 /* Create a background color attribute if required */
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	7011 if(_dw_bg_color)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7012 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7013 PangoAttrList *list = pango_layout_get_attributes(layout);
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	7014 PangoAttribute attr = pango_attr_background_new((guint16)(_dw_bg_color->red 65535),
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	7015 (guint16)(_dw_bg_color->green * 65535),
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	7016 (guint16)(_dw_bg_color->blue* 65535));
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7017 if(!list)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7018 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7019 list = pango_attr_list_new();
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7020 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7021 pango_attr_list_change(list, attr);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7022 pango_layout_set_attributes(layout, list);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7023 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7024 /* Do the drawing */
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7025 cairo_move_to(cr, x, y);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7026 pango_cairo_show_layout (cr, layout);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7027
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7028 g_object_unref(layout);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7029 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7030 g_object_unref(context);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7031 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7032 pango_font_description_free(font);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7033 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7034 /* If we are using a drawing context...
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7035 * we don't own the cairo context so don't destroy it.
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7036 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7037 if(!cached)
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7038 cairo_destroy(cr);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7039 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7040 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	7041 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7042 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7043
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7044 /* Query the width and height of a text string.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7045 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7046 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7047 * pixmap: Handle to the pixmap. (choose only one of these)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7048 * text: Text to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7049 * width: Pointer to a variable to be filled in with the width.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7050 * height Pointer to a variable to be filled in with the height.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7051 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7052 DW_FUNCTION_DEFINITION(dw_font_text_extents_get, void, HWND handle, HPIXMAP pixmap, const char text, int width, int *height)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7053 DW_FUNCTION_ADD_PARAM5(handle, pixmap, text, width, height)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7054 DW_FUNCTION_NO_RETURN(dw_font_text_extents_get)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7055 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pixmap, HPIXMAP, text, const char , width, int , height, int *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7056 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7057 PangoFontDescription *font;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7058 char *fontname = NULL;
2336 dd1b2cc95c91 GTK4: Don't unref the PangoContext returned from gtk_widget_get_pango_context(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2335 diff changeset	7059 int free_fontname = FALSE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7060
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7061 if(text)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7062 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7063 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7064 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7065 fontname = (char *)g_object_get_data(G_OBJECT(handle), "_dw_fontname");
2336 dd1b2cc95c91 GTK4: Don't unref the PangoContext returned from gtk_widget_get_pango_context(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2335 diff changeset	7066 if(fontname == NULL)
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7067 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7068 fontname = dw_window_get_font(handle);
2336 dd1b2cc95c91 GTK4: Don't unref the PangoContext returned from gtk_widget_get_pango_context(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2335 diff changeset	7069 free_fontname = TRUE;
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7070 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7071 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7072 else if(pixmap)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7073 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7074 if(pixmap->font)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7075 fontname = pixmap->font;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7076 else if(pixmap->handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7077 fontname = (char *)g_object_get_data(G_OBJECT(pixmap->handle), "_dw_fontname");
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7078 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7079
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7080 font = pango_font_description_from_string(fontname ? fontname : "monospace 10");
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7081 if(font)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7082 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7083 PangoContext *context = gtk_widget_get_pango_context(pixmap ? pixmap->handle : handle);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7084
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7085 if(context)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7086 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7087 PangoLayout *layout = pango_layout_new(context);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7088
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7089 if(layout)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7090 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7091 PangoRectangle rect;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7092
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7093 pango_layout_set_font_description(layout, font);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7094 pango_layout_set_text(layout, text, -1);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7095 pango_layout_get_pixel_extents(layout, NULL, &rect);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7096
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7097 if(width)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7098 *width = rect.width;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7099 if(height)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7100 *height = rect.height;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7101
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7102 g_object_unref(layout);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7103 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7104 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7105 pango_font_description_free(font);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7106 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7107 if(free_fontname)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7108 free(fontname);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7109 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7110 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7111 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7112
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7113 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7114 * Creates a pixmap with given parameters.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7115 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7116 * handle: Window handle the pixmap is associated with.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7117 * or zero to enable this pixmap to be written
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7118 * off the screen to reduce flicker
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7119 * width: Width of the pixmap in pixels.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7120 * height: Height of the pixmap in pixels.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7121 * depth: Color depth of the pixmap.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7122 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7123 * A handle to a pixmap or NULL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7124 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7125 DW_FUNCTION_DEFINITION(dw_pixmap_new, HPIXMAP, HWND handle, unsigned long width, unsigned long height, DW_UNUSED(int depth))
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7126 DW_FUNCTION_ADD_PARAM4(handle, width, height, depth)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7127 DW_FUNCTION_RETURN(dw_pixmap_new, HPIXMAP)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7128 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, width, unsigned long, height, unsigned long, DW_UNUSED(depth), int)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7129 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7130 HPIXMAP pixmap = 0;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7131
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7132 if((pixmap = calloc(1,sizeof(struct _hpixmap))))
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7133 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7134 pixmap->width = width;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7135 pixmap->height = height;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7136 pixmap->handle = handle;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7137 /* Depth needs to be divided by 3... but for the RGB colorspace...
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7138 * only 8 bits per sample is allowed, so to avoid issues just pass 8 for now.
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7139 */
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7140 pixmap->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, width, height);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7141 pixmap->image = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7142 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7143 DW_FUNCTION_RETURN_THIS(pixmap);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7144 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7145
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7146 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7147 * Creates a pixmap from a file.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7148 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7149 * handle: Window handle the pixmap is associated with.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7150 * filename: Name of the file, omit extention to have
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7151 * DW pick the appropriate file extension.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7152 * (BMP on OS/2 or Windows, XPM on Unix)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7153 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7154 * A handle to a pixmap or NULL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7155 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7156 DW_FUNCTION_DEFINITION(dw_pixmap_new_from_file, HPIXMAP, HWND handle, const char *filename)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7157 DW_FUNCTION_ADD_PARAM2(handle, filename)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7158 DW_FUNCTION_RETURN(dw_pixmap_new_from_file, HPIXMAP)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7159 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, filename, const char *)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7160 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7161 HPIXMAP pixmap = 0;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7162
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7163 if(filename && *filename && (pixmap = calloc(1,sizeof(struct _hpixmap))))
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7164 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7165 char *file = alloca(strlen(filename) + 6);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7166
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7167 strcpy(file, filename);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7168
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7169 /* check if we can read from this file (it exists and read permission) */
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7170 if(access(file, 04) != 0)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7171 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7172 int i = 0;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7173
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7174 /* Try with various extentions */
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7175 while(_dw_image_exts[i] && !pixmap->pixbuf)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7176 {
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7177 strcpy(file, filename);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7178 strcat(file, _dw_image_exts[i]);
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	7179 if(access(file, 04) == 0)
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7180 pixmap->pixbuf = gdk_pixbuf_new_from_file(file, NULL);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7181 i++;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7182 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7183 }
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7184 else
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7185 pixmap->pixbuf = gdk_pixbuf_new_from_file(file, NULL);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7186
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7187 if(pixmap->pixbuf)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7188 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7189 pixmap->image = cairo_image_surface_create_from_png(file);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7190 pixmap->width = gdk_pixbuf_get_width(pixmap->pixbuf);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7191 pixmap->height = gdk_pixbuf_get_height(pixmap->pixbuf);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7192 pixmap->handle = handle;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7193 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7194 else
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7195 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7196 free(pixmap);
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7197 pixmap = 0;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7198 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7199 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7200 DW_FUNCTION_RETURN_THIS(pixmap);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7201 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7202
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7203 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7204 * Creates a pixmap from data
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7205 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7206 * handle: Window handle the pixmap is associated with.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7207 * data: Source of image data
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7208 * DW pick the appropriate file extension.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7209 * (BMP on OS/2 or Windows, XPM on Unix)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7210 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7211 * A handle to a pixmap or NULL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7212 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7213 DW_FUNCTION_DEFINITION(dw_pixmap_new_from_data, HPIXMAP, HWND handle, const char *data, int len)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7214 DW_FUNCTION_ADD_PARAM3(handle, data, len)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7215 DW_FUNCTION_RETURN(dw_pixmap_new_from_data, HPIXMAP)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7216 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, data, const char *, len, int)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7217 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7218 HPIXMAP pixmap = 0;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7219
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7220 if(data && len > 0 && (pixmap = calloc(1,sizeof(struct _hpixmap))))
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7221 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7222 int fd, written = -1;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7223 char template[] = "/tmp/dwpixmapXXXXXX";
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7224
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7225 /*
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7226 * A real hack; create a temporary file and write the contents
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7227 * of the data to the file
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7228 */
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7229 if((fd = mkstemp(template)) != -1)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7230 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7231 written = write(fd, data, len);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7232 close(fd);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7233 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7234 /* Bail if we couldn't write full file */
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7235 if(fd != -1 && written == len)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7236 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7237 pixmap->pixbuf = gdk_pixbuf_new_from_file(template, NULL);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7238 pixmap->image = cairo_image_surface_create_from_png(template);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7239 pixmap->width = gdk_pixbuf_get_width(pixmap->pixbuf);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7240 pixmap->height = gdk_pixbuf_get_height(pixmap->pixbuf);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7241 /* remove our temporary file */
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7242 unlink(template);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7243 pixmap->handle = handle;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7244 }
2316 1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7245 else
1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7246 {
1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7247 free(pixmap);
1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7248 pixmap = 0;
1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7249 }
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7250 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7251 DW_FUNCTION_RETURN_THIS(pixmap);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7252 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7253
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7254 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7255 * Sets the transparent color for a pixmap
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7256 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7257 * pixmap: Handle to a pixmap returned by
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7258 * dw_pixmap_new..
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7259 * color: transparent color
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7260 * Note: This does nothing on GTK+ as transparency
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7261 * is handled automatically
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7262 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7263 void API dw_pixmap_set_transparent_color(HPIXMAP pixmap, unsigned long color)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7264 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7265 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7266
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7267 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7268 * Creates a pixmap from internal resource graphic specified by id.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7269 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7270 * handle: Window handle the pixmap is associated with.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7271 * id: Resource ID associated with requested pixmap.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7272 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7273 * A handle to a pixmap or NULL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7274 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7275 DW_FUNCTION_DEFINITION(dw_pixmap_grab, HPIXMAP, HWND handle, ULONG id)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7276 DW_FUNCTION_ADD_PARAM2(handle, id)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7277 DW_FUNCTION_RETURN(dw_pixmap_grab, HPIXMAP)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7278 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, id, ULONG)
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7279 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7280 HPIXMAP pixmap = 0;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7281
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7282 if((pixmap = calloc(1,sizeof(struct _hpixmap))))
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7283 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7284 pixmap->pixbuf = gdk_pixbuf_copy(_dw_find_pixbuf((HICN)id, &pixmap->width, &pixmap->height));
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7285 pixmap->handle = handle;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7286 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7287 DW_FUNCTION_RETURN_THIS(pixmap);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7288 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7289
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7290 static void _dw_flush_dirty(gpointer widget, gpointer data)
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7291 {
2340 d797d1cec06b GTK4: Remove some debug code and safety checks in new dw_flush() code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2339 diff changeset	7292 if(widget && GTK_IS_WIDGET(widget))
d797d1cec06b GTK4: Remove some debug code and safety checks in new dw_flush() code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2339 diff changeset	7293 gtk_widget_queue_draw(GTK_WIDGET(widget));
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7294 }
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7295
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7296 /* Call this after drawing to the screen to make sure
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7297 * anything you have drawn is visible.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7298 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7299 DW_FUNCTION_DEFINITION(dw_flush, void)
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7300 DW_FUNCTION_ADD_PARAM
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7301 DW_FUNCTION_NO_RETURN(dw_flush)
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7302 {
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7303 g_list_foreach(_dw_dirty_list, _dw_flush_dirty, NULL);
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7304 g_list_free(_dw_dirty_list);
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7305 _dw_dirty_list = NULL;
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7306 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7307 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7308
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7309 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7310 * Sets the font used by a specified pixmap.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7311 * Normally the pixmap font is obtained from the associated window handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7312 * However this can be used to override that, or for pixmaps with no window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7313 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7314 * pixmap: Handle to a pixmap returned by dw_pixmap_new() or
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7315 * passed to the application via a callback.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7316 * fontname: Name and size of the font in the form "size.fontname"
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7317 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7318 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7319 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7320 int API dw_pixmap_set_font(HPIXMAP pixmap, const char *fontname)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7321 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7322 if(pixmap)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7323 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7324 char *oldfont = pixmap->font;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7325
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7326 pixmap->font = _dw_convert_font(fontname);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7327
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7328 if(oldfont)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7329 free(oldfont);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7330 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7331 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7332 return DW_ERROR_GENERAL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7333 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7334
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7335 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7336 * Destroys an allocated pixmap.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7337 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7338 * pixmap: Handle to a pixmap returned by
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7339 * dw_pixmap_new..
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7340 */
2316 1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7341 DW_FUNCTION_DEFINITION(dw_pixmap_destroy, void, HPIXMAP pixmap)
1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7342 DW_FUNCTION_ADD_PARAM1(pixmap)
1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7343 DW_FUNCTION_NO_RETURN(dw_pixmap_destroy)
1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7344 DW_FUNCTION_RESTORE_PARAM1(pixmap, HPIXMAP)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7345 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7346 g_object_unref(G_OBJECT(pixmap->pixbuf));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7347 cairo_surface_destroy(pixmap->image);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7348 if(pixmap->font)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7349 free(pixmap->font);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7350 free(pixmap);
2316 1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7351 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7352 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7353
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7354 /*
2950 0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7355 * Returns the width of the pixmap, same as the DW_PIXMAP_WIDTH() macro,
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7356 * but exported as an API, for non-C language bindings.
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7357 */
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7358 unsigned long API dw_pixmap_get_width(HPIXMAP pixmap)
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7359 {
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7360 return pixmap ? pixmap->width : 0;
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7361 }
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7362
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7363 /*
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7364 * Returns the height of the pixmap, same as the DW_PIXMAP_HEIGHT() macro,
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7365 * but exported as an API, for non-C language bindings.
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7366 */
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7367 unsigned long API dw_pixmap_get_height(HPIXMAP pixmap)
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7368 {
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7369 return pixmap ? pixmap->height : 0;
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7370 }
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7371
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2947 diff changeset	7372 /*
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7373 * Copies from one item to another.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7374 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7375 * dest: Destination window handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7376 * destp: Destination pixmap. (choose only one).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7377 * xdest: X coordinate of destination.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7378 * ydest: Y coordinate of destination.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7379 * width: Width of area to copy.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7380 * height: Height of area to copy.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7381 * src: Source window handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7382 * srcp: Source pixmap. (choose only one).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7383 * xsrc: X coordinate of source.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7384 * ysrc: Y coordinate of source.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7385 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7386 void API dw_pixmap_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7387 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7388 dw_pixmap_stretch_bitblt(dest, destp, xdest, ydest, width, height, src, srcp, xsrc, ysrc, -1, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7389 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7390
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7391 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7392 * Copies from one surface to another allowing for stretching.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7393 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7394 * dest: Destination window handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7395 * destp: Destination pixmap. (choose only one).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7396 * xdest: X coordinate of destination.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7397 * ydest: Y coordinate of destination.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7398 * width: Width of the target area.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7399 * height: Height of the target area.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7400 * src: Source window handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7401 * srcp: Source pixmap. (choose only one).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7402 * xsrc: X coordinate of source.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7403 * ysrc: Y coordinate of source.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7404 * srcwidth: Width of area to copy.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7405 * srcheight: Height of area to copy.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7406 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7407 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7408 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7409 DW_FUNCTION_DEFINITION(dw_pixmap_stretch_bitblt, int, HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc, int srcwidth, int srcheight)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7410 DW_FUNCTION_ADD_PARAM12(dest, destp, xdest, ydest, width, height, src, srcp, xsrc, ysrc, srcwidth, srcheight)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7411 DW_FUNCTION_RETURN(dw_pixmap_stretch_bitblt, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7412 DW_FUNCTION_RESTORE_PARAM12(dest, HWND, destp, HPIXMAP, xdest, int, ydest, int, width, int, height, int, src, HWND, srcp, HPIXMAP, xsrc, int, ysrc, int, srcwidth, int, srcheight, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7413
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7414 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7415 cairo_t *cr = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7416 int retval = DW_ERROR_GENERAL;
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	7417 int cached = FALSE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7418
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7419 if(dest)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7420 {
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	7421 cairo_surface_t *surface;
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	7422
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7423 if((cr = _dw_cairo_update(dest, -1, -1)))
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	7424 cached = TRUE;
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	7425 else if((surface = g_object_get_data(G_OBJECT(dest), "_dw_cr_surface")))
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	7426 cr = cairo_create(surface);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7427 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7428 else if(destp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7429 cr = cairo_create(destp->image);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7430
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7431 if(cr)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7432 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7433 double xscale = 1, yscale = 1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7434
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7435 if(srcwidth != -1 && srcheight != -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7436 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7437 xscale = (double)width / (double)srcwidth;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7438 yscale = (double)height / (double)srcheight;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7439 cairo_scale(cr, xscale, yscale);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7440 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7441
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7442 if(src)
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7443 {
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7444 cairo_surface_t *surface = g_object_get_data(G_OBJECT(src), "_dw_cr_surface");
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7445 if(surface)
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	7446 cairo_set_source_surface(cr, surface, (xdest + xsrc) / xscale, (ydest + ysrc) / yscale);
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7447 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7448 else if(srcp)
2362 4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	7449 cairo_set_source_surface(cr, srcp->image, (xdest + xsrc) / xscale, (ydest + ysrc) / yscale);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7450
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7451 cairo_rectangle(cr, xdest / xscale, ydest / yscale, width, height);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7452 cairo_fill(cr);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7453 /* If we are using a drawing context...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7454 * we don't own the cairo context so don't destroy it.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7455 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7456 if(!cached)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7457 cairo_destroy(cr);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7458 retval = DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7459 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7460 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7461 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7462
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7463 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7464 * Emits a beep.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7465 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7466 * freq: Frequency.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7467 * dur: Duration.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7468 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7469 void API dw_beep(int freq, int dur)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7470 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7471 gdk_display_beep(gdk_display_get_default());
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7472 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7473
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7474 void _dw_strlwr(char *buf)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7475 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7476 int z, len = strlen(buf);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7477
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7478 for(z=0;z<len;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7479 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7480 if(buf[z] >= 'A' && buf[z] <= 'Z')
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7481 buf[z] -= 'A' - 'a';
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7482 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7483 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7484
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7485 /* Open a shared library and return a handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7486 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7487 * name: Base name of the shared library.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7488 * handle: Pointer to a module handle,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7489 * will be filled in with the handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7490 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7491 int API dw_module_load(const char name, HMOD handle)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7492 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7493 int len;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7494 char *newname;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7495 char errorbuf[1025] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7496
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7497
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7498 if(!handle)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7499 return -1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7500
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7501 if((len = strlen(name)) == 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7502 return -1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7503
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7504 /* Lenth + "lib" + ".so" + NULL */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7505 newname = malloc(len + 7);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7506
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7507 if(!newname)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7508 return -1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7509
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7510 sprintf(newname, "lib%s.so", name);
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7511 _dw_strlwr(newname);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7512
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7513 *handle = dlopen(newname, RTLD_NOW);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7514 if(*handle == NULL)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7515 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7516 strncpy(errorbuf, dlerror(), 1024);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7517 printf("%s\n", errorbuf);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7518 sprintf(newname, "lib%s.so", name);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7519 *handle = dlopen(newname, RTLD_NOW);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7520 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7521
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7522 free(newname);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7523
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7524 return (NULL == *handle) ? -1 : 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7525 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7526
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7527 /* Queries the address of a symbol within open handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7528 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7529 * handle: Module handle returned by dw_module_load()
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7530 * name: Name of the symbol you want the address of.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7531 * func: A pointer to a function pointer, to obtain
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7532 * the address.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7533 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7534 int API dw_module_symbol(HMOD handle, const char name, void*func)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7535 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7536 if(!func \|\| !name)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7537 return -1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7538
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7539 if(strlen(name) == 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7540 return -1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7541
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7542 func = (void)dlsym(handle, name);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7543 return (NULL == *func);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7544 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7545
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7546 /* Frees the shared library previously opened.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7547 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7548 * handle: Module handle returned by dw_module_load()
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7549 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7550 int API dw_module_close(HMOD handle)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7551 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7552 if(handle)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7553 return dlclose(handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7554 return 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7555 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7556
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7557 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7558 * Returns the handle to an unnamed mutex semaphore.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7559 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7560 HMTX API dw_mutex_new(void)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7561 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7562 HMTX mutex = malloc(sizeof(pthread_mutex_t));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7563
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7564 pthread_mutex_init(mutex, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7565 return mutex;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7566 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7567
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7568 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7569 * Closes a semaphore created by dw_mutex_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7570 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7571 * mutex: The handle to the mutex returned by dw_mutex_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7572 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7573 void API dw_mutex_close(HMTX mutex)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7574 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7575 if(mutex)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7576 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7577 pthread_mutex_destroy(mutex);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7578 free(mutex);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7579 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7580 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7581
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7582 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7583 * Tries to gain access to the semaphore, if it can't it blocks.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7584 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7585 * mutex: The handle to the mutex returned by dw_mutex_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7586 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7587 void API dw_mutex_lock(HMTX mutex)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7588 {
2338 b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7589 /* We need to handle locks from the main thread differently...
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7590 * since we can't stop message processing... otherwise we
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7591 * will deadlock... so try to acquire the lock and continue
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7592 * processing messages in between tries.
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7593 */
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7594 if(_dw_thread == pthread_self())
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7595 {
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7596 while(pthread_mutex_trylock(mutex) != 0)
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7597 {
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7598 /* Process any pending events */
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7599 if(g_main_context_pending(NULL))
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7600 {
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7601 do
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7602 {
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7603 g_main_context_iteration(NULL, FALSE);
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7604 }
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7605 while(g_main_context_pending(NULL));
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7606 }
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7607 else
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7608 sched_yield();
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7609 }
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7610 }
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7611 else
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7612 {
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7613 pthread_mutex_lock(mutex);
b9b10bb1f689 GTK4: Port dw_mutex_lock() fix from Mac since the GTK4 thread safety is bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2337 diff changeset	7614 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7615 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7616
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7617 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7618 * Tries to gain access to the semaphore.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7619 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7620 * mutex: The handle to the mutex returned by dw_mutex_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7621 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7622 * DW_ERROR_NONE on success, DW_ERROR_TIMEOUT if it is already locked.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7623 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7624 int API dw_mutex_trylock(HMTX mutex)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7625 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7626 if(pthread_mutex_trylock(mutex) == 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7627 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7628 return DW_ERROR_TIMEOUT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7629 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7630
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7631 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7632 * Reliquishes the access to the semaphore.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7633 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7634 * mutex: The handle to the mutex returned by dw_mutex_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7635 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7636 void API dw_mutex_unlock(HMTX mutex)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7637 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7638 pthread_mutex_unlock(mutex);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7639 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7640
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7641 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7642 * Returns the handle to an unnamed event semaphore.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7643 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7644 HEV API dw_event_new(void)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7645 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7646 HEV eve = (HEV)malloc(sizeof(struct _dw_unix_event));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7647
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7648 if(!eve)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7649 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7650
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7651 /* We need to be careful here, mutexes on Linux are
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7652 * FAST by default but are error checking on other
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7653 * systems such as FreeBSD and OS/2, perhaps others.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7654 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7655 pthread_mutex_init (&(eve->mutex), NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7656 pthread_mutex_lock (&(eve->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7657 pthread_cond_init (&(eve->event), NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7658
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7659 pthread_mutex_unlock (&(eve->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7660 eve->alive = 1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7661 eve->posted = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7662
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7663 return eve;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7664 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7665
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7666 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7667 * Resets a semaphore created by dw_event_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7668 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7669 * eve: The handle to the event returned by dw_event_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7670 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7671 int API dw_event_reset (HEV eve)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7672 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7673 if(!eve)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7674 return DW_ERROR_NON_INIT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7675
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7676 pthread_mutex_lock (&(eve->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7677 pthread_cond_broadcast (&(eve->event));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7678 pthread_cond_init (&(eve->event), NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7679 eve->posted = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7680 pthread_mutex_unlock (&(eve->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7681 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7682 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7683
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7684 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7685 * Posts a semaphore created by dw_event_new(). Causing all threads
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7686 * waiting on this event in dw_event_wait to continue.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7687 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7688 * eve: The handle to the event returned by dw_event_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7689 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7690 int API dw_event_post (HEV eve)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7691 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7692 if(!eve)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7693 return DW_ERROR_NON_INIT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7694
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7695 pthread_mutex_lock (&(eve->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7696 pthread_cond_broadcast (&(eve->event));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7697 eve->posted = 1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7698 pthread_mutex_unlock (&(eve->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7699 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7700 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7701
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7702 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7703 * Waits on a semaphore created by dw_event_new(), until the
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7704 * event gets posted or until the timeout expires.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7705 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7706 * eve: The handle to the event returned by dw_event_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7707 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7708 int API dw_event_wait(HEV eve, unsigned long timeout)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7709 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7710 int rc;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7711
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7712 if(!eve)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7713 return DW_ERROR_NON_INIT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7714
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7715 pthread_mutex_lock (&(eve->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7716
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7717 if(eve->posted)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7718 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7719 pthread_mutex_unlock (&(eve->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7720 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7721 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7722
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7723 if(timeout != -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7724 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7725 struct timeval now;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7726 struct timespec timeo;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7727
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7728 gettimeofday(&now, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7729 timeo.tv_sec = now.tv_sec + (timeout / 1000);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7730 timeo.tv_nsec = now.tv_usec * 1000;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7731 rc = pthread_cond_timedwait(&(eve->event), &(eve->mutex), &timeo);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7732 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7733 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7734 rc = pthread_cond_wait(&(eve->event), &(eve->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7735
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7736 pthread_mutex_unlock (&(eve->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7737 if(!rc)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7738 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7739 if(rc == ETIMEDOUT)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7740 return DW_ERROR_TIMEOUT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7741 return DW_ERROR_GENERAL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7742 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7743
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7744 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7745 * Closes a semaphore created by dw_event_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7746 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7747 * eve: The handle to the event returned by dw_event_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7748 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7749 int API dw_event_close(HEV *eve)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7750 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7751 if(!eve \|\| !(*eve))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7752 return DW_ERROR_NON_INIT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7753
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7754 pthread_mutex_lock (&((*eve)->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7755 pthread_cond_destroy (&((*eve)->event));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7756 pthread_mutex_unlock (&((*eve)->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7757 pthread_mutex_destroy (&((*eve)->mutex));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7758 free(*eve);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7759 *eve = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7760
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7761 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7762 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7763
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7764 struct _dw_seminfo {
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7765 int fd;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7766 int waiting;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7767 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7768
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7769 static void _dw_handle_sem(int *tmpsock)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7770 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7771 fd_set rd;
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7772 struct _dw_seminfo array = (struct _dw_seminfo )malloc(sizeof(struct _dw_seminfo));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7773 int listenfd = tmpsock[0];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7774 int bytesread, connectcount = 1, maxfd, z, posted = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7775 char command;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7776 sigset_t mask;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7777
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7778 sigfillset(&mask); /* Mask all allowed signals */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7779 pthread_sigmask(SIG_BLOCK, &mask, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7780
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7781 /* problems */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7782 if(tmpsock[1] == -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7783 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7784 free(array);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7785 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7786 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7787
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7788 array[0].fd = tmpsock[1];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7789 array[0].waiting = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7790
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7791 /* Free the memory allocated in dw_named_event_new. */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7792 free(tmpsock);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7793
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7794 while(1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7795 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7796 FD_ZERO(&rd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7797 FD_SET(listenfd, &rd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7798 int DW_UNUSED(result);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7799
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7800 maxfd = listenfd;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7801
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7802 /* Added any connections to the named event semaphore */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7803 for(z=0;z<connectcount;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7804 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7805 if(array[z].fd > maxfd)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7806 maxfd = array[z].fd;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7807
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7808 FD_SET(array[z].fd, &rd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7809 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7810
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7811 if(select(maxfd+1, &rd, NULL, NULL, NULL) == -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7812 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7813 free(array);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7814 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7815 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7816
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7817 if(FD_ISSET(listenfd, &rd))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7818 {
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7819 struct _dw_seminfo *newarray;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7820 int newfd = accept(listenfd, 0, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7821
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7822 if(newfd > -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7823 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7824 /* Add new connections to the set */
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7825 newarray = (struct _dw_seminfo )malloc(sizeof(struct _dw_seminfo)(connectcount+1));
eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7826 memcpy(newarray, array, sizeof(struct _dw_seminfo)*(connectcount));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7827
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7828 newarray[connectcount].fd = newfd;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7829 newarray[connectcount].waiting = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7830
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7831 connectcount++;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7832
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7833 /* Replace old array with new one */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7834 free(array);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7835 array = newarray;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7836 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7837 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7838
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7839 /* Handle any events posted to the semaphore */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7840 for(z=0;z<connectcount;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7841 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7842 if(FD_ISSET(array[z].fd, &rd))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7843 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7844 if((bytesread = read(array[z].fd, &command, 1)) < 1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7845 {
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7846 struct _dw_seminfo *newarray;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7847
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7848 /* Remove this connection from the set */
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7849 newarray = (struct _dw_seminfo )malloc(sizeof(struct _dw_seminfo)(connectcount-1));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7850 if(!z)
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7851 memcpy(newarray, &array[1], sizeof(struct _dw_seminfo)*(connectcount-1));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7852 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7853 {
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7854 memcpy(newarray, array, sizeof(struct _dw_seminfo)*z);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7855 if(z!=(connectcount-1))
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	7856 memcpy(&newarray[z], &array[z+1], sizeof(struct _dw_seminfo)*(connectcount-(z+1)));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7857 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7858 connectcount--;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7859
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7860 /* Replace old array with new one */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7861 free(array);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7862 array = newarray;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7863 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7864 else if(bytesread == 1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7865 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7866 switch(command)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7867 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7868 case 0:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7869 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7870 /* Reset */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7871 posted = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7872 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7873 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7874 case 1:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7875 /* Post */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7876 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7877 int s;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7878 char tmp = (char)0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7879
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7880 posted = 1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7881
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7882 for(s=0;s<connectcount;s++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7883 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7884 /* The semaphore has been posted so
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7885 * we tell all the waiting threads to
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7886 * continue.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7887 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7888 if(array[s].waiting)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7889 result = write(array[s].fd, &tmp, 1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7890 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7891 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7892 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7893 case 2:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7894 /* Wait */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7895 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7896 char tmp = (char)0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7897
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7898 array[z].waiting = 1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7899
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7900 /* If we are posted exit immeditately */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7901 if(posted)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7902 result = write(array[z].fd, &tmp, 1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7903 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7904 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7905 case 3:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7906 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7907 /* Done Waiting */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7908 array[z].waiting = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7909 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7910 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7911 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7912 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7913 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7914 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7915 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7916 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7917
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7918 /* Using domain sockets on unix for IPC */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7919 /* Create a named event semaphore which can be
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7920 * opened from other processes.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7921 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7922 * eve: Pointer to an event handle to receive handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7923 * name: Name given to semaphore which can be opened
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7924 * by other processes.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7925 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7926 HEV API dw_named_event_new(const char *name)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7927 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7928 struct sockaddr_un un;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7929 int ev, tmpsock = (int )malloc(sizeof(int)*2);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7930 DWTID dwthread;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7931
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7932 if(!tmpsock)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7933 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7934
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7935 tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7936 ev = socket(AF_UNIX, SOCK_STREAM, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7937 memset(&un, 0, sizeof(un));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7938 un.sun_family=AF_UNIX;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7939 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7940 strcpy(un.sun_path, "/tmp/.dw/");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7941 strcat(un.sun_path, name);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7942
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7943 /* just to be safe, this should be changed
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7944 * to support multiple instances.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7945 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7946 remove(un.sun_path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7947
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7948 bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7949 listen(tmpsock[0], 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7950 connect(ev, (struct sockaddr *)&un, sizeof(un));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7951 tmpsock[1] = accept(tmpsock[0], 0, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7952
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7953 if(tmpsock[0] < 0 \|\| tmpsock[1] < 0 \|\| ev < 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7954 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7955 if(tmpsock[0] > -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7956 close(tmpsock[0]);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7957 if(tmpsock[1] > -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7958 close(tmpsock[1]);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7959 if(ev > -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7960 close(ev);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7961 free(tmpsock);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7962 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7963 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7964
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7965 /* Create a thread to handle this event semaphore */
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7966 pthread_create(&dwthread, NULL, (void )_dw_handle_sem, (void )tmpsock);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7967 return GINT_TO_POINTER(ev);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7968 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7969
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7970 /* Open an already existing named event semaphore.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7971 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7972 * eve: Pointer to an event handle to receive handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7973 * name: Name given to semaphore which can be opened
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7974 * by other processes.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7975 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7976 HEV API dw_named_event_get(const char *name)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7977 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7978 struct sockaddr_un un;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7979 int ev = socket(AF_UNIX, SOCK_STREAM, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7980 if(ev < 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7981 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7982
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7983 un.sun_family=AF_UNIX;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7984 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7985 strcpy(un.sun_path, "/tmp/.dw/");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7986 strcat(un.sun_path, name);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7987 connect(ev, (struct sockaddr *)&un, sizeof(un));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7988 return GINT_TO_POINTER(ev);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7989 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7990
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7991 /* Resets the event semaphore so threads who call wait
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7992 * on this semaphore will block.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7993 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7994 * eve: Handle to the semaphore obtained by
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7995 * an open or create call.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7996 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	7997 int API dw_named_event_reset(HEV eve)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7998 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7999 /* signal reset */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8000 char tmp = (char)0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8001
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8002 if(GPOINTER_TO_INT(eve) < 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8003 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8004
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8005 if(write(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8006 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8007 return DW_ERROR_GENERAL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8008 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8009
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8010 /* Sets the posted state of an event semaphore, any threads
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8011 * waiting on the semaphore will no longer block.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8012 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8013 * eve: Handle to the semaphore obtained by
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8014 * an open or create call.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8015 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8016 int API dw_named_event_post(HEV eve)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8017 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8018
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8019 /* signal post */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8020 char tmp = (char)1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8021
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8022 if(GPOINTER_TO_INT(eve) < 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8023 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8024
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8025 if(write(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8026 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8027 return DW_ERROR_GENERAL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8028 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8029
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8030 /* Waits on the specified semaphore until it becomes
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8031 * posted, or returns immediately if it already is posted.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8032 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8033 * eve: Handle to the semaphore obtained by
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8034 * an open or create call.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8035 * timeout: Number of milliseconds before timing out
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8036 * or -1 if indefinite.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8037 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8038 int API dw_named_event_wait(HEV eve, unsigned long timeout)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8039 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8040 fd_set rd;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8041 struct timeval tv, *useme = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8042 int retval = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8043 char tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8044
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8045 if(GPOINTER_TO_INT(eve) < 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8046 return DW_ERROR_NON_INIT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8047
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8048 /* Set the timout or infinite */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8049 if(timeout != -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8050 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8051 tv.tv_sec = timeout / 1000;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8052 tv.tv_usec = timeout % 1000;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8053
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8054 useme = &tv;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8055 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8056
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8057 FD_ZERO(&rd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8058 FD_SET(GPOINTER_TO_INT(eve), &rd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8059
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8060 /* Signal wait */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8061 tmp = (char)2;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8062 retval = write(GPOINTER_TO_INT(eve), &tmp, 1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8063
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8064 if(retval == 1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8065 retval = select(GPOINTER_TO_INT(eve)+1, &rd, NULL, NULL, useme);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8066
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8067 /* Signal done waiting. */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8068 tmp = (char)3;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8069 if(retval == 1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8070 retval = write(GPOINTER_TO_INT(eve), &tmp, 1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8071
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8072 if(retval == 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8073 return DW_ERROR_TIMEOUT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8074 else if(retval == -1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8075 return DW_ERROR_INTERRUPT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8076
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8077 /* Clear the entry from the pipe so
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8078 * we don't loop endlessly. :)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8079 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8080 if(read(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8081 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8082 return DW_ERROR_GENERAL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8083 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8084
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8085 /* Release this semaphore, if there are no more open
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8086 * handles on this semaphore the semaphore will be destroyed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8087 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8088 * eve: Handle to the semaphore obtained by
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8089 * an open or create call.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8090 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8091 int API dw_named_event_close(HEV eve)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8092 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8093 /* Finally close the domain socket,
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	8094 * cleanup will continue in _dw_handle_sem.
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8095 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8096 close(GPOINTER_TO_INT(eve));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8097 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8098 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8099
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8100 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8101 * Generally an internal function called from a newly created
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8102 * thread to setup the Dynamic Windows environment for the thread.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8103 * However it is exported so language bindings can call it when
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8104 * they create threads that require access to Dynamic Windows.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8105 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8106 void API _dw_init_thread(void)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8107 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8108 GdkRGBA *foreground = malloc(sizeof(GdkRGBA));
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8109 HEV event = dw_event_new();
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8110
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8111 foreground->alpha = foreground->red = foreground->green = foreground->blue = 0.0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8112 pthread_setspecific(_dw_fg_color_key, foreground);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8113 pthread_setspecific(_dw_bg_color_key, NULL);
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8114 pthread_setspecific(_dw_event_key, event);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8115 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8116
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8117 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8118 * Generally an internal function called from a terminating
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8119 * thread to cleanup the Dynamic Windows environment for the thread.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8120 * However it is exported so language bindings can call it when
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8121 * they exit threads that require access to Dynamic Windows.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8122 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8123 void API _dw_deinit_thread(void)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8124 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8125 GdkRGBA foreground, background;
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8126 HEV event;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8127
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8128 if((foreground = pthread_getspecific(_dw_fg_color_key)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8129 free(foreground);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8130 if((background = pthread_getspecific(_dw_bg_color_key)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8131 free(background);
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8132 if((event = pthread_getspecific(_dw_event_key)))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8133 dw_event_close(&event);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8134 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8135
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8136 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8137 * Setup thread independent color sets.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8138 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8139 void _dwthreadstart(void *data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8140 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8141 void (threadfunc)(void ) = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8142 void tmp = (void )data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8143
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8144 threadfunc = (void ()(void ))tmp[0];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8145
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8146 /* Initialize colors */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8147 _dw_init_thread();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8148
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8149 threadfunc(tmp[1]);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8150 free(tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8151
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8152 /* Free colors */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8153 _dw_deinit_thread();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8154 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8155
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8156 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8157 * Allocates a shared memory region with a name.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8158 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8159 * handle: A pointer to receive a SHM identifier.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8160 * dest: A pointer to a pointer to receive the memory address.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8161 * size: Size in bytes of the shared memory region to allocate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8162 * name: A string pointer to a unique memory name.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8163 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8164 HSHM API dw_named_memory_new(void *dest, int size, const char name)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8165 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8166 char namebuf[1025];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8167 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8168
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8169 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8170 snprintf(namebuf, 1024, "/tmp/.dw/%s", name);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8171
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8172 if((handle->fd = open(namebuf, O_CREAT \| O_RDWR, S_IRUSR \| S_IWUSR)) < 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8173 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8174 free(handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8175 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8176 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8177
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8178 if(ftruncate(handle->fd, size))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8179 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8180 close(handle->fd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8181 free(handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8182 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8183 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8184
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8185 /* attach the shared memory segment to our process's address space. */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8186 *dest = mmap(NULL, size, PROT_READ \| PROT_WRITE, MAP_SHARED, handle->fd, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8187
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8188 if(*dest == MAP_FAILED)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8189 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8190 close(handle->fd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8191 *dest = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8192 free(handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8193 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8194 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8195
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8196 handle->size = size;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8197 handle->sid = getsid(0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8198 handle->path = strdup(namebuf);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8199
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8200 return handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8201 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8202
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8203 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8204 * Aquires shared memory region with a name.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8205 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8206 * dest: A pointer to a pointer to receive the memory address.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8207 * size: Size in bytes of the shared memory region to requested.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8208 * name: A string pointer to a unique memory name.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8209 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8210 HSHM API dw_named_memory_get(void *dest, int size, const char name)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8211 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8212 char namebuf[1025];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8213 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8214
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8215 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8216 snprintf(namebuf, 1024, "/tmp/.dw/%s", name);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8217
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8218 if((handle->fd = open(namebuf, O_RDWR)) < 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8219 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8220 free(handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8221 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8222 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8223
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8224 /* attach the shared memory segment to our process's address space. */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8225 *dest = mmap(NULL, size, PROT_READ \| PROT_WRITE, MAP_SHARED, handle->fd, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8226
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8227 if(*dest == MAP_FAILED)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8228 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8229 close(handle->fd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8230 *dest = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8231 free(handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8232 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8233 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8234
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8235 handle->size = size;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8236 handle->sid = -1;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8237 handle->path = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8238
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8239 return handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8240 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8241
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8242 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8243 * Frees a shared memory region previously allocated.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8244 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8245 * handle: Handle obtained from DB_named_memory_allocate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8246 * ptr: The memory address aquired with DB_named_memory_allocate.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8247 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8248 int API dw_named_memory_free(HSHM handle, void *ptr)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8249 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8250 struct _dw_unix_shm *h = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8251 int rc = munmap(ptr, h->size);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8252
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8253 close(h->fd);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8254 if(h->path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8255 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8256 /* Only remove the actual file if we are the
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8257 * creator of the file.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8258 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8259 if(h->sid != -1 && h->sid == getsid(0))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8260 remove(h->path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8261 free(h->path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8262 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8263 return rc;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8264 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8265 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8266 * Creates a new thread with a starting point of func.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8267 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8268 * func: Function which will be run in the new thread.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8269 * data: Parameter(s) passed to the function.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8270 * stack: Stack size of new thread (OS/2 and Windows only).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8271 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8272 DWTID API dw_thread_new(void func, void data, int stack)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8273 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8274 DWTID gtkthread;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8275 void *tmp = malloc(sizeof(void ) * 2);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8276 int rc;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8277
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8278 tmp[0] = func;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8279 tmp[1] = data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8280
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8281 rc = pthread_create(&gtkthread, NULL, (void )_dwthreadstart, (void )tmp);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8282 if ( rc == 0 )
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8283 return gtkthread;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8284 return (DWTID)DW_ERROR_UNKNOWN;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8285 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8286
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8287 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8288 * Ends execution of current thread immediately.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8289 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8290 void API dw_thread_end(void)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8291 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8292 pthread_exit(NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8293 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8294
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8295 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8296 * Returns the current thread's ID.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8297 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8298 DWTID API dw_thread_id(void)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8299 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8300 return (DWTID)pthread_self();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8301 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8302
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8303 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8304 * Cleanly terminates a DW session, should be signal handler safe.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8305 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8306 void API dw_shutdown(void)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8307 {
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	8308 g_main_loop_unref(_DWMainLoop);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8309 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8310
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8311 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8312 * Cleanly terminates a DW session, should be signal handler safe.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8313 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8314 * exitcode: Exit code reported to the operating system.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8315 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8316 void API dw_exit(int exitcode)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8317 {
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	8318 dw_shutdown();
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8319 exit(exitcode);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8320 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8321
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8322 /* Internal function to get the recommended size of scrolled items */
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	8323 void _dw_get_scrolled_size(GtkWidget item, gint thiswidth, gint *thisheight)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8324 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8325 GtkWidget *widget = g_object_get_data(G_OBJECT(item), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8326
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8327 thisheight = thiswidth = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8328
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8329 if(widget)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8330 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8331 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8332 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8333 /* Set to half for tree */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8334 *thiswidth = (int)((_DW_SCROLLED_MAX_WIDTH + _DW_SCROLLED_MIN_WIDTH)/2);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8335 *thisheight = (int)((_DW_SCROLLED_MAX_HEIGHT + _DW_SCROLLED_MIN_HEIGHT)/2);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8336 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8337 else if(GTK_IS_TEXT_VIEW(widget))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8338 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8339 unsigned long bytes;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8340 int height, width;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8341 char buf, ptr;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8342 int wrap = (gtk_text_view_get_wrap_mode(GTK_TEXT_VIEW(widget)) == GTK_WRAP_WORD);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8343 static char testtext[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8344 int hscrolled = FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8345
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8346 thiswidth = thisheight = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8347
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8348 dw_mle_get_size(item, &bytes, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8349
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8350 ptr = buf = alloca(bytes + 2);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8351 dw_mle_export(item, buf, 0, (int)bytes);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8352 buf[bytes] = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8353 strcat(buf, "\r");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8354
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8355 /* MLE */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8356 while((ptr = strstr(buf, "\r")))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8357 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8358 ptr[0] = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8359 width = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8360 if(strlen(buf))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8361 dw_font_text_extents_get(item, NULL, buf, &width, &height);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8362 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8363 dw_font_text_extents_get(item, NULL, testtext, NULL, &height);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8364
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8365 if(wrap && width > _DW_SCROLLED_MAX_WIDTH)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8366 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8367 *thiswidth = _DW_SCROLLED_MAX_WIDTH;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8368 thisheight += height (width / _DW_SCROLLED_MAX_WIDTH);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8369 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8370 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8371 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8372 if(width > *thiswidth)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8373 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8374 if(width > _DW_SCROLLED_MAX_WIDTH)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8375 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8376 *thiswidth = _DW_SCROLLED_MAX_WIDTH;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8377 hscrolled = TRUE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8378 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8379 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8380 *thiswidth = width;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8381 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8382 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8383 *thisheight += height;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8384 if(ptr[1] == '\n')
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8385 buf = &ptr[2];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8386 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8387 buf = &ptr[1];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8388 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8389 if(hscrolled)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8390 *thisheight += 10;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8391 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8392 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8393 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8394 gtk_widget_measure(GTK_WIDGET(widget), GTK_ORIENTATION_HORIZONTAL, -1, thiswidth, NULL, NULL, NULL);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8395 gtk_widget_measure(GTK_WIDGET(widget), GTK_ORIENTATION_VERTICAL, -1, thisheight, NULL, NULL, NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8396
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8397 *thisheight += 20;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8398 *thiswidth += 20;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8399 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8400 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8401 if(*thiswidth < _DW_SCROLLED_MIN_WIDTH)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8402 *thiswidth = _DW_SCROLLED_MIN_WIDTH;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8403 if(*thiswidth > _DW_SCROLLED_MAX_WIDTH)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8404 *thiswidth = _DW_SCROLLED_MAX_WIDTH;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8405 if(*thisheight < _DW_SCROLLED_MIN_HEIGHT)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8406 *thisheight = _DW_SCROLLED_MIN_HEIGHT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8407 if(*thisheight > _DW_SCROLLED_MAX_HEIGHT)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8408 *thisheight = _DW_SCROLLED_MAX_HEIGHT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8409 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8410
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8411 /* Internal box packing function called by the other 3 functions */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8412 void _dw_box_pack(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad, char *funcname)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8413 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	8414 GtkWidget tmp, tmpitem;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8415
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8416 if(!box)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8417 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8418
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8419 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8420 * If you try and pack an item into itself VERY bad things can happen; like at least an
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8421 * infinite loop on GTK! Lets be safe!
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8422 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8423 if(box == item)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8424 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8425 dw_messagebox(funcname, DW_MB_OK\|DW_MB_ERROR, "Danger! Danger! Will Robinson; box and item are the same!");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8426 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8427 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8428
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8429 /* If this is a special box, like: Window, Groupbox, Scrollbox...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8430 * get the internal box handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8431 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8432 if((tmp = g_object_get_data(G_OBJECT(box), "_dw_boxhandle")))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8433 box = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8434
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8435 /* Can't pack nothing with GTK, so create an empty label */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8436 if(!item)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8437 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8438 item = gtk_label_new("");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8439 g_object_set_data(G_OBJECT(item), "_dw_padding", GINT_TO_POINTER(1));
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8440 gtk_widget_show(item);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8441 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8442
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8443 /* Check if the item to be packed is a special box */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8444 tmpitem = (GtkWidget *)g_object_get_data(G_OBJECT(item), "_dw_boxhandle");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8445
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8446 /* Make sure our target box is valid */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8447 if(GTK_IS_GRID(box))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8448 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8449 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8450 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8451
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8452 /* If the item being packed is a box, then we use it's padding
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8453 * instead of the padding specified on the pack line, this is
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8454 * due to a bug in the OS/2 and Win32 renderer and a limitation
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8455 * of the GtkTable class.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8456 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8457 if(GTK_IS_GRID(item) \|\| (tmpitem && GTK_IS_GRID(tmpitem)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8458 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8459 /* NOTE: I left in the ability to pack boxes with a size,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8460 * this eliminates that by forcing the size to 0.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8461 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8462 height = width = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8463 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8464
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8465 /* Do some sanity bounds checking */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8466 if(index < 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8467 index = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8468 if(index > boxcount)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8469 index = boxcount;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8470
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8471 g_object_set_data(G_OBJECT(item), "_dw_table", box);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8472 /* Set the expand attribute on the widgets now instead of the container */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8473 gtk_widget_set_vexpand(item, vsize);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8474 gtk_widget_set_hexpand(item, hsize);
2367 0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	8475 /* Don't clobber the center alignment on pictures */
0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	8476 if(!GTK_IS_PICTURE(item))
0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	8477 {
0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	8478 gtk_widget_set_valign(item, vsize ? GTK_ALIGN_FILL : GTK_ALIGN_START);
0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	8479 gtk_widget_set_halign(item, hsize ? GTK_ALIGN_FILL : GTK_ALIGN_START);
0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	8480 }
2276 d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	8481 /* Set pad for each margin direction on the widget */
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	8482 _dw_widget_set_pad(item, pad);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8483 /* Add to the grid using insert...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8484 * rows for vertical boxes and columns for horizontal.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8485 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8486 if(boxtype == DW_VERT)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8487 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8488 gtk_grid_insert_row(GTK_GRID(box), index);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8489 gtk_grid_attach(GTK_GRID(box), item, 0, index, 1, 1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8490 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8491 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8492 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8493 gtk_grid_insert_column(GTK_GRID(box), index);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8494 gtk_grid_attach(GTK_GRID(box), item, index, 0, 1, 1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8495 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8496 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount + 1));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8497 /* Special case for scrolled windows */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8498 if(GTK_IS_SCROLLED_WINDOW(item))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8499 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8500 gint scrolledwidth = 0, scrolledheight = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8501
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8502 /* Pre-run the calculation code for MLE/Container/Tree if needed */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8503 if((width < 1 && !hsize) \|\| (height < 1 && !vsize))
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	8504 _dw_get_scrolled_size(item, &scrolledwidth, &scrolledheight);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8505
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8506 if(width > 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8507 gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(item), width);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8508 else if(!hsize)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8509 gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(item), scrolledwidth);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8510 if(height > 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8511 gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(item), height);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8512 else if(!vsize)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8513 gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(item), scrolledheight);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8514 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8515 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8516 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8517 /* Set the requested size of the widget */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8518 if(width == -1 && (GTK_IS_COMBO_BOX(item) \|\| GTK_IS_ENTRY(item)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8519 gtk_widget_set_size_request(item, 150, height);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8520 else if(width == -1 && GTK_IS_SPIN_BUTTON(item))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8521 gtk_widget_set_size_request(item, 50, height);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8522 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8523 gtk_widget_set_size_request(item, width, height);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8524 }
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8525 if(GTK_IS_TOGGLE_BUTTON(item))
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8526 {
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8527 GtkToggleButton groupstart = (GtkToggleButton )g_object_get_data(G_OBJECT(box), "_dw_group");
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8528
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8529 if(groupstart)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8530 gtk_toggle_button_set_group(GTK_TOGGLE_BUTTON(item), groupstart);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8531 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8532 g_object_set_data(G_OBJECT(box), "_dw_group", (gpointer)item);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8533 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8534 /* If we previously incremented the reference count... drop it now that it is packed */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8535 if(g_object_get_data(G_OBJECT(item), "_dw_refed"))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8536 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8537 g_object_unref(G_OBJECT(item));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8538 g_object_set_data(G_OBJECT(item), "_dw_refed", NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8539 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8540 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8541 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8542
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8543 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8544 * Remove windows (widgets) from the box they are packed into.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8545 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8546 * handle: Window handle of the packed item to be removed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8547 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8548 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8549 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8550 DW_FUNCTION_DEFINITION(dw_box_unpack, int, HWND handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8551 DW_FUNCTION_ADD_PARAM1(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8552 DW_FUNCTION_RETURN(dw_box_unpack, int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8553 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8554 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8555 int retcode = DW_ERROR_GENERAL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8556
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8557 if(GTK_IS_WIDGET(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8558 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8559 GtkWidget box, handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8560
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8561 /* Check if we are removing a widget from a box */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8562 if((box = gtk_widget_get_parent(handle2)) && GTK_IS_GRID(box))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8563 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8564 /* Get the number of items in the box... */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8565 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8566 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8567
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8568 if(boxcount > 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8569 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8570 /* Decrease the count by 1 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8571 boxcount--;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8572 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8573 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8574 /* If we haven't incremented the reference count... raise it before removal */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8575 if(!g_object_get_data(G_OBJECT(handle2), "_dw_refed"))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8576 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8577 g_object_ref(G_OBJECT(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8578 g_object_set_data(G_OBJECT(handle2), "_dw_refed", GINT_TO_POINTER(1));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8579 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8580 /* Remove the widget from the box */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8581 /* Figure out where in the grid this widget is and remove that row/column */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8582 if(boxtype == DW_VERT)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8583 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8584 int z;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8585
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8586 for(z=0;z<boxcount;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8587 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8588 if(gtk_grid_get_child_at(GTK_GRID(box), 0, z) == handle2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8589 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8590 gtk_grid_remove_row(GTK_GRID(box), z);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8591 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8592 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8593 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8594 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8595 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8596 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8597 int z;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8598
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8599 for(z=0;z<boxcount;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8600 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8601 if(gtk_grid_get_child_at(GTK_GRID(box), z, 0) == handle2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8602 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8603 gtk_grid_remove_column(GTK_GRID(box), z);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8604 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8605 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8606 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8607 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8608 retcode = DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8609 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8610 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8611 DW_FUNCTION_RETURN_THIS(retcode);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8612 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8613
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8614 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8615 * Remove windows (widgets) from a box at an arbitrary location.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8616 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8617 * box: Window handle of the box to be removed from.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8618 * index: 0 based index of packed items.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8619 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8620 * Handle to the removed item on success, 0 on failure or padding.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8621 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8622 DW_FUNCTION_DEFINITION(dw_box_unpack_at_index, HWND, HWND box, int index)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8623 DW_FUNCTION_ADD_PARAM2(box, index)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8624 DW_FUNCTION_RETURN(dw_box_unpack_at_index, HWND)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8625 DW_FUNCTION_RESTORE_PARAM2(box, HWND, index, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8626 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8627 HWND retval = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8628
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8629 /* Check if we are removing a widget from a box */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8630 if(GTK_IS_GRID(box))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8631 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8632 /* Get the number of items in the box... */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8633 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8634 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8635 GtkWidget *item = (boxtype == DW_VERT) ? gtk_grid_get_child_at(GTK_GRID(box), 0, index) : gtk_grid_get_child_at(GTK_GRID(box), index, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8636
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8637 if(boxcount > 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8638 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8639 /* Decrease the count by 1 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8640 boxcount--;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8641 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8642 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8643 /* If we haven't incremented the reference count... raise it before removal */
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	8644 if(item && g_object_get_data(G_OBJECT(item), "_dw_padding") && GTK_IS_WIDGET(item))
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	8645 g_object_unref(G_OBJECT(item));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8646 else if(item)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8647 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8648 if(!g_object_get_data(G_OBJECT(item), "_dw_refed"))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8649 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8650 g_object_ref(G_OBJECT(item));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8651 g_object_set_data(G_OBJECT(item), "_dw_refed", GINT_TO_POINTER(1));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8652 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8653 /* Remove the widget from the box */
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8654 gtk_grid_remove(GTK_GRID(box), item);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8655 if(boxtype == DW_VERT)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8656 gtk_grid_remove_row(GTK_GRID(box), index);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8657 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8658 gtk_grid_remove_column(GTK_GRID(box), index);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8659 retval = item;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8660 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8661 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8662 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8663 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8664
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8665 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8666 * Pack windows (widgets) into a box at an arbitrary location.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8667 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8668 * box: Window handle of the box to be packed into.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8669 * item: Window handle of the item to pack.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8670 * index: 0 based index of packed items.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8671 * width: Width in pixels of the item or -1 to be self determined.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8672 * height: Height in pixels of the item or -1 to be self determined.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8673 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8674 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8675 * pad: Number of pixels of padding around the item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8676 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8677 DW_FUNCTION_DEFINITION(dw_box_pack_at_index, void, HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8678 DW_FUNCTION_ADD_PARAM8(box, item, index, width, height, hsize, vsize, pad)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8679 DW_FUNCTION_NO_RETURN(dw_box_pack_at_index)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8680 DW_FUNCTION_RESTORE_PARAM8(box, HWND, item, HWND, index, int, width, int, height, int, hsize, int, vsize, int, pad, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8681 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8682 _dw_box_pack(box, item, index, width, height, hsize, vsize, pad, "dw_box_pack_at_index()");
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8683 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8684 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8685
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8686 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8687 * Pack windows (widgets) into a box from the start (or top).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8688 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8689 * box: Window handle of the box to be packed into.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8690 * item: Window handle of the item to pack.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8691 * width: Width in pixels of the item or -1 to be self determined.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8692 * height: Height in pixels of the item or -1 to be self determined.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8693 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8694 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8695 * pad: Number of pixels of padding around the item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8696 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8697 DW_FUNCTION_DEFINITION(dw_box_pack_start, void, HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8698 DW_FUNCTION_ADD_PARAM7(box, item, width, height, hsize, vsize, pad)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8699 DW_FUNCTION_NO_RETURN(dw_box_pack_start)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8700 DW_FUNCTION_RESTORE_PARAM7(box, HWND, item, HWND, width, int, height, int, hsize, int, vsize, int, pad, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8701 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8702 /* 65536 is the table limit on GTK...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8703 * seems like a high enough value we will never hit it here either.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8704 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8705 _dw_box_pack(box, item, 65536, width, height, hsize, vsize, pad, "dw_box_pack_start()");
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8706 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8707 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8708
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8709 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8710 * Pack windows (widgets) into a box from the end (or bottom).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8711 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8712 * box: Window handle of the box to be packed into.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8713 * item: Window handle of the item to pack.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8714 * width: Width in pixels of the item or -1 to be self determined.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8715 * height: Height in pixels of the item or -1 to be self determined.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8716 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8717 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8718 * pad: Number of pixels of padding around the item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8719 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8720 DW_FUNCTION_DEFINITION(dw_box_pack_end, void, HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8721 DW_FUNCTION_ADD_PARAM7(box, item, width, height, hsize, vsize, pad)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8722 DW_FUNCTION_NO_RETURN(dw_box_pack_end)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8723 DW_FUNCTION_RESTORE_PARAM7(box, HWND, item, HWND, width, int, height, int, hsize, int, vsize, int, pad, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8724 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8725 _dw_box_pack(box, item, 0, width, height, hsize, vsize, pad, "dw_box_pack_end()");
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8726 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8727 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8728
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8729 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8730 * Sets the size of a given window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8731 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8732 * handle: Window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8733 * width: New width in pixels.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8734 * height: New height in pixels.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8735 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8736 DW_FUNCTION_DEFINITION(dw_window_set_size, void, HWND handle, ULONG width, ULONG height)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8737 DW_FUNCTION_ADD_PARAM3(handle, width, height)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8738 DW_FUNCTION_NO_RETURN(dw_window_set_size)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8739 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, width, ULONG, height, ULONG)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8740 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8741 if(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8742 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8743 if(GTK_IS_WINDOW(handle))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8744 gtk_window_set_default_size(GTK_WINDOW(handle), width, height);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8745 else if(GTK_IS_WIDGET(handle))
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8746 gtk_widget_set_size_request(GTK_WIDGET(handle), width, height);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8747 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8748 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8749 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8750
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8751 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8752 * Gets the size the system thinks the widget should be.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8753 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8754 * handle: Window handle of the item to be back.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8755 * width: Width in pixels of the item or NULL if not needed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8756 * height: Height in pixels of the item or NULL if not needed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8757 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8758 DW_FUNCTION_DEFINITION(dw_window_get_preferred_size, void, HWND handle, int width, int height)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8759 DW_FUNCTION_ADD_PARAM3(handle, width, height)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8760 DW_FUNCTION_NO_RETURN(dw_window_get_preferred_size)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8761 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, width, int , height, int )
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8762 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8763 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8764 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8765 gint scrolledwidth, scrolledheight;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8766
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	8767 _dw_get_scrolled_size(handle, &scrolledwidth, &scrolledheight);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8768
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8769 if(width)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8770 *width = scrolledwidth;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8771 if(height)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8772 *height = scrolledheight;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8773 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8774 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8775 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8776 if(width)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8777 gtk_widget_measure(GTK_WIDGET(handle), GTK_ORIENTATION_HORIZONTAL, -1, width, NULL, NULL, NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8778 if(height)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8779 gtk_widget_measure(GTK_WIDGET(handle), GTK_ORIENTATION_VERTICAL, -1, height, NULL, NULL, NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8780 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8781 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8782 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8783
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8784 /* Internal version to simplify the code with multiple versions of GTK */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8785 int _dw_get_screen_width(void)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8786 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8787 GdkDisplay *display = gdk_display_get_default();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8788
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8789 if(display)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8790 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8791 GListModel *monitors = gdk_display_get_monitors(display);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8792 GdkMonitor *monitor = GDK_MONITOR(g_list_model_get_object(monitors, 0));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8793
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8794 if(monitor)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8795 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8796 GdkRectangle rc = { 0, 0, 0 ,0 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8797 gdk_monitor_get_geometry(monitor, &rc);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8798 return rc.width;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8799 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8800 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8801 return 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8802 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8803
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8804 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8805 * Returns the width of the screen.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8806 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8807 DW_FUNCTION_DEFINITION(dw_screen_width, int)
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8808 DW_FUNCTION_ADD_PARAM
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8809 DW_FUNCTION_RETURN(dw_screen_width, int)
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8810 {
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8811 int retval = _dw_get_screen_width();
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8812 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8813 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8814
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8815 /* Internal version to simplify the code with multiple versions of GTK */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8816 int _dw_get_screen_height(void)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8817 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8818 GdkDisplay *display = gdk_display_get_default();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8819
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8820 if(display)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8821 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8822 GListModel *monitors = gdk_display_get_monitors(display);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8823 GdkMonitor *monitor = GDK_MONITOR(g_list_model_get_object(monitors, 0));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8824
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8825 if(monitor)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8826 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8827 GdkRectangle rc = { 0, 0, 0 ,0 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8828 gdk_monitor_get_geometry(monitor, &rc);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8829 return rc.height;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8830 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8831 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8832 return 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8833 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8834
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8835 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8836 * Returns the height of the screen.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8837 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8838 DW_FUNCTION_DEFINITION(dw_screen_height, int)
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8839 DW_FUNCTION_ADD_PARAM
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8840 DW_FUNCTION_RETURN(dw_screen_height, int)
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8841 {
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8842 int retval = _dw_get_screen_height();
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8843 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8844 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8845
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8846 /* This should return the current color depth */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8847 unsigned long API dw_color_depth_get(void)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8848 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8849 /* TODO: Make this work on GTK4... with no GdkVisual */
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8850 return 32;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8851 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8852
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8853 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8854 * Sets the gravity of a given window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8855 * Gravity controls which corner of the screen and window the position is relative to.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8856 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8857 * handle: Window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8858 * horz: DW_GRAV_LEFT (default), DW_GRAV_RIGHT or DW_GRAV_CENTER.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8859 * vert: DW_GRAV_TOP (default), DW_GRAV_BOTTOM or DW_GRAV_CENTER.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8860 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8861 void API dw_window_set_gravity(HWND handle, int horz, int vert)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8862 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8863 dw_window_set_data(handle, "_dw_grav_horz", DW_INT_TO_POINTER(horz));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8864 dw_window_set_data(handle, "_dw_grav_vert", DW_INT_TO_POINTER(vert));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8865 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8866
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8867 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8868 * Sets the position of a given window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8869 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8870 * handle: Window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8871 * x: X location from the bottom left.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8872 * y: Y location from the bottom left.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8873 */
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8874 #ifndef GDK_WINDOWING_X11
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8875 void API dw_window_set_pos(HWND handle, long x, long y)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8876 {
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8877 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8878 #else
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8879 DW_FUNCTION_DEFINITION(dw_window_set_pos, void, HWND handle, long x, long y)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8880 DW_FUNCTION_ADD_PARAM3(handle, x, y)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8881 DW_FUNCTION_NO_RETURN(dw_window_set_pos)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8882 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, x, long, y, long)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8883 {
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8884 GdkDisplay *display = gdk_display_get_default();
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8885
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8886 if(handle && GTK_IS_WINDOW(handle) && display && GDK_IS_X11_DISPLAY(display))
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8887 {
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8888 GdkSurface *surface = gtk_native_get_surface(GTK_NATIVE(handle));
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8889
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8890 if(surface)
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8891 {
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8892 XMoveWindow(GDK_SURFACE_XDISPLAY(surface),
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8893 GDK_SURFACE_XID(surface),
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8894 x, y);
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8895 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8896 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8897 DW_FUNCTION_RETURN_NOTHING;
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8898 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8899 #endif
2322 ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	8900
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8901 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8902 * Sets the position and size of a given window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8903 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8904 * handle: Window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8905 * x: X location from the bottom left.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8906 * y: Y location from the bottom left.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8907 * width: Width of the widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8908 * height: Height of the widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8909 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8910 void API dw_window_set_pos_size(HWND handle, long x, long y, unsigned long width, unsigned long height)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8911 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8912 dw_window_set_size(handle, width, height);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8913 dw_window_set_pos(handle, x, y);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8914 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8915
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8916 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8917 * Gets the position and size of a given window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8918 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8919 * handle: Window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8920 * x: X location from the bottom left.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8921 * y: Y location from the bottom left.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8922 * width: Width of the widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8923 * height: Height of the widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8924 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8925 DW_FUNCTION_DEFINITION(dw_window_get_pos_size, void, HWND handle, long x, long y, ULONG width, ULONG height)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8926 DW_FUNCTION_ADD_PARAM5(handle, x, y, width, height)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8927 DW_FUNCTION_NO_RETURN(dw_window_get_pos_size)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8928 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, x, long , y, long , width, ULONG , height, ULONG )
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8929 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8930 if(handle && GTK_IS_WIDGET(handle))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8931 {
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8932 GtkRequisition size;
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8933
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8934 /* If the widget hasn't been shown, it returns 0 so use this as backup */
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8935 gtk_widget_get_preferred_size(GTK_WIDGET(handle), NULL, &size);
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8936
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8937 if(width)
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8938 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8939 *width = (ULONG)gtk_widget_get_width(GTK_WIDGET(handle));
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8940 if(!*width)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8941 *width = (ULONG)size.width;
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8942 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8943 if(height)
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8944 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8945 *height = (ULONG)gtk_widget_get_height(GTK_WIDGET(handle));
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8946 if(!*height)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8947 *height = (ULONG)size.height;
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8948 }
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8949
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8950 #ifdef GDK_WINDOWING_X11
2336 dd1b2cc95c91 GTK4: Don't unref the PangoContext returned from gtk_widget_get_pango_context(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2335 diff changeset	8951 if(x \|\| y)
dd1b2cc95c91 GTK4: Don't unref the PangoContext returned from gtk_widget_get_pango_context(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2335 diff changeset	8952 {
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8953 GdkDisplay *display = gdk_display_get_default();
2336 dd1b2cc95c91 GTK4: Don't unref the PangoContext returned from gtk_widget_get_pango_context(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2335 diff changeset	8954 GdkSurface *surface;
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8955
2336 dd1b2cc95c91 GTK4: Don't unref the PangoContext returned from gtk_widget_get_pango_context(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2335 diff changeset	8956 if(display && GDK_IS_X11_DISPLAY(display) && (surface = gtk_native_get_surface(GTK_NATIVE(handle))))
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8957 {
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8958 XWindowAttributes xwa;
2322 ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	8959 int ix = 0, iy = 0;
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8960 Window child, xrootwin = gdk_x11_display_get_xrootwindow(display);
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8961
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8962 XTranslateCoordinates(GDK_SURFACE_XDISPLAY(surface), GDK_SURFACE_XID(surface),
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8963 xrootwin, 0, 0, &ix, &iy, &child);
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8964 XGetWindowAttributes(GDK_SURFACE_XDISPLAY(surface),
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8965 GDK_SURFACE_XID(surface), &xwa);
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8966
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8967 if(x)
2322 ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	8968 *x = (long)(ix - xwa.x);
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8969 if(y)
2322 ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	8970 *y = (long)(ix - xwa.y);
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8971 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8972 }
829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8973 #else
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8974 if(x)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8975 *x = 0;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8976 if(y)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8977 *y = 0;
2320 829228de003f GTK4: Use package gtk4-x11 instead of gtk4 so we can call Xlib directly to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2319 diff changeset	8978 #endif
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8979 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8980 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8981 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8982
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8983 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8984 * Sets the style of a given window (widget).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8985 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8986 * handle: Window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8987 * width: New width in pixels.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8988 * height: New height in pixels.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8989 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8990 DW_FUNCTION_DEFINITION(dw_window_set_style, void, HWND handle, ULONG style, ULONG mask)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8991 DW_FUNCTION_ADD_PARAM3(handle, style, mask)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8992 DW_FUNCTION_NO_RETURN(dw_window_set_style)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8993 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, style, ULONG, mask, ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8994 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8995 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8996
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8997 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8998 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8999 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9000 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9001 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9002 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9003 else if(GTK_IS_FRAME(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9004 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9005 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_label");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9006 if(tmp && GTK_IS_LABEL(tmp))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9007 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9008 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9009 else if(GTK_IS_BUTTON(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9010 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9011 if(mask & DW_BS_NOBORDER)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9012 {
2318 5951752fa7af GTK4: Implement borderless button style for buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2317 diff changeset	9013 GtkStyleContext *context = gtk_widget_get_style_context(GTK_WIDGET(handle));
5951752fa7af GTK4: Implement borderless button style for buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2317 diff changeset	9014
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9015 if(style & DW_BS_NOBORDER)
2318 5951752fa7af GTK4: Implement borderless button style for buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2317 diff changeset	9016 gtk_style_context_add_class(context, "flat");
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9017 else
2318 5951752fa7af GTK4: Implement borderless button style for buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2317 diff changeset	9018 gtk_style_context_remove_class(context, "flat");
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9019 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9020 }
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9021 if(GTK_IS_LABEL(handle2))
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9022 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9023 gfloat x=DW_LEFT, y=DW_CENTER;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9024 /* horizontal... */
2319 36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	9025 if(style & DW_DT_CENTER)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9026 x = DW_CENTER;
2319 36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	9027 if(style & DW_DT_RIGHT)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9028 x = DW_RIGHT;
2319 36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	9029 if(style & DW_DT_LEFT)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9030 x = DW_LEFT;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9031 /* vertical... */
2319 36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	9032 if(style & DW_DT_VCENTER)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9033 y = DW_CENTER;
2319 36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	9034 if(style & DW_DT_TOP)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9035 y = DW_TOP;
2319 36522ed00ef8 GTK4: Some general code cleanup and an attempt to get dw_window_set_icon() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2318 diff changeset	9036 if(style & DW_DT_BOTTOM)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9037 y = DW_BOTTOM;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9038 gtk_label_set_xalign(GTK_LABEL(handle2), x);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9039 gtk_label_set_yalign(GTK_LABEL(handle2), y);
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9040 if(style & DW_DT_WORDBREAK)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9041 gtk_label_set_wrap(GTK_LABEL(handle), TRUE);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9042 }
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9043 if(G_IS_MENU_ITEM(handle2))
2282 b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	9044 {
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	9045 GSimpleAction *action = g_object_get_data(G_OBJECT(handle2), "_dw_action");
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	9046
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9047 if(action)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9048 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9049 if(mask & (DW_MIS_ENABLED \| DW_MIS_DISABLED))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9050 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9051 if((style & DW_MIS_ENABLED) \|\| (style & DW_MIS_DISABLED))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9052 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9053 if(style & DW_MIS_ENABLED)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9054 g_simple_action_set_enabled(action, TRUE);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9055 else
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9056 g_simple_action_set_enabled(action, FALSE);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9057 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9058 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9059 if(mask & (DW_MIS_CHECKED \| DW_MIS_UNCHECKED))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9060 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9061 GVariant *action_state = g_action_get_state(G_ACTION(action));
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9062 gboolean check = false;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9063
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9064 if(style & DW_MIS_CHECKED)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9065 check = true;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9066
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9067 if(!action_state \|\| (g_variant_get_boolean(action_state) != check))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9068 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9069 GVariant *new_state = g_variant_new_boolean(check);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9070 g_simple_action_set_state(action, new_state);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9071 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9072 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9073 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9074 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9075 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9076 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9077
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9078 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9079 * Adds a new page to specified notebook.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9080 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9081 * handle: Window (widget) handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9082 * flags: Any additional page creation flags.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9083 * front: If TRUE page is added at the beginning.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9084 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9085 DW_FUNCTION_DEFINITION(dw_notebook_page_new, ULONG, HWND handle, DW_UNUSED(ULONG flags), int front)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9086 DW_FUNCTION_ADD_PARAM3(handle, flags, front)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9087 DW_FUNCTION_RETURN(dw_notebook_page_new, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9088 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, DW_UNUSED(flags), ULONG, front, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9089 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9090 GtkWidget **pagearray;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9091 ULONG retval = 256;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9092 int z;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9093
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9094 pagearray = (GtkWidget **)g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9095
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9096 if(pagearray)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9097 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9098 for(z=0;z<256;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9099 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9100 if(!pagearray[z])
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9101 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9102 char text[101] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9103 int num = z;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9104
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9105 if(front)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9106 num \|= 1 << 16;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9107
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9108 snprintf(text, 100, "_dw_page%d", z);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9109 /* Save the real id and the creation flags */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9110 g_object_set_data(G_OBJECT(handle), text, GINT_TO_POINTER(num));
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9111 retval = (ULONG)z;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9112 z = 256;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9113 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9114 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9115 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9116 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9117 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9118
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9119 /* Return the physical page id from the logical page id */
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	9120 int _dw_get_physical_page(HWND handle, unsigned long pageid)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9121 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9122 int z;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9123 GtkWidget thispage, *pagearray = g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9124
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9125 if(pagearray)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9126 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9127 for(z=0;z<256;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9128 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9129 if((thispage = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), z)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9130 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9131 if(thispage == pagearray[pageid])
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9132 return z;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9133 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9134 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9135 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9136 return 256;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9137 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9138
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9139 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9140 * Remove a page from a notebook.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9141 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9142 * handle: Handle to the notebook widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9143 * pageid: ID of the page to be destroyed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9144 */
2909 3fe7641f027c WARNING: Fix an API inconsistency in dw_notebook_page_destroy/set() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2904 diff changeset	9145 DW_FUNCTION_DEFINITION(dw_notebook_page_destroy, void, HWND handle, unsigned long pageid)
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9146 DW_FUNCTION_ADD_PARAM2(handle, pageid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9147 DW_FUNCTION_NO_RETURN(dw_notebook_page_destroy)
2910 927fcf85b132 GTK4: Fix pageid type to be unsigned long in the macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2909 diff changeset	9148 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, pageid, unsigned long)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9149 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9150 GtkWidget **pagearray;
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	9151 int realpage = _dw_get_physical_page(handle, pageid);
eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	9152
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9153 if(realpage > -1 && realpage < 256)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9154 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9155 gtk_notebook_remove_page(GTK_NOTEBOOK(handle), realpage);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9156 if((pagearray = g_object_get_data(G_OBJECT(handle), "_dw_pagearray")))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9157 pagearray[pageid] = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9158 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9159 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9160 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9161
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9162 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9163 * Queries the currently visible page ID.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9164 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9165 * handle: Handle to the notebook widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9166 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9167 DW_FUNCTION_DEFINITION(dw_notebook_page_get, ULONG, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9168 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9169 DW_FUNCTION_RETURN(dw_notebook_page_get, ULONG)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9170 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9171 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9172 ULONG retval;
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	9173 int phys = gtk_notebook_get_current_page(GTK_NOTEBOOK(handle));
eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	9174
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	9175 retval = _dw_get_logical_page(handle, phys);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9176 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9177 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9178
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9179 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9180 * Sets the currently visibale page ID.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9181 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9182 * handle: Handle to the notebook widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9183 * pageid: ID of the page to be made visible.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9184 */
2909 3fe7641f027c WARNING: Fix an API inconsistency in dw_notebook_page_destroy/set() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2904 diff changeset	9185 DW_FUNCTION_DEFINITION(dw_notebook_page_set, void, HWND handle, unsigned long pageid)
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9186 DW_FUNCTION_ADD_PARAM2(handle, pageid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9187 DW_FUNCTION_NO_RETURN(dw_notebook_page_set)
2910 927fcf85b132 GTK4: Fix pageid type to be unsigned long in the macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2909 diff changeset	9188 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, pageid, unsigned long)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9189 {
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	9190 int realpage = _dw_get_physical_page(handle, pageid);
eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	9191
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9192 if(realpage > -1 && realpage < 256)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9193 gtk_notebook_set_current_page(GTK_NOTEBOOK(handle), pageid);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9194 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9195 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9196
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9197
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9198 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9199 * Sets the text on the specified notebook tab.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9200 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9201 * handle: Notebook handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9202 * pageid: Page ID of the tab to set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9203 * text: Pointer to the text to set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9204 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9205 DW_FUNCTION_DEFINITION(dw_notebook_page_set_text, void, HWND handle, ULONG pageid, const char *text)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9206 DW_FUNCTION_ADD_PARAM3(handle, pageid, text)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9207 DW_FUNCTION_NO_RETURN(dw_notebook_page_set_text)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9208 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, pageid, ULONG, text, const char *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9209 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9210 GtkWidget *child;
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	9211 int realpage = _dw_get_physical_page(handle, pageid);
eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	9212
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9213 if(realpage < 0 \|\| realpage > 255)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9214 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9215 char ptext[101] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9216 int num;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9217
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9218 snprintf(ptext, 100, "_dw_page%d", (int)pageid);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9219 num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), ptext));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9220 realpage = 0xFF & num;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9221 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9222
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9223 if(realpage > -1 && realpage < 256)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9224 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9225 child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), realpage);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9226 if(child)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9227 gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(handle), child, text);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9228 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9229 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9230 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9231
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9232 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9233 * Sets the text on the specified notebook tab status area.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9234 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9235 * handle: Notebook handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9236 * pageid: Page ID of the tab to set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9237 * text: Pointer to the text to set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9238 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	9239 void API dw_notebook_page_set_status_text(HWND handle, unsigned long pageid, const char *text)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9240 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9241 /* TODO (if possible) */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9242 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9243
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9244 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9245 * Packs the specified box into the notebook page.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9246 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9247 * handle: Handle to the notebook to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9248 * pageid: Page ID in the notebook which is being packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9249 * page: Box handle to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9250 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9251 DW_FUNCTION_DEFINITION(dw_notebook_pack, void, HWND handle, ULONG pageid, HWND page)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9252 DW_FUNCTION_ADD_PARAM3(handle, pageid, page)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9253 DW_FUNCTION_NO_RETURN(dw_notebook_pack)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9254 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, pageid, ULONG, page, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9255 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9256 GtkWidget label, child, oldlabel, *pagearray;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9257 const gchar *text = NULL;
2276 d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	9258 int num, z, realpage = -1;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9259 char ptext[101] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9260
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9261 snprintf(ptext, 100, "_dw_page%d", (int)pageid);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9262 num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), ptext));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9263 g_object_set_data(G_OBJECT(handle), ptext, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9264 pagearray = (GtkWidget **)g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9265
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9266 if(pagearray)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9267 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9268 /* The page already exists... so get it's current page */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9269 if(pagearray[pageid])
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9270 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9271 for(z=0;z<256;z++)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9272 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9273 child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), z);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9274 if(child == pagearray[pageid])
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9275 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9276 oldlabel = gtk_notebook_get_tab_label(GTK_NOTEBOOK(handle), child);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9277 if(oldlabel)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9278 text = gtk_label_get_text(GTK_LABEL(oldlabel));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9279 gtk_notebook_remove_page(GTK_NOTEBOOK(handle), z);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9280 realpage = z;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9281 break;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9282 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9283 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9284 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9285
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9286 pagearray[pageid] = page;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9287
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9288 label = gtk_label_new(text ? text : "");
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9289
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9290 if(realpage != -1)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9291 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, realpage);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9292 else if(num & ~(0xFF))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9293 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, 0);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9294 else
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9295 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, 256);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9296 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9297 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9298 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9299
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9300 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9301 * Appends the specified text to the listbox's (or combobox) entry list.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9302 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9303 * handle: Handle to the listbox to be appended to.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9304 * text: Text to append into listbox.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9305 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	9306 void API dw_listbox_append(HWND handle, const char *text)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9307 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9308 dw_listbox_insert(handle, text, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9309 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9310
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9311 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9312 * Inserts the specified text int the listbox's (or combobox) entry list at the
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9313 * position indicated.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9314 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9315 * handle: Handle to the listbox to be appended to.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9316 * text: Text to insert into listbox.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9317 * pos: 0-based index into listbox. -1 will append
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9318 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9319 DW_FUNCTION_DEFINITION(dw_listbox_insert, void, HWND handle, const char *text, int pos)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9320 DW_FUNCTION_ADD_PARAM3(handle, text, pos)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9321 DW_FUNCTION_NO_RETURN(dw_listbox_insert)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9322 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, text, const char *, pos, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9323 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9324 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9325 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9326
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9327 /* Get the inner handle for scrolled controls */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9328 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9329 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9330 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9331 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9332 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9333 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9334 if(handle2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9335 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9336 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9337
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9338 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9339 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9340 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9341 else if(GTK_IS_COMBO_BOX(handle2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9342 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9343
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9344 if(store)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9345 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9346 if(pos < 0)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9347 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9348 /* Insert an entry at the end */
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9349 gtk_list_store_append(store, &iter);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9350 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9351 else
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9352 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9353 /* Insert at position */
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9354 gtk_list_store_insert(store, &iter, pos);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9355 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9356 gtk_list_store_set (store, &iter, 0, text, -1);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9357 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9358 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9359 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9360 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9361
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9362 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9363 * Appends the specified text items to the listbox's (or combobox) entry list.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9364 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9365 * handle: Handle to the listbox to be appended to.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9366 * text: Text strings to append into listbox.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9367 * count: Number of text strings to append
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9368 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9369 DW_FUNCTION_DEFINITION(dw_listbox_list_append, void, HWND handle, char **text, int count)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9370 DW_FUNCTION_ADD_PARAM3(handle, text, count)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9371 DW_FUNCTION_NO_RETURN(dw_listbox_list_append)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9372 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, text, char **, count, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9373 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9374 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9375 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9376
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9377 /* Get the inner handle for scrolled controls */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9378 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9379 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9380 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9381 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9382 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9383 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9384 if(handle2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9385 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9386 int z;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9387 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9388
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9389 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9390 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9391 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9392 else if(GTK_IS_COMBO_BOX(handle2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9393 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9394
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9395 if(store)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9396 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9397 /* Insert entries at the end */
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9398 for(z=0;z<count;z++)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9399 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9400 gtk_list_store_append(store, &iter);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9401 gtk_list_store_set (store, &iter, 0, text[z], -1);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9402 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9403 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9404 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9405 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9406 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9407
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9408 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9409 * Clears the listbox's (or combobox) list of all entries.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9410 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9411 * handle: Handle to the listbox to be cleared.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9412 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9413 DW_FUNCTION_DEFINITION(dw_listbox_clear, void, HWND handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9414 DW_FUNCTION_ADD_PARAM1(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9415 DW_FUNCTION_NO_RETURN(dw_listbox_clear)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9416 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9417
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9418 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9419 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9420 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9421
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9422 /* Get the inner handle for scrolled controls */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9423 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9424 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9425 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9426 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9427 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9428 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9429 if(handle2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9430 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9431 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9432 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9433 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9434 else if(GTK_IS_COMBO_BOX(handle2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9435 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9436
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9437 if(store)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9438 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9439 /* Clear the list */
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9440 gtk_list_store_clear(store);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9441 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9442 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9443 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9444 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9445
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9446 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9447 * Returns the listbox's item count.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9448 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9449 * handle: Handle to the listbox to be counted
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9450 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9451 DW_FUNCTION_DEFINITION(dw_listbox_count, int, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9452 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9453 DW_FUNCTION_RETURN(dw_listbox_count, int)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9454 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9455 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9456 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9457 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9458 int retval = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9459
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9460 /* Get the inner handle for scrolled controls */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9461 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9462 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9463 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9464 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9465 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9466 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9467 if(handle2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9468 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9469 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9470 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9471 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9472 else if(GTK_IS_COMBO_BOX(handle2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9473 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9474
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9475 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9476 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9477 /* Get the number of children at the top level */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9478 retval = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9479 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9480 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9481 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9482 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9483
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9484 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9485 * Sets the topmost item in the viewport.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9486 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9487 * handle: Handle to the listbox to be cleared.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9488 * top: Index to the top item.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9489 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9490 DW_FUNCTION_DEFINITION(dw_listbox_set_top, void, HWND handle, int top)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9491 DW_FUNCTION_ADD_PARAM2(handle, top)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9492 DW_FUNCTION_NO_RETURN(dw_listbox_set_top)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9493 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, top, int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9494
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9495 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9496 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9497
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9498 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9499 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9500 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9501 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9502 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9503 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9504 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9505 if(handle2 && GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9506 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9507 GtkAdjustment *adjust = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(handle));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9508 GtkListStore store = (GtkListStore )gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9509
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9510 if(store && adjust)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9511 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9512 /* Get the number of children at the top level */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9513 gint rowcount = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9514 gdouble pagesize = gtk_adjustment_get_page_size(adjust);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9515 gdouble upper = gtk_adjustment_get_upper(adjust) - pagesize;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9516 gdouble lower = gtk_adjustment_get_lower(adjust);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9517 gdouble change;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9518
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9519 /* Safety check */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9520 if(rowcount > 1)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9521 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9522 /* Verify the range */
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9523 rowcount--;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9524 if(top > rowcount)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9525 top = rowcount;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9526
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9527 change = ((gdouble)top/(gdouble)rowcount) * (upper - lower);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9528
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9529 gtk_adjustment_set_value(adjust, change + lower);
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9530 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9531 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9532 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9533 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9534 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9535
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9536 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9537 * Copies the given index item's text into buffer.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9538 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9539 * handle: Handle to the listbox to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9540 * index: Index into the list to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9541 * buffer: Buffer where text will be copied.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9542 * length: Length of the buffer (including NULL).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9543 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9544 DW_FUNCTION_DEFINITION(dw_listbox_get_text, void, HWND handle, unsigned int index, char *buffer, unsigned int length)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9545 DW_FUNCTION_ADD_PARAM4(handle, index, buffer, length)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9546 DW_FUNCTION_NO_RETURN(dw_listbox_get_text)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9547 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, index, unsigned int, buffer, char *, length, unsigned int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9548
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9549 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9550 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9551 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9552
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9553 /* Get the inner handle for scrolled controls */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9554 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9555 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9556 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9557 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9558 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9559 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9560 if(handle2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9561 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9562 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9563 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9564 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9565 else if(GTK_IS_COMBO_BOX(handle2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9566 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9567
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9568 if(store && index < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9569 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9570 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9571
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9572 /* Get the nth child at the top level */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9573 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9574 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9575 /* Get the text */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9576 gchar *text;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9577 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, _DW_DATA_TYPE_STRING, &text, -1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9578 if(text)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9579 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9580 strncpy(buffer, text, length);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9581 g_free(text);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9582 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9583 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9584 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9585 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9586 buffer[0] = '\0';
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9587 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9588 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9589
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9590 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9591 * Sets the text of a given listbox entry.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9592 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9593 * handle: Handle to the listbox to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9594 * index: Index into the list to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9595 * buffer: Buffer where text will be copied.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9596 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9597 DW_FUNCTION_DEFINITION(dw_listbox_set_text, void, HWND handle, unsigned int index, const char *buffer)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9598 DW_FUNCTION_ADD_PARAM3(handle, index, buffer)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9599 DW_FUNCTION_NO_RETURN(dw_listbox_set_text)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9600 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, index, unsigned int, buffer, char *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9601 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9602 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9603 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9604
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9605 /* Get the inner handle for scrolled controls */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9606 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9607 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9608 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9609 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9610 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9611 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9612 if(handle2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9613 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9614 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9615 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9616 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9617 else if(GTK_IS_COMBO_BOX(handle2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9618 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9619
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9620 if(store && index < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9621 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9622 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9623
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9624 /* Get the nth child at the top level */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9625 if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9626 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9627 /* Update the text */
2744 608796a91527 GTK3/4: Committing a fix from Mark Hessling for dw_listbox_set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2731 diff changeset	9628 gtk_list_store_set(store, &iter, 0, buffer, -1);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9629 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9630 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9631 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9632 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9633 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9634
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9635 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9636 * Returns the index to the current selected item or -1 when done.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9637 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9638 * handle: Handle to the listbox to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9639 * where: Either the previous return or -1 to restart.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9640 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9641 DW_FUNCTION_DEFINITION(dw_listbox_selected_multi, int, HWND handle, int where)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9642 DW_FUNCTION_ADD_PARAM2(handle, where)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9643 DW_FUNCTION_RETURN(dw_listbox_selected_multi, int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9644 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, where, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9645 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9646 GtkWidget *handle2;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9647 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9648 int retval = DW_LIT_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9649
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9650 handle2 = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9651
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9652 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9653 if(handle2 && GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9654 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9655
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9656 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9657 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9658 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9659 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9660
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9661 if(list)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9662 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9663 int counter = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9664 GtkTreePath *path = g_list_nth_data(list, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9665
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9666 while(path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9667 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9668 gint *indices = gtk_tree_path_get_indices(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9669
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9670 if(indices && indices[0] > where)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9671 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9672 retval = indices[0];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9673 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9674 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9675
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9676 counter++;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9677 path = g_list_nth_data(list, counter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9678 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9679
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9680 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9681 g_list_free(list);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9682 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9683 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9684 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9685 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9686
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9687 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9688 * Returns the index to the item in the list currently selected.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9689 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9690 * handle: Handle to the listbox to be queried.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9691 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9692 DW_FUNCTION_DEFINITION(dw_listbox_selected, int, HWND handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9693 DW_FUNCTION_ADD_PARAM1(handle)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9694 DW_FUNCTION_RETURN(dw_listbox_selected, int)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9695 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9696 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9697 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9698 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9699 unsigned int retval = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9700
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9701 /* Get the inner handle for scrolled controls */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9702 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9703 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9704 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9705 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9706 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9707 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9708 if(handle2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9709 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9710 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9711 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9712 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9713 else if(GTK_IS_COMBO_BOX(handle2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9714 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9715
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9716 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9717 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9718 if(GTK_IS_TREE_VIEW(handle2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9719 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9720 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9721 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9722 if(list)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9723 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9724 GtkTreePath *path = g_list_nth_data(list, 0);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9725 gint *indices = gtk_tree_path_get_indices(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9726
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9727 if(indices)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9728 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9729 retval = indices[0];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9730 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9731
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9732 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9733 g_list_free(list);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9734 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9735 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9736 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9737 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9738 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9739 GtkTreePath *path;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9740
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9741 if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(handle2), &iter))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9742 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9743 path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9744 if(path)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9745 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9746 gint *indices = gtk_tree_path_get_indices(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9747
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9748 if(indices)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9749 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9750 retval = indices[0];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9751 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9752 gtk_tree_path_free(path);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9753 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9754 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9755 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9756 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9757 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9758 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9759 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9760
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9761 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9762 * Sets the selection state of a given index.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9763 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9764 * handle: Handle to the listbox to be set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9765 * index: Item index.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9766 * state: TRUE if selected FALSE if unselected.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9767 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9768 DW_FUNCTION_DEFINITION(dw_listbox_select, void, HWND handle, int index, int state)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9769 DW_FUNCTION_ADD_PARAM3(handle, index, state)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9770 DW_FUNCTION_NO_RETURN(dw_listbox_select)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9771 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, index, int, state, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9772 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9773 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9774 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9775
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9776 /* Get the inner handle for scrolled controls */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9777 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9778 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9779 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9780 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9781 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9782 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9783 if(handle2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9784 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9785 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9786 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9787 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9788 else if(GTK_IS_COMBO_BOX(handle2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9789 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9790
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9791 if(store && index < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9792 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9793 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9794
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9795 /* Get the nth child at the top level */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9796 if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9797 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9798 if(GTK_IS_COMBO_BOX(handle2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9799 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9800 gtk_combo_box_set_active_iter(GTK_COMBO_BOX(handle2), &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9801 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9802 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9803 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9804 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9805 if(state)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9806 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9807 /* Select the item */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9808 gtk_tree_selection_select_iter(sel, &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9809 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9810 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9811 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9812 /* Deselect the item */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9813 gtk_tree_selection_unselect_iter(sel, &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9814 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9815 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9816 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9817 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9818 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9819 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9820 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9821
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9822 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9823 * Deletes the item with given index from the list.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9824 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9825 * handle: Handle to the listbox to be set.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9826 * index: Item index.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9827 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9828 DW_FUNCTION_DEFINITION(dw_listbox_delete, void, HWND handle, int index)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9829 DW_FUNCTION_ADD_PARAM2(handle, index)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9830 DW_FUNCTION_NO_RETURN(dw_listbox_delete)
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9831 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, index, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9832 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9833 GtkWidget *handle2 = handle;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9834 GtkListStore *store = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9835
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9836 /* Get the inner handle for scrolled controls */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9837 if(GTK_IS_SCROLLED_WINDOW(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9838 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9839 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9840 if(tmp)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9841 handle2 = tmp;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9842 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9843 if(handle2)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9844 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9845 /* Make sure it is the correct tree type */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9846 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9847 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9848 else if(GTK_IS_COMBO_BOX(handle2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9849 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9850
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9851 if(store)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9852 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9853 GtkTreeIter iter;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9854
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9855 /* Get the nth child at the top level */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9856 if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9857 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9858 gtk_list_store_remove(store, &iter);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9859 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9860 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9861 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9862 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9863 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9864
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9865 /* Function to do delayed positioning */
2301 69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9866 gboolean _dw_splitbar_set_percent(gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9867 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9868 GtkWidget *widget = data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9869 float percent = (float )g_object_get_data(G_OBJECT(widget), "_dw_percent");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9870
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9871 if(percent)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9872 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9873 GtkAllocation alloc;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9874
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9875 gtk_widget_get_allocation(widget, &alloc);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9876
2301 69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9877 if(alloc.width > 10 && alloc.height > 10)
69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9878 {
69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9879 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(widget)) == GTK_ORIENTATION_HORIZONTAL)
69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9880 gtk_paned_set_position(GTK_PANED(widget), (int)(alloc.width * (*percent / 100.0)));
69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9881 else
69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9882 gtk_paned_set_position(GTK_PANED(widget), (int)(alloc.height * (*percent / 100.0)));
69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9883 g_object_set_data(G_OBJECT(widget), "_dw_percent", NULL);
69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9884 free(percent);
69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9885 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9886 else
2301 69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9887 return TRUE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9888 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9889 return FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9890 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9891
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9892 /* Reposition the bar according to the percentage */
2301 69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9893 static gint _dw_splitbar_realize(GtkWidget *widget, gpointer data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9894 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9895 float percent = (float )g_object_get_data(G_OBJECT(widget), "_dw_percent");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9896
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9897 /* Prevent infinite recursion ;) */
2295 2a208d5400c5 GTK4: "size-allocate" signal is gone, so switch to using "realize". bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2292 diff changeset	9898 if(!percent)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9899 return FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9900
2301 69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9901 g_idle_add(_dw_splitbar_set_percent, widget);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9902 return FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9903 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9904
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9905 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9906 * Creates a splitbar window (widget) with given parameters.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9907 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9908 * type: Value can be DW_VERT or DW_HORZ.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9909 * topleft: Handle to the window to be top or left.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9910 * bottomright: Handle to the window to be bottom or right.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9911 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9912 * A handle to a splitbar window or NULL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9913 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9914 DW_FUNCTION_DEFINITION(dw_splitbar_new, HWND, int type, HWND topleft, HWND bottomright, unsigned long cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9915 DW_FUNCTION_ADD_PARAM4(type, topleft, bottomright, cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9916 DW_FUNCTION_RETURN(dw_splitbar_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9917 DW_FUNCTION_RESTORE_PARAM4(type, int, topleft, HWND, bottomright, HWND, cid, unsigned long)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9918 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9919 GtkWidget *tmp = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9920 float *percent = malloc(sizeof(float));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9921
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9922 tmp = gtk_paned_new(type == DW_HORZ ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9923 gtk_paned_set_start_child(GTK_PANED(tmp), topleft);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9924 gtk_paned_set_resize_start_child(GTK_PANED(tmp), TRUE);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9925 gtk_paned_set_shrink_start_child(GTK_PANED(tmp), FALSE);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9926 gtk_paned_set_end_child(GTK_PANED(tmp), bottomright);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9927 gtk_paned_set_resize_end_child(GTK_PANED(tmp), TRUE);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9928 gtk_paned_set_shrink_end_child(GTK_PANED(tmp), FALSE);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9929 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9930 *percent = 50.0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9931 g_object_set_data(G_OBJECT(tmp), "_dw_percent", (gpointer)percent);
2301 69b06073a87d GTK4: The "realize" signal is not quite the same as "size-allocate" so if bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2300 diff changeset	9932 g_signal_connect(G_OBJECT(tmp), "realize", G_CALLBACK(_dw_splitbar_realize), NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9933 gtk_widget_show(tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9934 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9935 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9936
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9937 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9938 * Sets the position of a splitbar (pecentage).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9939 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9940 * handle: The handle to the splitbar returned by dw_splitbar_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9941 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9942 DW_FUNCTION_DEFINITION(dw_splitbar_set, void, HWND handle, float percent)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9943 DW_FUNCTION_ADD_PARAM2(handle, percent)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9944 DW_FUNCTION_NO_RETURN(dw_splitbar_set)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9945 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, percent, float)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9946 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9947 float mypercent = (float )dw_window_get_data(handle, "_dw_percent");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9948 int size = 0, position;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9949
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9950 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(handle)) == GTK_ORIENTATION_HORIZONTAL)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9951 size = gtk_widget_get_allocated_width(handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9952 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9953 size = gtk_widget_get_allocated_height(handle);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9954
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9955 if(mypercent)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9956 *mypercent = percent;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9957
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9958 if(size > 10)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9959 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9960 position = (int)((float)size * (percent / 100.0));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9961
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9962 gtk_paned_set_position(GTK_PANED(handle), position);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9963 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9964 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9965 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9966
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9967 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9968 * Gets the position of a splitbar (pecentage).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9969 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9970 * handle: The handle to the splitbar returned by dw_splitbar_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9971 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9972 DW_FUNCTION_DEFINITION(dw_splitbar_get, float, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9973 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9974 DW_FUNCTION_RETURN(dw_splitbar_get, float)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9975 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9976 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9977 float percent = (float )dw_window_get_data(handle, "_dw_percent");
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9978 float retval = 0.0;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9979
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9980 if(percent)
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9981 retval = *percent;
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9982 DW_FUNCTION_RETURN_THIS(retval);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9983 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9984
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9985 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9986 * Creates a calendar window (widget) with given parameters.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9987 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9988 * id: Unique identifier for calendar widget
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9989 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9990 * A handle to a calendar window or NULL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9991 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9992 DW_FUNCTION_DEFINITION(dw_calendar_new, HWND, ULONG cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9993 DW_FUNCTION_ADD_PARAM1(cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9994 DW_FUNCTION_RETURN(dw_calendar_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9995 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9996 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9997 GtkWidget *tmp = gtk_calendar_new();
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9998 GTimeZone *tz = g_time_zone_new_local();
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9999 GDateTime *now = g_date_time_new_now(tz);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10000
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10001 gtk_widget_show(tmp);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10002 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10003 /* select today */
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10004 gtk_calendar_set_show_day_names(GTK_CALENDAR(tmp), TRUE);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10005 gtk_calendar_set_show_heading(GTK_CALENDAR(tmp), TRUE);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10006 gtk_calendar_select_day(GTK_CALENDAR(tmp), now);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10007 g_date_time_unref(now);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10008 g_time_zone_unref(tz);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10009 DW_FUNCTION_RETURN_THIS(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10010 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10011
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10012 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10013 * Sets the current date of a calendar
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10014 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10015 * handle: The handle to the calendar returned by dw_calendar_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10016 * year...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10017 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10018 DW_FUNCTION_DEFINITION(dw_calendar_set_date, void, HWND handle, unsigned int year, unsigned int month, unsigned int day)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10019 DW_FUNCTION_ADD_PARAM4(handle, year, month, day)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10020 DW_FUNCTION_NO_RETURN(dw_calendar_set_date)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10021 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, year, unsigned int, month, unsigned int, day, unsigned int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10022 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10023 if(GTK_IS_CALENDAR(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10024 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10025 GTimeZone *tz = g_time_zone_new_local();
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10026 GDateTime *datetime = g_date_time_new(tz, year, month, day, 0, 0, 0);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10027 gtk_calendar_select_day(GTK_CALENDAR(handle), datetime);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10028 g_date_time_unref(datetime);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10029 g_time_zone_unref(tz);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10030 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10031 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10032 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10033
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10034 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10035 * Gets the position of a splitbar (pecentage).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10036 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10037 * handle: The handle to the splitbar returned by dw_splitbar_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10038 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10039 DW_FUNCTION_DEFINITION(dw_calendar_get_date, void, HWND handle, unsigned int year, unsigned int month, unsigned int *day)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10040 DW_FUNCTION_ADD_PARAM4(handle, year, month, day)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10041 DW_FUNCTION_NO_RETURN(dw_calendar_get_date)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10042 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, year, unsigned int , month, unsigned int , day, unsigned int *)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10043 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10044 if(GTK_IS_CALENDAR(handle))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10045 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10046 GDateTime *datetime = gtk_calendar_get_date(GTK_CALENDAR(handle));
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10047 if(year)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10048 *year = g_date_time_get_year(datetime);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10049 if(month)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10050 *month = g_date_time_get_month(datetime);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10051 if(day)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10052 *day = g_date_time_get_day_of_month(datetime);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10053 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10054 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10055 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10056
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10057 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10058 * Sets the current focus item for a window/dialog.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10059 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10060 * handle: Handle to the dialog item to be focused.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10061 * Remarks:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10062 * This is for use after showing the window/dialog.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10063 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10064 DW_FUNCTION_DEFINITION(dw_window_set_focus, void, HWND handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10065 DW_FUNCTION_ADD_PARAM1(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10066 DW_FUNCTION_NO_RETURN(dw_window_set_focus)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10067 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10068 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10069 if(handle)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10070 gtk_widget_grab_focus(handle);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10071 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10072 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10073
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10074 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10075 * Sets the default focus item for a window/dialog.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10076 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10077 * window: Toplevel window or dialog.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10078 * defaultitem: Handle to the dialog item to be default.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10079 * Remarks:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10080 * This is for use before showing the window/dialog.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10081 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10082 void API dw_window_default(HWND window, HWND defaultitem)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10083 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10084 if(window)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10085 g_object_set_data(G_OBJECT(window), "_dw_defaultitem", (gpointer)defaultitem);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10086 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10087
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10088 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10089 * Sets window to click the default dialog item when an ENTER is pressed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10090 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10091 * window: Window (widget) to look for the ENTER press.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10092 * next: Window (widget) to move to next (or click)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10093 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10094 DW_FUNCTION_DEFINITION(dw_window_click_default, void, HWND window, HWND next)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10095 DW_FUNCTION_ADD_PARAM2(window, next)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10096 DW_FUNCTION_NO_RETURN(dw_window_click_default)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10097 DW_FUNCTION_RESTORE_PARAM2(window, HWND, next, HWND)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10098 {
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	10099 if(window && next && GTK_IS_WIDGET(window) && GTK_IS_WIDGET(next))
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	10100 {
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	10101 GtkEventController *controller = gtk_event_controller_key_new();
7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	10102 gtk_widget_add_controller(GTK_WIDGET(window), controller);
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	10103 g_signal_connect(G_OBJECT(controller), "key-pressed", G_CALLBACK(_dw_default_key_press_event), next);
2267 7ac85e938b71 GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2266 diff changeset	10104 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10105 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10106 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10107
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10108
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10109 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10110 * Creates a new system notification if possible.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10111 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10112 * title: The short title of the notification.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10113 * imagepath: Path to an image to display or NULL if none.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10114 * description: A longer description of the notification,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10115 * or NULL if none is necessary.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10116 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10117 * A handle to the notification which can be used to attach a "clicked" event if desired,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10118 * or NULL if it fails or notifications are not supported by the system.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10119 * Remarks:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10120 * This will create a system notification that will show in the notifaction panel
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10121 * on supported systems, which may be clicked to perform another task.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10122 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10123 HWND API dw_notification_new(const char title, const char imagepath, const char *description, ...)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10124 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10125 GNotification *notification = g_notification_new(title);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10126
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10127 if(notification)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10128 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10129 if(description)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10130 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10131 va_list args;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10132 char outbuf[1025] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10133
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10134 va_start(args, description);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10135 vsnprintf(outbuf, 1024, description, args);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10136 va_end(args);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10137
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10138 g_notification_set_body(notification, outbuf);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10139 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10140 if(imagepath)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10141 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10142 GFile *file = g_file_new_for_path(imagepath);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10143 GBytes *bytes = g_file_load_bytes(file, NULL, NULL, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10144
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10145 if(bytes)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10146 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10147 GIcon *icon = g_bytes_icon_new(bytes);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10148
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10149 if(icon)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10150 g_notification_set_icon(notification, G_ICON(icon));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10151 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10152 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10153 g_notification_set_default_action_and_target(notification, "app.notification", "t",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10154 (guint64)DW_POINTER_TO_ULONGLONG(notification));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10155 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10156 return (HWND)notification;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10157 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10158
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10159 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10160 * Sends a notification created by dw_notification_new() after attaching signal handler.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10161 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10162 * notification: The handle to the notification returned by dw_notification_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10163 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10164 * DW_ERROR_NONE on success, DW_ERROR_UNKNOWN on error or not supported.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10165 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10166 int API dw_notification_send(HWND notification)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10167 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10168 if(notification)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10169 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10170 char id[101] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10171
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10172 /* Generate a unique ID based on the notification handle,
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10173 * so we can use it to remove the notification in dw_window_destroy().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10174 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10175 snprintf(id, 100, "dw-notification-%llu", DW_POINTER_TO_ULONGLONG(notification));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10176 g_application_send_notification(_DWApp, id, (GNotification *)notification);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10177 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10178 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10179 return DW_ERROR_UNKNOWN;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10180 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10181
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10182 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10183 * Returns some information about the current operating environment.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10184 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10185 * env: Pointer to a DWEnv struct.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10186 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10187 void API dw_environment_query(DWEnv *env)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10188 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10189 struct utsname name;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10190 char tempbuf[_DW_ENV_STRING_SIZE] = { 0 }, *dot;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10191
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10192 uname(&name);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10193 memset(env, '\0', sizeof(DWEnv));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10194 strncpy(env->osName, name.sysname, sizeof(env->osName)-1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10195 strncpy(tempbuf, name.release, sizeof(tempbuf)-1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10196
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10197 strncpy(env->buildDate, __DATE__, sizeof(env->buildDate)-1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10198 strncpy(env->buildTime, __TIME__, sizeof(env->buildTime)-1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10199 #ifdef USE_WEBKIT
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10200 strncpy(env->htmlEngine, "WEBKIT2", sizeof(env->htmlEngine)-1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10201 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10202 strncpy(env->htmlEngine, "N/A", sizeof(env->htmlEngine)-1);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10203 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10204 env->DWMajorVersion = DW_MAJOR_VERSION;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10205 env->DWMinorVersion = DW_MINOR_VERSION;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10206 #ifdef VER_REV
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10207 env->DWSubVersion = VER_REV;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10208 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10209 env->DWSubVersion = DW_SUB_VERSION;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10210 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10211
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10212 if((dot = strchr(tempbuf, '.')) != NULL)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10213 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10214 *dot = '\0';
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10215 env->MajorVersion = atoi(tempbuf);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10216 env->MinorVersion = atoi(&dot[1]);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10217 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10218 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10219 env->MajorVersion = atoi(tempbuf);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10220 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10221
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10222 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10223 * Opens a file dialog and queries user selection.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10224 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10225 * title: Title bar text for dialog.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10226 * defpath: The default path of the open dialog.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10227 * ext: Default file extention.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10228 * flags: DW_FILE_OPEN or DW_FILE_SAVE or DW_DIRECTORY_OPEN
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10229 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10230 * NULL on error. A malloced buffer containing
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10231 * the file path on success.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10232 *
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10233 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10234 DW_FUNCTION_DEFINITION(dw_file_browse, char , const char title, const char defpath, const char ext, int flags)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10235 DW_FUNCTION_ADD_PARAM4(title, defpath, ext, flags)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10236 DW_FUNCTION_RETURN(dw_file_browse, char *)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10237 DW_FUNCTION_RESTORE_PARAM4(title, const char , defpath, const char , ext, const char *, flags, int)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10238 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10239 GtkWidget *filew;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10240
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10241 GtkFileChooserAction action;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10242 GtkFileFilter *filter1 = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10243 GtkFileFilter *filter2 = NULL;
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10244 gchar *button = NULL;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10245 char *filename = NULL;
2346 7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10246 char buf[1001] = {0};
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10247 DWDialog *tmp = dw_dialog_new(NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10248
2346 7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10249 switch(flags)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10250 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10251 case DW_DIRECTORY_OPEN:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10252 action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10253 button = _("_Open");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10254 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10255 case DW_FILE_OPEN:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10256 action = GTK_FILE_CHOOSER_ACTION_OPEN;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10257 button = _("_Open");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10258 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10259 case DW_FILE_SAVE:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10260 action = GTK_FILE_CHOOSER_ACTION_SAVE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10261 button = _("_Save");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10262 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10263 default:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10264 dw_messagebox( "Coding error", DW_MB_OK\|DW_MB_ERROR, "dw_file_browse() flags argument invalid.");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10265 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10266 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10267
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10268 if(button)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10269 {
2346 7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10270 filew = gtk_file_chooser_dialog_new(title,
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10271 NULL,
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10272 action,
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10273 _("_Cancel"), GTK_RESPONSE_CANCEL,
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10274 button, GTK_RESPONSE_ACCEPT,
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10275 NULL);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10276
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10277 if(ext)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10278 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10279 filter1 = gtk_file_filter_new();
2346 7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10280 snprintf(buf, 1000, "*.%s", ext);
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10281 gtk_file_filter_add_pattern( filter1, (gchar *)buf);
2347 e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10282 snprintf(buf, 1000, "\"%s\" files", ext);
2346 7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10283 gtk_file_filter_set_name(filter1, (gchar *)buf);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10284 filter2 = gtk_file_filter_new();
2346 7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10285 gtk_file_filter_add_pattern(filter2, (gchar )"");
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10286 gtk_file_filter_set_name(filter2, (gchar *)"All Files");
2347 e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10287 gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(filew), filter1);
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10288 gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(filew), filter2);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10289 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10290
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10291 if(defpath)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10292 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10293 GFile *path = g_file_new_for_path(defpath);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10294
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10295 /* See if the path exists */
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10296 if(path)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10297 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10298 /* If the path is a directory... set the current folder */
2346 7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10299 if(g_file_query_file_type(path, G_FILE_QUERY_INFO_NONE, NULL) == G_FILE_TYPE_DIRECTORY)
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10300 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(filew), path, NULL);
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10301 else
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10302 gtk_file_chooser_set_file(GTK_FILE_CHOOSER(filew), path, NULL);
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10303
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10304 g_object_unref(G_OBJECT(path));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10305 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10306 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10307
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10308 gtk_widget_show(GTK_WIDGET(filew));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10309 g_signal_connect(G_OBJECT(filew), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10310
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10311 if(DW_POINTER_TO_INT(dw_dialog_wait(tmp)) == GTK_RESPONSE_ACCEPT)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10312 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10313 GFile *file = gtk_file_chooser_get_file(GTK_FILE_CHOOSER(filew));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10314 filename = g_file_get_path(file);
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10315 g_object_unref(G_OBJECT(file));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10316 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10317
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10318 if(GTK_IS_WINDOW(filew))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10319 gtk_window_destroy(GTK_WINDOW(filew));
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10320 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10321 DW_FUNCTION_RETURN_THIS(filename);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10322 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10323
2347 e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10324 static void _dw_exec_launched(GAppLaunchContext context, GAppInfo info, GVariant *platform_data, gpointer data)
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10325 {
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10326 g_variant_lookup(platform_data, "pid", "i", data);
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10327 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10328
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10329 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10330 * Execute and external program in a seperate session.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10331 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10332 * program: Program name with optional path.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10333 * type: Either DW_EXEC_CON or DW_EXEC_GUI.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10334 * params: An array of pointers to string arguements.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10335 * Returns:
2347 e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10336 * DW_ERROR_UNKNOWN on error.
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10337 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10338 int API dw_exec(const char program, int type, char *params)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10339 {
2347 e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10340 GAppInfo *appinfo = NULL;
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10341 char *commandline;
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10342 int retval = DW_ERROR_UNKNOWN;
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10343
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10344 /* Generate a command line from the parameters */
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10345 if(params && *params)
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10346 {
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10347 int z = 0, len = 0;
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10348
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10349 while(params[z])
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10350 {
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10351 len+=strlen(params[z]) + 1;
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10352 z++;
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10353 }
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10354 z=1;
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10355 commandline = calloc(1, len);
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10356 strcpy(commandline, params[0]);
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10357 while(params[z])
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10358 {
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10359 strcat(commandline, " ");
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10360 strcat(commandline, params[z]);
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10361 z++;
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10362 }
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10363 }
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10364 else
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10365 commandline = strdup(program);
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10366
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10367 /* Attempt to use app preferences to launch the application, using the selected Terminal if necessary */
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10368 if((appinfo = g_app_info_create_from_commandline(commandline, NULL,
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10369 type == DW_EXEC_CON ? G_APP_INFO_CREATE_NEEDS_TERMINAL : G_APP_INFO_CREATE_NONE, NULL)))
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10370 {
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10371 GAppLaunchContext *context = g_app_launch_context_new();
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10372
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10373 g_signal_connect(G_OBJECT(context), "launched", G_CALLBACK(_dw_exec_launched), (gpointer)&retval);
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10374
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10375 g_app_info_launch(appinfo, NULL, context, NULL);
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10376
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10377 g_object_unref(appinfo);
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10378 g_object_unref(context);
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10379 }
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10380 free(commandline);
e5d4c86a0c93 GTK4: Rewrite dw_exec() using GLib. Will port to GTK2 and 3 as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2346 diff changeset	10381 return retval;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10382 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10383
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10384 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10385 * Loads a web browser pointed at the given URL.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10386 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10387 * url: Uniform resource locator.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10388 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10389 int API dw_browse(const char *url)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10390 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10391 /* If possible load the URL/URI using gvfs... */
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10392 gtk_show_uri(NULL, url, GDK_CURRENT_TIME);
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10393 return DW_ERROR_NONE;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10394 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10395
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10396 #ifdef USE_WEBKIT
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10397 /* Helper function to get the web view handle */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10398 WebKitWebView _dw_html_web_view(GtkWidget widget)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10399 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10400 if(widget)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10401 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10402 WebKitWebView web_view = (WebKitWebView )widget;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10403 if(WEBKIT_IS_WEB_VIEW(web_view))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10404 return web_view;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10405 #ifndef USE_WEBKIT2
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10406 web_view = (WebKitWebView *)g_object_get_data(G_OBJECT(widget), "_dw_web_view");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10407 if(WEBKIT_IS_WEB_VIEW(web_view))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10408 return web_view;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10409 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10410 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10411 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10412 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10413 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10414 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10415 * Causes the embedded HTML widget to take action.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10416 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10417 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10418 * action: One of the DW_HTML_* constants.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10419 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10420 void API dw_html_action(HWND handle, int action)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10421 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10422 #ifdef USE_WEBKIT
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10423 WebKitWebView *web_view;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10424
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10425 if((web_view = _dw_html_web_view(handle)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10426 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10427 switch(action)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10428 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10429 case DW_HTML_GOBACK:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10430 webkit_web_view_go_back(web_view);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10431 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10432 case DW_HTML_GOFORWARD:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10433 webkit_web_view_go_forward(web_view);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10434 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10435 case DW_HTML_GOHOME:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10436 webkit_web_view_load_uri(web_view, DW_HOME_URL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10437 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10438 case DW_HTML_RELOAD:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10439 webkit_web_view_reload(web_view);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10440 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10441 case DW_HTML_STOP:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10442 webkit_web_view_stop_loading(web_view);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10443 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10444 case DW_HTML_PRINT:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10445 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10446 WebKitPrintOperation *operation = webkit_print_operation_new(web_view);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10447 webkit_print_operation_run_dialog(operation, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10448 g_object_unref(operation);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10449 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10450 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10451 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10452 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10453 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10454 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10455
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10456 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10457 * Render raw HTML code in the embedded HTML widget..
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10458 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10459 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10460 * string: String buffer containt HTML code to
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10461 * be rendered.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10462 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10463 * 0 on success.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10464 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10465 int API dw_html_raw(HWND handle, const char *string)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10466 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10467 #ifdef USE_WEBKIT
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10468 WebKitWebView *web_view;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10469
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10470 if((web_view = _dw_html_web_view(handle)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10471 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10472 webkit_web_view_load_html(web_view, string, "file:///");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10473 gtk_widget_show(GTK_WIDGET(handle));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10474 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10475 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10476 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10477 return DW_ERROR_UNKNOWN;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10478 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10479 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10480
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10481 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10482 * Render file or web page in the embedded HTML widget..
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10483 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10484 * handle: Handle to the window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10485 * url: Universal Resource Locator of the web or
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10486 * file object to be rendered.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10487 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10488 * 0 on success.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10489 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10490 int API dw_html_url(HWND handle, const char *url)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10491 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10492 #ifdef USE_WEBKIT
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10493 WebKitWebView *web_view;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10494
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10495 if((web_view = _dw_html_web_view(handle)))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10496 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10497 webkit_web_view_load_uri(web_view, url);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10498 gtk_widget_show(GTK_WIDGET(handle));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10499 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10500 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10501 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10502 return DW_ERROR_UNKNOWN;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10503 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10504 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10505
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10506 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10507 * Executes the javascript contained in "script" in the HTML window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10508 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10509 * handle: Handle to the HTML window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10510 * script: Javascript code to execute.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10511 * scriptdata: Data passed to the signal handler.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10512 * Notes: A DW_SIGNAL_HTML_RESULT event will be raised with scriptdata.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10513 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10514 * DW_ERROR_NONE (0) on success.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10515 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10516 int API dw_html_javascript_run(HWND handle, const char script, void scriptdata)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10517 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10518 #ifdef USE_WEBKIT
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10519 WebKitWebView *web_view;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10520
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10521 if((web_view = _dw_html_web_view(handle)))
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	10522 webkit_web_view_run_javascript(web_view, script, NULL, _dw_html_result_event, scriptdata);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10523 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10524 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10525 return DW_ERROR_UNKNOWN;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10526 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10527 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10528
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10529 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10530 * Create a new HTML window (widget) to be packed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10531 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10532 * id: An ID to be used with dw_window_from_id() or 0L.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10533 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10534 DW_FUNCTION_DEFINITION(dw_html_new, HWND, DW_UNUSED(ULONG cid))
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10535 DW_FUNCTION_ADD_PARAM1(cid)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10536 DW_FUNCTION_RETURN(dw_html_new, HWND)
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10537 DW_FUNCTION_RESTORE_PARAM1(DW_UNUSED(cid), ULONG)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10538 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10539 GtkWidget *widget = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10540 #ifdef USE_WEBKIT
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10541 WebKitWebView *web_view;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10542 WebKitSettings *settings;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10543
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10544 web_view = (WebKitWebView *)webkit_web_view_new();
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10545 settings = webkit_web_view_get_settings(web_view);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10546 /* Make sure java script is enabled */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10547 webkit_settings_set_enable_javascript(settings, TRUE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10548 webkit_web_view_set_settings(web_view, settings);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10549 widget = (GtkWidget *)web_view;
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10550 g_object_set_data(G_OBJECT(widget), "_dw_id", GINT_TO_POINTER(cid));
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10551 gtk_widget_show(widget);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10552 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10553 dw_debug( "HTML widget not available; you do not have access to webkit.\n" );
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10554 #endif
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10555 DW_FUNCTION_RETURN_THIS(widget);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10556 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10557
2274 b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10558 static void _dw_clipboard_callback(GObject object, GAsyncResult res, gpointer data)
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10559 {
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10560 DWDialog tmp = (DWDialog )data;
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10561
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10562 if(tmp && tmp->data)
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10563 {
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10564 char *text = gdk_clipboard_read_text_finish(GDK_CLIPBOARD(tmp->data), res, NULL);
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10565
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10566 dw_dialog_dismiss(tmp, text ? strdup(text) : text);
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10567 }
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10568 }
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10569
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10570 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10571 * Gets the contents of the default clipboard as text.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10572 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10573 * None.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10574 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10575 * Pointer to an allocated string of text or NULL if clipboard empty or contents could not
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10576 * be converted to text.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10577 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10578 char * API dw_clipboard_get_text(void)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10579 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10580 GdkDisplay *display = gdk_display_get_default();
2274 b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10581 GdkClipboard *clipboard;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10582 char *ret = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10583
2274 b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10584 if((clipboard = gdk_display_get_clipboard(display)))
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10585 {
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10586 DWDialog *tmp = dw_dialog_new(DW_POINTER(clipboard));
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10587
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10588 gdk_clipboard_read_text_async(clipboard, NULL, _dw_clipboard_callback, (gpointer)tmp);
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10589
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10590 ret = (char *)dw_dialog_wait(tmp);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10591 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10592 return ret;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10593 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10594
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10595 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10596 * Sets the contents of the default clipboard to the supplied text.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10597 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10598 * Text.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10599 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10600 void API dw_clipboard_set_text(const char *str, int len)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10601 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10602 GdkDisplay *display = gdk_display_get_default();
2274 b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10603 GdkClipboard *clipboard;
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10604
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10605 if((clipboard = gdk_display_get_clipboard(display)))
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10606 gdk_clipboard_set_text(clipboard, str);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10607 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10608
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10609 /* Internal function to create the drawable pixmap and call the function */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10610 static void _dw_draw_page(GtkPrintOperation operation, GtkPrintContext context, int page_nr)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10611 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10612 cairo_t *cr = gtk_print_context_get_cairo_context(context);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10613 void *drawdata = g_object_get_data(G_OBJECT(operation), "_dw_drawdata");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10614 int (drawfunc)(HPRINT, HPIXMAP, int, void ) = g_object_get_data(G_OBJECT(operation), "_dw_drawfunc");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10615 int result = 0;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10616 HPIXMAP pixmap;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10617
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10618 if(cr && drawfunc && (pixmap = calloc(1,sizeof(struct _hpixmap))))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10619 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10620 pixmap->image = cairo_get_group_target(cr);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10621 pixmap->handle = (HWND)operation;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10622 pixmap->width = gtk_print_context_get_width(context);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10623 pixmap->height = gtk_print_context_get_height(context);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10624 result = drawfunc((HPRINT)operation, pixmap, page_nr, drawdata);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10625 if(result)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10626 gtk_print_operation_draw_page_finish(operation);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10627 free(pixmap);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10628 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10629 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10630
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10631 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10632 * Creates a new print object.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10633 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10634 * jobname: Name of the print job to show in the queue.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10635 * flags: Flags to initially configure the print object.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10636 * pages: Number of pages to print.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10637 * drawfunc: The pointer to the function to be used as the callback.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10638 * drawdata: User data to be passed to the handler function.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10639 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10640 * A handle to the print object or NULL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10641 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10642 HPRINT API dw_print_new(const char jobname, unsigned long flags, unsigned int pages, void drawfunc, void *drawdata)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10643 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10644 GtkPrintOperation *op;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10645
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10646 if(!drawfunc)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10647 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10648
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10649 if((op = gtk_print_operation_new()))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10650 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10651 gtk_print_operation_set_n_pages(op, pages);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10652 gtk_print_operation_set_job_name(op, jobname ? jobname : "Dynamic Windows Print Job");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10653 g_object_set_data(G_OBJECT(op), "_dw_drawfunc", drawfunc);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10654 g_object_set_data(G_OBJECT(op), "_dw_drawdata", drawdata);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10655 g_signal_connect(op, "draw_page", G_CALLBACK(_dw_draw_page), NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10656 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10657 return (HPRINT)op;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10658 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10659
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10660 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10661 * Runs the print job, causing the draw page callbacks to fire.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10662 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10663 * print: Handle to the print object returned by dw_print_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10664 * flags: Flags to run the print job.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10665 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10666 * DW_ERROR_UNKNOWN on error or DW_ERROR_NONE on success.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10667 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10668 int API dw_print_run(HPRINT print, unsigned long flags)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10669 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10670 GtkPrintOperationResult res;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10671 GtkPrintOperation op = (GtkPrintOperation )print;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10672
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10673 res = gtk_print_operation_run(op, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, NULL, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10674 return (res == GTK_PRINT_OPERATION_RESULT_ERROR ? DW_ERROR_UNKNOWN : DW_ERROR_NONE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10675 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10676
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10677 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10678 * Cancels the print job, typically called from a draw page callback.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10679 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10680 * print: Handle to the print object returned by dw_print_new().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10681 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10682 void API dw_print_cancel(HPRINT print)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10683 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10684 GtkPrintOperation op = (GtkPrintOperation )print;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10685
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10686 gtk_print_operation_cancel(op);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10687 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10688
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10689 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10690 * Returns a pointer to a static buffer which contains the
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10691 * current user directory. Or the root directory (C:\ on
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10692 * OS/2 and Windows).
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10693 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10694 char * API dw_user_dir(void)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10695 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10696 static char _user_dir[1024] = "";
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10697
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10698 if(!_user_dir[0])
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10699 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10700 char *home = getenv("HOME");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10701
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10702 if(home)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10703 strcpy(_user_dir, home);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10704 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10705 strcpy(_user_dir, "/");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10706 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10707 return _user_dir;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10708 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10709
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10710 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10711 * Returns a pointer to a static buffer which containes the
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10712 * private application data directory.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10713 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10714 char * API dw_app_dir(void)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10715 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10716 return _dw_share_path;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10717 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10718
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10719 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10720 * Sets the application ID used by this Dynamic Windows application instance.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10721 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10722 * appid: A string typically in the form: com.company.division.application
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10723 * appname: The application name used on Windows or NULL.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10724 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10725 * DW_ERROR_NONE after successfully setting the application ID.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10726 * DW_ERROR_UNKNOWN if unsupported on this system.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10727 * DW_ERROR_GENERAL if the application ID is not allowed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10728 * Remarks:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10729 * This must be called before dw_init(). If dw_init() is called first
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10730 * it will create a unique ID in the form: org.dbsoft.dwindows.application
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10731 * or if the application name cannot be detected: org.dbsoft.dwindows.pid.#
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10732 * The appname is only required on Windows. If NULL is passed the detected
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10733 * application name will be used, but a prettier name may be desired.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10734 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10735 int API dw_app_id_set(const char appid, const char appname)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10736 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10737 if(g_application_id_is_valid(appid))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10738 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10739 strncpy(_dw_app_id, appid, _DW_APP_ID_SIZE);
2333 d0f884083c63 GTK: Use appname in dw_app_id_set() to set g_set_application_name(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2332 diff changeset	10740 if(appname)
d0f884083c63 GTK: Use appname in dw_app_id_set() to set g_set_application_name(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2332 diff changeset	10741 g_set_application_name(appname);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10742 return DW_ERROR_NONE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10743 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10744 return DW_ERROR_GENERAL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10745 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10746
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10747 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10748 * Call a function from the window (widget)'s context.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10749 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10750 * handle: Window handle of the widget.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10751 * function: Function pointer to be called.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10752 * data: Pointer to the data to be passed to the function.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10753 */
2334 29220ecf8db8 GTK4: dw_window_function() actually calls on the main thread now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	10754 DW_FUNCTION_DEFINITION(dw_window_function, void, DW_UNUSED(HWND handle), void function, void data)
29220ecf8db8 GTK4: dw_window_function() actually calls on the main thread now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	10755 DW_FUNCTION_ADD_PARAM3(handle, function, data)
29220ecf8db8 GTK4: dw_window_function() actually calls on the main thread now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	10756 DW_FUNCTION_NO_RETURN(dw_window_function)
29220ecf8db8 GTK4: dw_window_function() actually calls on the main thread now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	10757 DW_FUNCTION_RESTORE_PARAM3(DW_UNUSED(handle), HWND, function, void , data, void )
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10758 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10759 void (* windowfunc)(void *);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10760
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10761 windowfunc = function;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10762
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10763 if(windowfunc)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10764 windowfunc(data);
2334 29220ecf8db8 GTK4: dw_window_function() actually calls on the main thread now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	10765 DW_FUNCTION_RETURN_NOTHING;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10766 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10767
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10768 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10769 * Add a named user data item to a window handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10770 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10771 * window: Window handle of signal to be called back.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10772 * dataname: A string pointer identifying which signal to be hooked.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10773 * data: User data to be passed to the handler function.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10774 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10775 void API dw_window_set_data(HWND window, const char dataname, void data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10776 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10777 HWND thiswindow = window;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10778
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10779 if(!window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10780 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10781
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10782 if(GTK_IS_SCROLLED_WINDOW(window))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10783 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10784 thiswindow = (HWND)g_object_get_data(G_OBJECT(window), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10785 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10786 if(thiswindow && G_IS_OBJECT(thiswindow))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10787 g_object_set_data(G_OBJECT(thiswindow), dataname, (gpointer)data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10788 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10789
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10790 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10791 * Gets a named user data item to a window handle.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10792 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10793 * window: Window handle of signal to be called back.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10794 * dataname: A string pointer identifying which signal to be hooked.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10795 * data: User data to be passed to the handler function.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10796 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10797 void * API dw_window_get_data(HWND window, const char *dataname)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10798 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10799 HWND thiswindow = window;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10800 void *ret = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10801
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10802 if(!window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10803 return NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10804
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10805 if(GTK_IS_SCROLLED_WINDOW(window))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10806 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10807 thiswindow = (HWND)g_object_get_data(G_OBJECT(window), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10808 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10809 if(G_IS_OBJECT(thiswindow))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10810 ret = (void *)g_object_get_data(G_OBJECT(thiswindow), dataname);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10811 return ret;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10812 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10813
2532 457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10814 /*
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10815 * Compare two window handles.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10816 * Parameters:
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10817 * window1: First window handle to compare.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10818 * window2: Second window handle to compare.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10819 * Returns:
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10820 * TRUE if the windows are the same object, FALSE if not.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10821 */
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10822 int API dw_window_compare(HWND window1, HWND window2)
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10823 {
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10824 /* If anything special is require to compare... do it
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10825 * here otherwise just compare the handles.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10826 */
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10827 if(window1 && window2 && window1 == window2)
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10828 return TRUE;
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10829 return FALSE;
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10830 }
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2508 diff changeset	10831
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10832 /* Internal function to get the state of the timer before firing */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10833 gboolean _dw_timer_func(gpointer data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10834 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10835 void (sigfunc)(void data) = NULL;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10836 void *sdata;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10837 char tmpbuf[31] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10838 int *tag = data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10839
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10840 if(tag)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10841 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10842 snprintf(tmpbuf, 30, "_dw_timer%d", *tag);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10843 sigfunc = g_object_get_data(G_OBJECT(_DWObject), tmpbuf);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10844 snprintf(tmpbuf, 30, "_dw_timerdata%d", *tag);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10845 sdata = g_object_get_data(G_OBJECT(_DWObject), tmpbuf);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10846 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10847 if(!sigfunc)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10848 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10849 if(tag)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10850 free(tag);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10851 return FALSE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10852 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10853 sigfunc(sdata);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10854 return TRUE;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10855 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10856
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10857 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10858 * Add a callback to a timer event.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10859 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10860 * interval: Milliseconds to delay between calls.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10861 * sigfunc: The pointer to the function to be used as the callback.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10862 * data: User data to be passed to the handler function.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10863 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10864 * Timer ID for use with dw_timer_disconnect(), 0 on error.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10865 */
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	10866 HTIMER API dw_timer_connect(int interval, void sigfunc, void data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10867 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10868 int *tag;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10869 char tmpbuf[31] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10870
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10871 tag = calloc(1, sizeof(int));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10872
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10873 *tag = g_timeout_add(interval, (GSourceFunc)_dw_timer_func, (gpointer)tag);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10874 snprintf(tmpbuf, 30, "_dw_timer%d", *tag);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10875 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, sigfunc);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10876 snprintf(tmpbuf, 30, "_dw_timerdata%d", *tag);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10877 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10878 return *tag;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10879 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10880
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10881 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10882 * Removes timer callback.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10883 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10884 * id: Timer ID returned by dw_timer_connect().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10885 */
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	10886 void API dw_timer_disconnect(HTIMER id)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10887 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10888 char tmpbuf[31] = {0};
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10889
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10890 snprintf(tmpbuf, 30, "_dw_timer%d", id);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10891 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10892 snprintf(tmpbuf, 30, "_dw_timerdata%d", id);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10893 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10894 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10895
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10896 /* Get the actual signal window handle not the user window handle
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10897 * Should mimic the code in dw_signal_connect() below.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10898 */
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	10899 static HWND _dw_find_signal_window(HWND window, const char *signame)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10900 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10901 HWND thiswindow = window;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10902
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10903 if(GTK_IS_SCROLLED_WINDOW(thiswindow))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10904 thiswindow = (HWND)g_object_get_data(G_OBJECT(window), "_dw_user");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10905 else if(GTK_IS_SCALE(thiswindow) \|\| GTK_IS_SCROLLBAR(thiswindow) \|\| GTK_IS_SPIN_BUTTON(thiswindow))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10906 thiswindow = (GtkWidget *)g_object_get_data(G_OBJECT(thiswindow), "_dw_adjustment");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10907 else if(GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_SELECT) == 0)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10908 thiswindow = (GtkWidget *)gtk_tree_view_get_selection(GTK_TREE_VIEW(thiswindow));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10909 return thiswindow;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10910 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10911
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10912 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10913 * Add a callback to a window event.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10914 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10915 * window: Window handle of signal to be called back.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10916 * signame: A string pointer identifying which signal to be hooked.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10917 * sigfunc: The pointer to the function to be used as the callback.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10918 * data: User data to be passed to the handler function.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10919 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	10920 void API dw_signal_connect(HWND window, const char signame, void sigfunc, void *data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10921 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10922 dw_signal_connect_data(window, signame, sigfunc, NULL, data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10923 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10924
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10925 /* Internal function to free any allocated signal data..
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10926 * and call any required function to free additional memory.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10927 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10928 static void _dw_signal_disconnect(gpointer data, GClosure *closure)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10929 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10930 if(data)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10931 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10932 void params = (void )data;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10933 void (discfunc)(HWND, void ) = params[1];
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10934
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10935 if(discfunc)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10936 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	10937 DWSignalHandler work = _dw_get_signal_handler(data);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10938
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10939 if(work.window)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10940 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10941 discfunc(work.window, work.data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10942 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10943 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10944 free(data);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10945 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10946 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10947
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10948 #define _DW_INTERNAL_CALLBACK_PARAMS 4
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10949
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10950 /* Signal setup functions */
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	10951 GObject _dw_key_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10952 {
2309 e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10953 /* Special case for item enter... we need a mouse callback too */
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10954 if(strcmp(signal->name, DW_SIGNAL_ITEM_ENTER) == 0)
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10955 {
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10956 GtkGesture *gesture = gtk_gesture_click_new();
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10957 gtk_widget_add_controller(GTK_WIDGET(object), GTK_EVENT_CONTROLLER(gesture));
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10958 int cid, sigid = _dw_set_signal_handler(G_OBJECT(object), (HWND)object, sigfunc, data, (gpointer)_dw_container_enter_mouse, discfunc);
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10959 void *newparams = calloc(sizeof(void ), 3);
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10960
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10961 newparams[0] = DW_INT_TO_POINTER(sigid);
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10962 newparams[2] = DW_POINTER(object);
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10963 cid = g_signal_connect_data(G_OBJECT(gesture), "pressed", G_CALLBACK(_dw_container_enter_mouse), newparams, _dw_signal_disconnect, 0);
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10964 _dw_set_signal_handler_id(object, sigid, cid);
e238178186ff GTK: Add a secondary callback for the mouse enter, but keep the logic in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2308 diff changeset	10965 }
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10966 if(GTK_IS_WIDGET(object))
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10967 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10968 GtkEventController *controller = gtk_event_controller_key_new();
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10969 gtk_widget_add_controller(GTK_WIDGET(object), controller);
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10970 return G_OBJECT(controller);
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10971 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10972 return object;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10973 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10974
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	10975 GObject _dw_button_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10976 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10977 /* Special case for handling notification signals, which aren't really signals */
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10978 if(G_IS_NOTIFICATION(object) && strcmp(signal->name, DW_SIGNAL_CLICKED) == 0)
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10979 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10980 char textbuf[101] = {0};
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10981 snprintf(textbuf, 100, "dw-notification-%llu-func", DW_POINTER_TO_ULONGLONG(object));
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10982 g_object_set_data(G_OBJECT(_DWApp), textbuf, DW_POINTER(sigfunc));
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10983 snprintf(textbuf, 100, "dw-notification-%llu-data", DW_POINTER_TO_ULONGLONG(object));
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10984 g_object_set_data(G_OBJECT(_DWApp), textbuf, DW_POINTER(data));
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10985 return NULL;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10986 }
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	10987 /* GTK signal name for check buttons is "toggled" not "clicked" */
a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	10988 else if(GTK_IS_CHECK_BUTTON(object) && strcmp(signal->name, DW_SIGNAL_CLICKED) == 0)
a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	10989 strcpy(signal->gname, "toggled");
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	10990 /* For menu items, get the G(Simple)Action and the signal is "activate" */
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	10991 else if(G_IS_MENU_ITEM(object) && strcmp(signal->name, DW_SIGNAL_CLICKED) == 0)
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	10992 {
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	10993 GSimpleAction *action = G_SIMPLE_ACTION(g_object_get_data(object, "_dw_action"));
2289 26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	10994
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	10995 if(action)
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	10996 {
2291 ce1b9e558584 GTK4: Fix minor logic error causing menu activation callbacks to fail. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2290 diff changeset	10997 int cid, sigid = _dw_set_signal_handler(G_OBJECT(object), (HWND)object, sigfunc, data, (gpointer)_dw_menu_handler, discfunc);
2290 3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	10998 void *newparams = calloc(sizeof(void ), 3);
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	10999
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	11000 newparams[0] = DW_INT_TO_POINTER(sigid);
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11001 newparams[1] = discfunc;
2290 3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	11002 newparams[2] = DW_POINTER(object);
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	11003 cid = g_signal_connect_data(G_OBJECT(action), "activate", G_CALLBACK(_dw_menu_handler), newparams, _dw_signal_disconnect, 0);
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	11004 _dw_set_signal_handler_id(object, sigid, cid);
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	11005 }
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	11006 return NULL;
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	11007 }
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11008 return object;
a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11009 }
a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11010
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11011 GObject _dw_mouse_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data)
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11012 {
a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11013 if(GTK_IS_WIDGET(object))
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11014 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11015 GtkGesture *gesture = gtk_gesture_click_new();
2339 6ad84c425bbd GTK4: Enable all mouse buttons in callbacks, not just button 1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2338 diff changeset	11016 gtk_gesture_single_set_button(GTK_GESTURE_SINGLE(gesture), 0);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11017 gtk_widget_add_controller(GTK_WIDGET(object), GTK_EVENT_CONTROLLER(gesture));
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11018 return G_OBJECT(gesture);
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11019 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11020 return object;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11021 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11022
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11023 GObject _dw_motion_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11024 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11025 if(GTK_IS_WIDGET(object))
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11026 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11027 GtkEventController *controller = gtk_event_controller_motion_new();
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11028 gtk_widget_add_controller(GTK_WIDGET(object), controller);
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11029 return G_OBJECT(controller);
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11030 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11031 return object;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11032 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11033
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11034 GObject _dw_draw_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11035 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11036 if(GTK_IS_DRAWING_AREA(object))
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11037 {
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	11038 g_object_set_data(object, "_dw_expose_func", sigfunc);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11039 gtk_drawing_area_set_draw_func(GTK_DRAWING_AREA(object), signal->func, data, NULL);
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11040 return NULL;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11041 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11042 return object;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11043 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11044
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11045 GObject _dw_tree_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11046 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11047 if(GTK_IS_TREE_VIEW(object))
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11048 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11049 if(strcmp(signal->name, DW_SIGNAL_COLUMN_CLICK) == 0)
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11050 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11051 /* We don't actually need a signal handler here... just need to assign the handler ID
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11052 * Since the handlers for the columns were already created in _dw_container_setup()
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11053 */
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11054 int sigid = _dw_set_signal_handler(object, (HWND)object, sigfunc, data, signal->func, discfunc);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11055 g_object_set_data(object, "_dw_column_click_id", GINT_TO_POINTER(sigid+1));
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11056 return NULL;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11057 }
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	11058 else if(strcmp(signal->name, DW_SIGNAL_ITEM_SELECT) == 0)
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	11059 {
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	11060 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(object));
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	11061 return G_OBJECT(sel);
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	11062 }
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11063 else
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11064 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11065 GtkGesture *gesture = gtk_gesture_click_new();
2287 680212c356e3 GTK4: Refactor tree and fix DW_SIGNAL_ITEM_CONTEXT signals on tree view bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2286 diff changeset	11066 /* Set button to return to 3 for context secondary clicks */
680212c356e3 GTK4: Refactor tree and fix DW_SIGNAL_ITEM_CONTEXT signals on tree view bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2286 diff changeset	11067 if(strcmp(signal->name, DW_SIGNAL_ITEM_CONTEXT) == 0)
680212c356e3 GTK4: Refactor tree and fix DW_SIGNAL_ITEM_CONTEXT signals on tree view bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2286 diff changeset	11068 gtk_gesture_single_set_button(GTK_GESTURE_SINGLE(gesture), 3);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11069 gtk_widget_add_controller(GTK_WIDGET(object), GTK_EVENT_CONTROLLER(gesture));
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11070 return G_OBJECT(gesture);
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11071 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11072 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11073 return object;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11074 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11075
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11076 GObject _dw_value_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11077 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11078 if(GTK_IS_SCALE(object) \|\| GTK_IS_SCROLLBAR(object) \|\| GTK_IS_SPIN_BUTTON(object))
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11079 return G_OBJECT(g_object_get_data(object, "_dw_adjustment"));
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11080 return object;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11081 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11082
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11083 GObject _dw_focus_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11084 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11085 if(GTK_IS_COMBO_BOX(object) && strcmp(signal->name, DW_SIGNAL_SET_FOCUS) == 0)
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11086 return G_OBJECT(gtk_combo_box_get_child(GTK_COMBO_BOX(object)));
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11087 return object;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11088 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11089
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11090 #ifdef USE_WEBKIT
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11091 GObject _dw_html_setup(struct _dw_signal_list signal, GObject object, void sigfunc, void discfunc, void data)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11092 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11093 if(WEBKIT_IS_WEB_VIEW(object) && strcmp(signal->name, DW_SIGNAL_HTML_RESULT) == 0)
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11094 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11095 /* We don't actually need a signal handler here... just need to assign the handler ID
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11096 * Since the handler is created in dw_html_javasript_run()
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11097 */
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11098 int sigid = _dw_set_signal_handler(object, (HWND)object, sigfunc, data, signal->func, discfunc);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11099 g_object_set_data(object, "_dw_html_result_id", GINT_TO_POINTER(sigid+1));
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11100 return NULL;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11101 }
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11102 return object;
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11103 }
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11104 #endif
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11105
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11106 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11107 * Add a callback to a window event with a closure callback.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11108 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11109 * window: Window handle of signal to be called back.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11110 * signame: A string pointer identifying which signal to be hooked.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11111 * sigfunc: The pointer to the function to be used as the callback.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11112 * discfunc: The pointer to the function called when this handler is removed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11113 * data: User data to be passed to the handler function.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11114 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	11115 void API dw_signal_connect_data(HWND window, const char signame, void sigfunc, void discfunc, void data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11116 {
2628 d3d8a93124f1 GTK4: Fix compilation after style standarization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	11117 DWSignalList signal = _dw_findsignal(signame);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11118
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11119 if(signal.func)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11120 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11121 GObject object = (GObject )window;
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11122 void **params;
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11123 int sigid;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11124 gint cid;
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11125
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11126 /*
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11127 * If the window we are setting the signal on is a scrolled window we need to get
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11128 * the "real" widget type. thiswindow is the "real" widget type
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11129 */
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11130 if (GTK_IS_SCROLLED_WINDOW(window)
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11131 #ifdef USE_WEBKIT
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11132 && !(object = G_OBJECT(_dw_html_web_view(window)))
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11133 #endif
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11134 )
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11135 object = (GObject *)g_object_get_data(G_OBJECT(window), "_dw_user");
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11136
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11137 /* Do object class specific setup */
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11138 if(signal.setup)
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11139 object = signal.setup(&signal, object, sigfunc, discfunc, data);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11140
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11141 if(!object)
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11142 return;
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11143
fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11144 params = calloc(_DW_INTERNAL_CALLBACK_PARAMS, sizeof(void *));
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11145 sigid = _dw_set_signal_handler(object, window, sigfunc, data, signal.func, discfunc);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11146 params[0] = DW_INT_TO_POINTER(sigid);
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11147 /* Save the disconnect function pointer */
fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11148 params[1] = discfunc;
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11149 params[2] = DW_POINTER(object);
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11150 cid = g_signal_connect_data(object, signal.gname, G_CALLBACK(signal.func), params, _dw_signal_disconnect, 0);
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11151 _dw_set_signal_handler_id(object, sigid, cid);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11152 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11153 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11154
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11155 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11156 * Removes callbacks for a given window with given name.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11157 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11158 * window: Window handle of callback to be removed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11159 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	11160 void API dw_signal_disconnect_by_name(HWND window, const char *signame)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11161 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11162 int z, count;
2628 d3d8a93124f1 GTK4: Fix compilation after style standarization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	11163 DWSignalList signal;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11164 void *params = alloca(sizeof(void ) * 3);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11165
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	11166 params[2] = _dw_find_signal_window(window, signame);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11167 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(params[2]), "_dw_sigcounter"));
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11168 signal = _dw_findsignal(signame);
a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11169
a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11170 if(signal.func)
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11171 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11172 for(z=0;z<count;z++)
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11173 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	11174 DWSignalHandler sh;
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11175
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11176 params[0] = GINT_TO_POINTER(z);
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11177 sh = _dw_get_signal_handler(params);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11178
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11179 if(sh.intfunc == signal.func)
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11180 _dw_remove_signal_handler((HWND)params[2], z);
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11181 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11182 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11183 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11184
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11185 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11186 * Removes all callbacks for a given window.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11187 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11188 * window: Window handle of callback to be removed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11189 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	11190 void API dw_signal_disconnect_by_window(HWND window)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11191 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11192 HWND thiswindow;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11193 int z, count;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11194
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	11195 thiswindow = _dw_find_signal_window(window, NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11196 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(thiswindow), "_dw_sigcounter"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11197
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11198 for(z=0;z<count;z++)
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11199 _dw_remove_signal_handler(thiswindow, z);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11200 g_object_set_data(G_OBJECT(thiswindow), "_dw_sigcounter", NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11201 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11202
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11203 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11204 * Removes all callbacks for a given window with specified data.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11205 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11206 * window: Window handle of callback to be removed.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11207 * data: Pointer to the data to be compared against.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11208 */
2323 4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	11209 void API dw_signal_disconnect_by_data(HWND window, void *data)
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11210 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11211 int z, count;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11212 void *params = alloca(sizeof(void ) * 3);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11213
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	11214 params[2] = _dw_find_signal_window(window, NULL);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11215 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(params[2]), "_dw_sigcounter"));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11216
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11217 for(z=0;z<count;z++)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11218 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	11219 DWSignalHandler sh;
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11220
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11221 params[0] = GINT_TO_POINTER(z);
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11222 sh = _dw_get_signal_handler(params);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11223
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11224 if(sh.data == data)
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11225 _dw_remove_signal_handler((HWND)params[2], z);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11226 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11227 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11228
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11229 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11230 * Converts a UTF-8 encoded string into a wide string.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11231 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11232 * utf8string: UTF-8 encoded source string.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11233 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11234 * Wide string that needs to be freed with dw_free()
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11235 * or NULL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11236 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11237 wchar_t * API dw_utf8_to_wchar(const char *utf8string)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11238 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11239 wchar_t retval = NULL, freeme;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11240
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11241 if(sizeof(wchar_t) == sizeof(gunichar))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11242 freeme = retval = (wchar_t *)g_utf8_to_ucs4(utf8string, -1, NULL, NULL, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11243 else if(sizeof(wchar_t) == sizeof(gunichar2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11244 freeme = retval = (wchar_t *)g_utf8_to_utf16(utf8string, -1, NULL, NULL, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11245 if(retval)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11246 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11247 retval = wcsdup(retval);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11248 g_free(freeme);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11249 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11250 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11251 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11252
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11253 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11254 * Converts a wide string into a UTF-8 encoded string.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11255 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11256 * wstring: Wide source string.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11257 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11258 * UTF-8 encoded string that needs to be freed with dw_free()
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11259 * or NULL on failure.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11260 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11261 char * API dw_wchar_to_utf8(const wchar_t *wstring)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11262 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11263 char retval = NULL, freeme;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11264
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11265 if(sizeof(wchar_t) == sizeof(gunichar))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11266 freeme = retval = g_ucs4_to_utf8((gunichar *)wstring, -1, NULL, NULL, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11267 else if(sizeof(wchar_t) == sizeof(gunichar2))
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11268 freeme = retval = g_utf16_to_utf8((gunichar2 *)wstring, -1, NULL, NULL, NULL);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11269 if(retval)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11270 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11271 retval = strdup(retval);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11272 g_free(freeme);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11273 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11274 return retval;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11275 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11276
2506 fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11277 DW_FUNCTION_DEFINITION(dw_x11_check, int, int trueresult, int falseresult)
2508 cb795bba48a4 GTK4: Fix the new dw_x11_check() function that is thread safe. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2506 diff changeset	11278 DW_FUNCTION_ADD_PARAM2(trueresult, falseresult)
cb795bba48a4 GTK4: Fix the new dw_x11_check() function that is thread safe. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2506 diff changeset	11279 DW_FUNCTION_RETURN(dw_x11_check, int)
cb795bba48a4 GTK4: Fix the new dw_x11_check() function that is thread safe. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2506 diff changeset	11280 DW_FUNCTION_RESTORE_PARAM2(trueresult, int, falseresult, int)
2506 fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11281 {
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11282 int retval = falseresult;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11283 #ifdef GDK_WINDOWING_X11
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11284 GdkDisplay *display = gdk_display_get_default();
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11285
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11286 if(display && GDK_IS_X11_DISPLAY(display))
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11287 {
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11288 retval = trueresult;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11289 }
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11290 #endif
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11291 DW_FUNCTION_RETURN_THIS(retval);
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11292 }
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11293
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11294 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11295 * Gets the state of the requested library feature.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11296 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11297 * feature: The requested feature for example DW_FEATURE_DARK_MODE
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11298 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11299 * DW_FEATURE_UNSUPPORTED if the library or OS does not support the feature.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11300 * DW_FEATURE_DISABLED if the feature is supported but disabled.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11301 * DW_FEATURE_ENABLED if the feature is supported and enabled.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11302 * Other value greater than 1, same as enabled but with extra info.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11303 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11304 int API dw_feature_get(DWFEATURE feature)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11305 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11306 switch(feature)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11307 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11308 #ifdef USE_WEBKIT
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11309 case DW_FEATURE_HTML:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11310 case DW_FEATURE_HTML_RESULT:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11311 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11312 case DW_FEATURE_NOTIFICATION:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11313 case DW_FEATURE_UTF8_UNICODE:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11314 case DW_FEATURE_MLE_WORD_WRAP:
2410 0286ac44d347 Add DW_FEATURE_TREE feature test, since iOS does not suppor tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2371 diff changeset	11315 case DW_FEATURE_TREE:
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11316 return DW_FEATURE_ENABLED;
2506 fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11317 case DW_FEATURE_WINDOW_PLACEMENT:
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11318 return dw_x11_check(DW_FEATURE_ENABLED, DW_FEATURE_UNSUPPORTED);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11319 default:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11320 return DW_FEATURE_UNSUPPORTED;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11321 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11322 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11323
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11324 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11325 * Sets the state of the requested library feature.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11326 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11327 * feature: The requested feature for example DW_FEATURE_DARK_MODE
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11328 * state: DW_FEATURE_DISABLED, DW_FEATURE_ENABLED or any value greater than 1.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11329 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11330 * DW_FEATURE_UNSUPPORTED if the library or OS does not support the feature.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11331 * DW_ERROR_NONE if the feature is supported and successfully configured.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11332 * DW_ERROR_GENERAL if the feature is supported but could not be configured.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11333 * Remarks:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11334 * These settings are typically used during dw_init() so issue before
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11335 * setting up the library with dw_init().
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11336 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11337 int API dw_feature_set(DWFEATURE feature, int state)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11338 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11339 switch(feature)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11340 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11341 /* These features are supported but not configurable */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11342 #ifdef USE_WEBKIT
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11343 case DW_FEATURE_HTML:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11344 case DW_FEATURE_HTML_RESULT:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11345 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11346 case DW_FEATURE_NOTIFICATION:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11347 case DW_FEATURE_UTF8_UNICODE:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11348 case DW_FEATURE_MLE_WORD_WRAP:
2410 0286ac44d347 Add DW_FEATURE_TREE feature test, since iOS does not suppor tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2371 diff changeset	11349 case DW_FEATURE_TREE:
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11350 return DW_ERROR_GENERAL;
2506 fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11351 case DW_FEATURE_WINDOW_PLACEMENT:
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11352 return dw_x11_check(DW_ERROR_GENERAL, DW_FEATURE_UNSUPPORTED);
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11353 /* These features are supported and configurable */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11354 default:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11355 return DW_FEATURE_UNSUPPORTED;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11356 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11357 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11358
2313 c6ea79c74c03 GTK4: Remove some lingering eventbox code from GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2312 diff changeset	11359

Mercurial > dwindows

annotate gtk4/dw.c @ 2975:ae4d6856b983