dwindows: gtk4/dw.c annotate

annotate gtk4/dw.c @ 2854:8a5131cbbe93

GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). Also similar to the other platforms, no longer install XPMs to gtk/. GTK4 is currently untested, if it doesn't work, may be a follow-up. Also fix a GCC fortify warning with strncpy().

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 15 Nov 2022 02:29:56 +0000
parents	cd6a306800f5
children	86286f528adf

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 *
2751 ee1cfa7d645e Update copyright dates for the new year 2022. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6 * (C) 2000-2022 Brian Smith <brian@dbsoft.org>
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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	42 #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	43 # 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	44 # 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	45 # else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	46 # 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	47 # endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	48 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	49
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	50 /* 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	51 * #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	52 * 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	53 * [0] Pointer to the thread's event semaphore
2311 f6a6ea6b28fe Fix a minor typo. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2310 diff changeset	54 * [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	55 * [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	56 * ...
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	57 */
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	58 #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	59 #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	60 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	61 #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	62 _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	63 _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	64 _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	65 _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	66 #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	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; \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	69 _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	70 _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	71 _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	72 #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	73 _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	74 _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	75 _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	76 _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	77 _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	78 _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	79 #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	80 _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	81 _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	82 _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	83 _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	84 _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	85 _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	86 _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	87 #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	88 _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	89 _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	90 _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	91 _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	92 _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	93 _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	94 _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	95 _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	96 #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	97 _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	98 _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	99 _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	100 _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	101 _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	102 _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	103 _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	104 _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	105 _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	106 #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	107 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	108 _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	109 _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	110 _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	111 _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	112 _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	113 _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	114 _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	115 _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	116 _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	117 _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	118 #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	119 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	120 _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	121 _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	122 _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	123 _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	124 _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	125 _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	126 _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	127 _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	128 _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	129 _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	130 _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	131 #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	132 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	133 _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	134 _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	135 _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	136 _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	137 _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	138 _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	139 _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	140 _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	141 _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	142 _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	143 _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	144 _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	145 #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	146 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	147 _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	148 _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	149 _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	150 _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	151 _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	152 _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	153 _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	154 _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	155 _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	156 _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	157 _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	158 _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	159 _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	160 #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	161 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	162 _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	163 _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	164 _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	165 _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	166 _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	167 _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	168 _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	169 _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	170 _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	171 _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	172 _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	173 _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	174 _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	175 _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	176 #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	177 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	178 _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	179 _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	180 _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	181 _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	182 _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	183 _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	184 _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	185 _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	186 _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	187 _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	188 _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	189 _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	190 _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	191 _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	192 _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	193 #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	194 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	195 _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	196 _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	197 _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	198 _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	199 _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	200 _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	201 _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	202 _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	203 _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	204 _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	205 _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	206 _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	207 _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	208 _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	209 _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	210 _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	211 #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	212 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	213 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	214 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	215 #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	216 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	217 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	218 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	219 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	220 #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	221 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	222 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	223 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	224 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	225 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	226 #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	227 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	228 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	229 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	230 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	231 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	232 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	233 #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	234 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	235 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	236 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	237 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	238 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	239 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	240 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	241 #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	242 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	243 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	244 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	245 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	246 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	247 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	248 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	249 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	250 #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	251 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	252 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	253 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	254 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	255 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	256 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	257 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	258 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	259 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	260 #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	261 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	262 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	263 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	264 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	265 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	266 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	267 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	268 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	269 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	270 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	271 #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	272 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	273 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	274 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	275 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	276 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	277 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	278 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	279 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	280 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	281 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	282 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	283 #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	284 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	285 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	286 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	287 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	288 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	289 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	290 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	291 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	292 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	293 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	294 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	295 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	296 #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	297 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	298 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	299 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	300 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	301 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	302 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	303 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	304 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	305 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	306 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	307 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	308 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	309 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	310 #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	311 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	312 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	313 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	314 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	315 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	316 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	317 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	318 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	319 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	320 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	321 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	322 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	323 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	324 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	325 #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	326 #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	327 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	328 _##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	329 else { \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	330 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	331 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	332 }\
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	333 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	334 #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	335 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	336 _##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	337 else { \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	338 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	339 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	340 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	341 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	342 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	343 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	344 } \
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	345 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	346 #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	347 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	348 _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	349 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	350 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	351 #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	352 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	353 #else
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	354 #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	355 #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	356 #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	357 #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	358 #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	359 #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	360 #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	361 #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	362 #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	363 #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	364 #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	365 #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	366 #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	367 #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	368 #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	369 #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	370 #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	371 #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	372 #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	373 #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	374 #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	375 #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	376 #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	377 #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	378 #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	379 #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	380 #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	381 #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	382 #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	383 #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	384 #endif
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	385
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	386 /* 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	387 * 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	388 * 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	389 * 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	390 * 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	391 * 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	392 * 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	393 */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	394 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	395 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	396 { 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	397 { 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	398 { 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	399 { 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	400 { 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	401 { 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	402 { 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	403 { 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	404 { 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	405 { 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	406 { 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	407 { 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	408 { 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	409 { 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	410 { 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	411 { 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	412 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	413
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	414 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	415 * 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	416 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	417 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	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 ".xpm",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	420 ".png",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	421 ".ico",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	422 ".icns",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	423 ".gif",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	424 ".jpg",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	425 ".jpeg",
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	426 ".tiff",
2312 ada8f7610df0 GTK4: Fix building with -D_DW_SINGLE_THREADED and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2311 diff changeset	427 ".bmp",
ada8f7610df0 GTK4: Fix building with -D_DW_SINGLE_THREADED and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2311 diff changeset	428 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	429 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	430
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	431 #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	432 # 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	433 #endif
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 #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	436 # 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	437 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	438
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	439 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	440 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	441 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	442
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	443 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	444
2337 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 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	446
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 #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	448 #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	449 #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	450 #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	451
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	452 #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	453
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	454 /* 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	455 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	456 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	457 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	458 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	459 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	460 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	461 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	462 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	463 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	464 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	465 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	466 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	467 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	468 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	469 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	470 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	471 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	472 #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	473 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	474 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	475 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	476 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	477 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	478
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	479 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	480 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	481 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	482 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	483 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	484 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	485 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	486 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	487
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	488 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	489 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	490 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	491 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	492 char gname[30];
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	493 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	494
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	495 } 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	496
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 /* Signal setup function prototypes */
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	498 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	499 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	500 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	501 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	502 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	503 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	504 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	505 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	506 #ifdef USE_WEBKIT
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	507 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	508 #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	509
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	510 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	511 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	512 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	513 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	514 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	515 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	516 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	517
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	518 } 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	519
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	520 /* 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	521 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	522 { _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	523 { _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	524 { _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	525 { _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	526 { _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	527 { _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	528 { _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	529 { _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	530 { _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	531 { _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	532 { _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	533 { _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	534 { _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	535 { _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	536 { _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	537 { _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	538 { _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	539 #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	540 { _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	541 { _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	542 #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	543 { 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	544 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	545
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	546 /* 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	547 #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	548 #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	549 #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	550 #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	551 #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	552
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	553 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	554 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	555 #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	556 /* 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	557 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	558
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	559 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	560 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	561 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	562 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	563 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	564 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	565 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	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 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	568 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	569 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	570 #endif
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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	573 /* 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	574 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	575 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	576 int z=0;
2628 d3d8a93124f1 GTK4: Fix compilation after style standarization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	577 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	578
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	579 while(DWSignalTranslate[z].func)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	580 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	581 if(strcasecmp(signame, DWSignalTranslate[z].name) == 0)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	582 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	583 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	584 }
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	585 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	586 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	587
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	588 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	589 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	590 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	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 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	593 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	594 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	595 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	596 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	597 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	598
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	599 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	600 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	601 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	602 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	603 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	604 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	605 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	606 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	607 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	608 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	609 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	610 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	611 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	612
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	613 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	614 {
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	615 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	616 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	617
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	618 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	619 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	620 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	621 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	622 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	623 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	624 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	625 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	626 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	627 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	628 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	629 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	630 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	631 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	632
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	633 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	634 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	635 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	636 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	637
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	638 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	639 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	640 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	641 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	642 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	643 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	644 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	645 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	646 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	647 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	648
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	649 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, "_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	651
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	652 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	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
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	655 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	656 {
2660 650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2628 diff changeset	657 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	658 {
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	659 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	660
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	661 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	662 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	663 }
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2628 diff changeset	664 else
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2628 diff changeset	665 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	666 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	667
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	668 #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	669 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	670 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	671 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	672 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	673 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	674 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	675 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	676 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	677 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	678
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	679 _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	680 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	681 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	682 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	683 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	684
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	685 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	686
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	687 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	688 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	689 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	690 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	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 }
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 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	695 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	696 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	697 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	698 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	699 _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	700 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	701 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	702
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	703 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	704 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	705 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	706 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	707 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	708
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(htmlresultfunc)
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 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	712 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	713 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	714 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	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 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	717 }
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 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	719 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	720 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	721 _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	722 }
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	723
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	724 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	725 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	726 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	727 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	728 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	729
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	730 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	731 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	732 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	733 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	734 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	735 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	736 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	737 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	738 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	739 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	740 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	741 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	742 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	743 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	744 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	745 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	746 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	747
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	748 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	749 }
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 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	752
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	753 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	754 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	755 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	756 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	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 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	759
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	760 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	761 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	762 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	763
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	764 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	765 }
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
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	768 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	769 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	770 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	771 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	772
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	773 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	774 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	775 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	776 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	777
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	778 if(mybutton == 3)
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	779 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	780 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	781 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	782
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	783 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	784
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	785 _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	786
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	787 _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	788 _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	789 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	790 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	791 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	792
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	793 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	794 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	795 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	796 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	797
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	798 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	799 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	800 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	801 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	802
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	803 if(mybutton == 3)
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	804 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	805 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	806 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	807
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	808 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	809
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	810 _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	811
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	812 _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	813 _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	814 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	815 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	816 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	817
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	818 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	819 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	820 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	821 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	822
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	823 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	824 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	825 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	826 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	827 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	828 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	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 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	831 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	832 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	833 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	834 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	835 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	836
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	837 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	838
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	839 _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	840
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	841 _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	842 _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	843 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	844 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	845 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	846
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	847 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	848 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	849 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	850 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	851
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	852 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	853 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	854 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	855
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	856 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	857 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	858 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	859 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	860
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	861 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	862 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	863 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	864 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	865
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	866 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	867 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	868 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	869 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	870 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	871
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	872 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	873
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	874 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	875 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	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 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	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
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	880 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	881 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	882 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	883 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	884
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	885 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	886 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	887 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	888
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	889 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	890 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	891 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	892 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	893
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	894 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	895 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	896 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	897 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	898
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	899 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	900 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	901 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	902
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	903 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	904 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	905 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	906 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	907
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	908 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	909 {
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	910 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	911 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	912
2365 77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	913 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	914 _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	915
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	916 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	917 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	918 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	919 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	920
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	921 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	922 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	923 {
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	924 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	925 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	926 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	927 /* 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	928 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	929 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	930 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	931 }
2365 77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	932 #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	933 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	934 #else
77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	935 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	936 #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	937 }
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	938
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	939 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	940 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	941 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	942
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	943 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	944 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	945 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	946 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	947
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	948 _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	949
2365 77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2363 diff changeset	950 /* 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	951 _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	952
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	953 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	954 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	955 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	956 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	957 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	958 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	959
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	960 /* 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	961 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	962 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	963 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	964 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	965 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	966 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	967
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	968 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	969 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	970 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	971 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	972
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	973 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	974 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	975
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	976 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	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 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	979
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	980 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	981 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	982 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	983 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	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 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	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 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	988 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	989 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	990
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	991 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	992 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	993 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	994
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	995 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	996 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	997 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	998
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	999 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	1000 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1001 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	1002 }
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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1005 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	1006 }
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 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	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
2757 b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1011 /* 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	1012 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	1013 {
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1014 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	1015
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1016 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	1017 {
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1018 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	1019
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1020 /* 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	1021 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	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 *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	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(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	1026 parent = box;
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
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1029 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	1030 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	1031
2758 e1b5dbec0796 GTK4: Was still passing the root parameter to the transform function, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2757 diff changeset	1032 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	1033 {
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1034 *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	1035 *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	1036 }
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1037
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1038 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	1039 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	1040 }
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
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1043 #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	1044 #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	1045
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	1046 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	1047 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1048 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	1049 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	1050
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1051 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	1052 {
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	1053 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	1054
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1055 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	1056 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1057 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	1058 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	1059 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	1060 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	1061
b91bc30d0e4a GTK4: dw_menu_popup() coordinates are relative to the parent window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	1062 _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	1063
cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	1064 _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	1065 _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	1066
2335 1d413d869fa2 GTK4: Trees/Containers were not passing correct data due to missing scrolled bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2334 diff changeset	1067 /* 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	1068 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	1069 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	1070
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1071 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	1072 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1073 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	1074 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	1075 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	1076
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1077 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	1078 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	1079 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1080 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	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 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	1083 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1084 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1085 {
2470 8f7c2f20c7c0 GTK4: Fill in the row data for contatiner context. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2441 diff changeset	1086 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	1087 }
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 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1091 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	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 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	1094 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	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 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	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 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	1099 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1100 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	1101 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1102 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	1103 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1104 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1105 {
2470 8f7c2f20c7c0 GTK4: Fill in the row data for contatiner context. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2441 diff changeset	1106 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	1107 }
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 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	1110 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1111 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1112 }
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	1113 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	1114 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	1115 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1118 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	1119 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1120
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1121 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	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 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	1124 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	1125
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1126 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	1127 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1128 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	1129
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1130 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	1131 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1132 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	1133 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	1134 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	1135 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	1136 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	1137
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1138 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	1139 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1140 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	1141 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1144 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	1145 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	1146 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1147 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	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 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	1150 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	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 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	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, _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	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
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 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	1160
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1161 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	1162 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1163 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	1164
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1165 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	1166 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1167 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	1168
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1169 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	1170 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1171 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	1172 }
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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1175 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1176 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1177 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	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 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	1180 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	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 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	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 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	1185 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1186 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	1187 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1188 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	1189 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	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 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	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, _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	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
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 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	1199
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1200 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	1201 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1202 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	1203
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1204 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	1205 }
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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1208 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	1209 }
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 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	1212 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	1213 }
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 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	1216 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1217
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1218 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	1219 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1220 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	1221 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	1222
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1223 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	1224 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1225 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	1226 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	1227 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1228 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	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
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	1231 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	1232 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1233 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	1234 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	1235
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	1236 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	1237 {
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	1238 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	1239 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	1240 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	1241 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	1242 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	1243
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	1244 /* 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	1245 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	1246 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1247 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	1248 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	1249 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	1250
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1251 /* 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	1252 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	1253 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1254 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	1255 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	1256
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1257 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	1258 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	1259 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1260 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	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 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	1263 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1264 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	1265 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1266 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	1267 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	1268 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	1269 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1272 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	1273 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1274 }
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 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	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
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	1280 /* 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	1281 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	1282 {
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	1283 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	1284 _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	1285 }
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
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1287 /* 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	1288 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	1289 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1290 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	1291 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	1292 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	1293
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1294 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	1295 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1296 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	1297 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1298 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	1299 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1302 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	1303 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1304
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1305
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1306 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	1307 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1308 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	1309 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	1310
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1311 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	1312 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1313 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	1314 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	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 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	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
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1319 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	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 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	1322 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	1323
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1324 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	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 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	1327 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	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(handlerdata)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1330 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1331 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	1332
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1333 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	1334 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	1335
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1336 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	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 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	1339 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	1340 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	1341 }
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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1344 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	1345 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1346
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1347 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	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 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	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 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	1352 newval++;
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 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	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
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1357 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	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 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	1360 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	1361 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	1362
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1363 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	1364 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	1365
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1366 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	1367 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	1368 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	1369
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1370 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	1371 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	1372
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1373 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	1374 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	1375
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1376 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	1377 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1378 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	1379
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1380 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	1381 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1382 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	1383
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1384 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	1385 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	1386 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1387 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1390 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	1391 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1392
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1393 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	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 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	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 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	1398 {
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	1399 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	1400 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1401 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	1402 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	1403 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1404 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1407 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	1408 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1409
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	1410 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	1411 {
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	1412 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	1413
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	1414 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	1415 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	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
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1418 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	1419 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1420 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	1421
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	1422 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	1423 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	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
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1426 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	1427 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1428 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	1429 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	1430
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1431 /* 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	1432 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	1433 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	1434
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1435 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	1436 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	1437 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1438 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	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(userwidth)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1441 *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	1442 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	1443 *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	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 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	1446 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1447
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1448 /* 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	1449 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	1450 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1451 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	1452 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	1453 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	1454
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1455 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	1456 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	1457 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	1458 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	1459 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	1460 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	1461
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1462 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	1463 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	1464 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1465
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1466 /* Handle menu click callbacks */
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1467 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	1468 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1469 DWSignalHandler work = _dw_get_signal_handler(data);
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1470 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	1471
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1472 /* 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	1473 if(action_state)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1474 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1475 gboolean active = g_variant_get_boolean(action_state);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1476 GVariant *new_state = g_variant_new_boolean(!active);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1477 g_simple_action_set_state(action, new_state);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	1478 }
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1479
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1480 if(work.window)
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1481 {
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1482 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	1483
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	1484 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	1485 }
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
2276 d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1488 /* 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	1489 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	1490 {
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1491 /* 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	1492 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	1493 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	1494 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	1495 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	1496 }
d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	1497
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1498 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	1499 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1500 /* 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	1501 * 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	1502 * 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	1503 */
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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1506 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1507 * Initializes the Dynamic Windows engine.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1508 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1509 * newthread: True if this is the only thread.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1510 * False if there is already a message loop running.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1511 */
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	1512 int API dw_init(int newthread, int argc, char *argv[])
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1513 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1514 /* Setup the private 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	1515 if(argc > 0 && argv[0])
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1516 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1517 char *pathcopy = strdup(argv[0]);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1518 char *pos = strrchr(pathcopy, '/');
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1519 char *binname = pathcopy;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1520
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1521 /* 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	1522 * 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	1523 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1524 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	1525 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1526 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	1527 *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	1528 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1529
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1530 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	1531 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1532 char *binpos = strstr(pathcopy, "/bin");
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1533
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1534 if(binpos)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1535 strncpy(_dw_share_path, pathcopy, (size_t)(binpos - pathcopy));
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1536 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1537 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	1538 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	1539 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	1540 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	1541 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1542 /* 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	1543 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1546 if(pathcopy)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1547 free(pathcopy);
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 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	1550 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	1551 _dw_share_path[0] = '/';
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1552
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1553 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	1554
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1555 _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	1556 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	1557
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1558 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	1559 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	1560 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	1561
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1562 _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	1563
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1564 /* 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	1565 _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	1566
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1567 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	1568 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1569 /* 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	1570 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	1571 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1572
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1573 /* 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	1574 * 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	1575 * 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	1576 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1577 _DWApp = g_application_new(_dw_app_id, G_APPLICATION_FLAGS_NONE);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1578 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	1579 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1580 /* 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	1581 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	1582
58700e9fcba3 GTK3/4: Add call to g_set_prgname() with the Application ID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2329 diff changeset	1583 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	1584 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	1585 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	1586 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	1587 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	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 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	1590 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1593 * 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	1594 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1595 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	1596 {
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	1597 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	1598
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	1599 _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	1600 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	1601 _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	1602 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1603
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1604 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1605 * 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	1606 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1607 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	1608 {
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1609 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	1610 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1611
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1612 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1613 * 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	1614 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1615 * 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	1616 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1617 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	1618 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1619 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	1620 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	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 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	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 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	1625 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1626 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	1627
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1628 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	1629
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1630 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	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 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	1633 _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	1634 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	1635 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	1636 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1637 _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	1638 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	1639 _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	1640 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1643 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1644 _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	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
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 * 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	1649 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1650 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	1651 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1652 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	1653 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	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 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	1656 _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	1657 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	1658 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	1659 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1660 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	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 = orig;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1663 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1664
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1665 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1666 * 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	1667 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1668 * 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	1669 * 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	1670 */
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	1671 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	1672 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1673 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	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 * 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	1678 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1679 * 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	1680 */
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	1681 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	1682 {
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1683 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	1684
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	1685 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	1686 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1687 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	1688 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	1689 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	1690 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	1691 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	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 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1696 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1697 * 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	1698 * 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	1699 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1700 * 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	1701 * 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	1702 */
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	1703 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	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 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	1706 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	1707 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	1708 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1709 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	1710 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	1711 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	1712 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1713
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1714 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1715 * 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	1716 * 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	1717 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1718 * 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	1719 */
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	1720 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	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 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	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 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	1725 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	1726
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	1727 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	1728 {
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->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	1730 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	1731 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1732 else
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->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	1735 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	1736 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1737
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_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	1739 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	1740 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	1741 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	1742 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1745 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1746 * 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	1747 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1748 * 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	1749 * ...: 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	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 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	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 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	1754 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	1755
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1756 va_start(args, format);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1757 vsnprintf(outbuf, 1024, format, args);
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1758 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	1759
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1760 fprintf(stderr, "%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	1761 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1762
2327 0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1763 /* 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	1764 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	1765 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	1766 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	1767 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	1768 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1769 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	1770 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	1771 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	1772 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	1773 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	1774 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	1775
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1776 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	1777 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	1778 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	1779 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	1780 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	1781 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	1782 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	1783 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	1784
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1785 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	1786 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	1787 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	1788 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	1789
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1790 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	1791 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	1792 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	1793 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	1794 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	1795 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	1796 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	1797 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	1798 /* 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	1799 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	1800 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	1801 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	1802 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	1803 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	1804 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	1805 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1806 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	1807 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	1808 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	1809 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	1810 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	1811 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	1812 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	1813 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	1814 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	1815 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	1816 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	1817 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	1818 default:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1819 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1820 /* 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	1821 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	1822 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	1823 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	1824 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	1825 }
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1826 }
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1827 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	1828 }
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1829
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1830 /*
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1831 * 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	1832 * Parameters:
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1833 * 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	1834 * 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	1835 * 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	1836 * ...: 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	1837 */
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1838 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	1839 {
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1840 va_list args;
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1841 char outbuf[1025] = {0};
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1842
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1843 va_start(args, format);
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1844 vsnprintf(outbuf, 1024, format, args);
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1845 va_end(args);
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1846
0d7f8136d771 GTK4: Move dw_messagebox() into thread safety protection using dw_messagebox_int(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2326 diff changeset	1847 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	1848 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1849
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 * 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	1852 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1853 * 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	1854 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1855 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	1856 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	1857 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	1858 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	1859 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1860 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	1861
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	1862 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	1863 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	1864 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	1865 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1866
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1867 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1868 * 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	1869 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1870 * 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	1871 */
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	1872 #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	1873 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	1874 {
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1875 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	1876 }
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	1877 #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	1878 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	1879 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	1880 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	1881 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	1882 {
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	1883 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	1884 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	1885
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	1886 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	1887 {
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	1888 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	1889
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	1890 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	1891 {
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	1892 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	1893 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	1894 }
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	1895 }
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	1896 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	1897 }
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	1898 #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	1899
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1900 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1901 * 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	1902 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1903 * 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	1904 */
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	1905 #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	1906 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	1907 {
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	1908 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	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 #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	1911 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	1912 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	1913 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	1914 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	1915 {
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 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	1917 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	1918
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	1919 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	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 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	1922
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	1923 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	1924 {
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 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	1926 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	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 }
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 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	1930 }
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 #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	1932
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1933 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1934 * 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	1935 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1936 * 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	1937 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1938 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	1939 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	1940 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	1941 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	1942 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1943 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	1944
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1945 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	1946 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1947 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	1948 {
2369 5b3b51ba5239 GTK4: Minor code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2368 diff changeset	1949 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	1950
2368 ec90b552b266 GTK4: Switch to using gtk_window_present() in dw_window_show(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2367 diff changeset	1951 gtk_window_present(GTK_WINDOW(handle));
2369 5b3b51ba5239 GTK4: Minor code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2368 diff changeset	1952
5b3b51ba5239 GTK4: Minor code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2368 diff changeset	1953 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	1954 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	1955 }
2368 ec90b552b266 GTK4: Switch to using gtk_window_present() in dw_window_show(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2367 diff changeset	1956 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	1957 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	1958 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1959 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	1960 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1961
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1962 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1963 * 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	1964 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1965 * 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	1966 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1967 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	1968 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	1969 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	1970 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	1971 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1972 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	1973
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1974 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	1975 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	1976 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	1977 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1978
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1979 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1980 * 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	1981 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1982 * 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	1983 */
2305 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 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	1985 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	1986 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	1987 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	1988 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1989 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	1990
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1991 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	1992 {
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 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	1994 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	1995 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	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 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	1998
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	1999 /* 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	2000 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	2001 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2002 /* 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	2003 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	2004 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	2005 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	2006
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 /* 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	2008 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	2009 {
2305 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 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	2011 {
2305 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(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	2013 {
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 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	2015 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	2016 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	2017 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2018 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2019 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2020 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	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 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	2023 {
2305 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 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	2025 {
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 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	2027 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	2028 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	2029 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2030 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2031 }
2305 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
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 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	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 /* 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	2036 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	2037 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	2038 }
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 /* 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	2041 * 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	2042 */
2329 47f8f950f377 GTK4: Fix crash by stopping processing after removing widget from the box. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2328 diff changeset	2043 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	2044 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	2045 }
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 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2047 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	2048 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2049
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2050 /* 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	2051 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2052 * 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	2053 */
2328 5363f953b22a GTK4: Implement dw_window_redraw() for render/drawing area widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2327 diff changeset	2054 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	2055 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	2056 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	2057 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	2058 {
5363f953b22a GTK4: Implement dw_window_redraw() for render/drawing area widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2327 diff changeset	2059 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	2060 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	2061 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	2062 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2063
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2064 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2065 * 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	2066 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2067 * 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	2068 * 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	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 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	2071 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	2072 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	2073 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	2074 {
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 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	2076 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	2077 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	2078 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2079
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2080 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2081 * 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	2082 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2083 * 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	2084 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2085 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	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 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	2088
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2089 _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	2090
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2091 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	2092 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	2093 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2094
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2095 /* 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	2096 * 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	2097 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	2098 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	2099 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2100 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	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 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	2103 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2104 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	2105 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	2106 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	2107
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2108 /* 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	2109 * 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	2110 * 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	2111 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2112 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	2113 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2114 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	2115 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	2116 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	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 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	2119 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	2120
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2121 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	2122 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	2123 }
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 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2128 /* 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	2129 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	2130 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2131 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	2132 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	2133 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	2134
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2135 /* 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	2136 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	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 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	2139 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	2140 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2143 /* 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	2144 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	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 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	2147 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	2148
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2149 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	2150 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	2151 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	2152 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	2153 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	2154 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2155 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	2156 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	2157 }
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 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	2160 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2161 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	2162 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	2163
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2164 /* 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	2165 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	2166 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2167 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	2168 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	2169 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	2170 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2171
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2172 /* 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	2173 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	2174 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2175 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	2176
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2177 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	2178 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	2179 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	2180 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	2181 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2182 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2185 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2186 * 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	2187 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2188 * 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	2189 * 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	2190 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2191 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	2192 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	2193 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	2194 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	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 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	2197 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	2198 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	2199 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	2200
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2201 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	2202 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2203 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	2204 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	2205 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	2206 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2207 /* 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	2208 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	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 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	2211 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	2212 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	2213 }
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2214 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	2215 {
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2216 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	2217 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	2218 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	2219 }
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2220 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	2221 {
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2222 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	2223 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	2224 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	2225 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2226
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2227 /* 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	2228 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	2229 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	2230 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	2231 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	2232
2325 55524dbe6a54 GTK4: The font crash seems to affect GtkDrawingArea. So reenable the widget bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2324 diff changeset	2233 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	2234 _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	2235
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2236 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	2237 }
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 /* 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	2240 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2241 * 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	2242 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2243 * 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	2244 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2245 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	2246 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	2247 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	2248 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	2249 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2250 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	2251 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	2252 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	2253 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	2254 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	2255
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2256 /* 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	2257 * 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	2258 * 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	2259 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2260 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	2261 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2262 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	2263 *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	2264 name++;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2265 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	2266 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2267
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2268 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	2269 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	2270 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2271 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	2272 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	2273 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2274
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2275 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	2276 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	2277
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	2278 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	2279 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2280 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	2281 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	2282 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2283 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	2284 /* 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	2285 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	2286 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2287 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	2288
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2289 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	2290 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2291 x--;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2292 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2293 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	2294 /* 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	2295 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	2296 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2297 /* 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	2298 * 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	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 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	2301 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	2302 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2303 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2304 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	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 }
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	2307 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	2308 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	2309 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	2310 }
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 * 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	2314 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2315 * 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	2316 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2317 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	2318 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	2319 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	2320 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	2321 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2322 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	2323 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	2324 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	2325 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	2326 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	2327
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2328 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	2329 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2330 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	2331 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	2332 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	2333 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2334 /* 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	2335 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	2336 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2337 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	2338 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	2339 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	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
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	2342 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	2343 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	2344 {
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	2345 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	2346 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	2347 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2348 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	2349
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	2350 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	2351 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	2352 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	2353 /* 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	2354 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	2355 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2356 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	2357
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2358 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	2359 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	2360 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2361 x--;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2362 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2363 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	2364 /* 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	2365 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	2366 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2367 /* 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	2368 * 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	2369 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2370 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	2371 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	2372 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2373 }
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	2374 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	2375 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2376 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2377 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	2378 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2379
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2380 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	2381 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2382 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	2383
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2384 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	2385 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	2386
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2387 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	2388
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2389 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	2390 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	2391 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2392
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2393 /* 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	2394 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	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 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	2397 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	2398
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2399 _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	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 *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	2402 *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	2403
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2404 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	2405 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	2406 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2407
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2408 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	2409 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2410 /* 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	2411 * 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	2412 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2413 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	2414
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2415 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	2416 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2417 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	2418 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	2419 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	2420 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	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 else if(fore != DW_CLR_DEFAULT)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	2423 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	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 _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	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(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	2428 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2429 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	2430 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	2431 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	2432 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	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 else if(back != DW_CLR_DEFAULT)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	2435 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	2436
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2437 _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	2438
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2439 _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	2440
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2441 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	2442 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2443 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2444 * 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	2445 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2446 * 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	2447 * 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	2448 * 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	2449 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2450 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	2451 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	2452 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	2453 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	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 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	2456 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	2457
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2458 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	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 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	2461 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	2462 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	2463 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2464
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2465 _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	2466
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2467 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	2468 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2469
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2470 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2471 * 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	2472 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2473 * 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	2474 * 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	2475 */
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	2476 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	2477 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2478 /* TODO */
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 0;
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2483 * 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	2484 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2485 * 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	2486 * 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	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_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	2489 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	2490 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	2491 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	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 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	2494 {
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2495 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	2496 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	2497 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	2498 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	2499 }
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2500 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	2501 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	2502 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	2503 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	2504 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	2505 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	2506 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	2507 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	2508 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	2509 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2510
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2511 /*
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2512 * 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	2513 * Parameters:
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2514 * 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	2515 */
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2516 #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	2517 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	2518 {
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2519 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2520 #else
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2521 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	2522
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2523 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	2524 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	2525 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	2526 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	2527 {
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	2528 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	2529
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	2530 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	2531 {
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2532 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	2533
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2534 if(surface)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2535 {
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2536 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	2537 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	2538 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	2539 _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	2540
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2541 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2542 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2543 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	2544 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2545 #endif
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2546
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2547 /*
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2548 * 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	2549 */
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2550 #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	2551 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	2552 {
2321 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 #else
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2555 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	2556 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	2557 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	2558 {
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	2559 /* 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	2560 if(_DWXGrabbedDisplay)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2561 {
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2562 XUngrabPointer(_DWXGrabbedDisplay, CurrentTime);
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2563 _DWXGrabbedDisplay = NULL;
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2564 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2565 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	2566 }
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	2567 #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	2568
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2569 /* 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	2570 #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	2571
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2572 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2573 * 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	2574 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2575 * 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	2576 * 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	2577 * 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	2578 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2579 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	2580 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	2581 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	2582 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	2583 {
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2584 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	2585 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	2586 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	2587
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2588 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	2589
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2590 /* 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	2591 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	2592 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	2593 /* 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	2594 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	2595 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	2596
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2597 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	2598
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2599 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	2600 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	2601 else
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2602 {
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2603 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	2604 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	2605
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2606 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	2607 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	2608 }
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2609
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	2610 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	2611 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	2612 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	2613 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	2614 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	2615 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	2616 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2617
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2618 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2619 * 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	2620 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2621 * 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	2622 * 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	2623 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	2624 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	2625 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	2626 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	2627 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	2628 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	2629 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	2630 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	2631 _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	2632 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	2633 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	2634 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2635
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2636 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2637 * 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	2638 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2639 * 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	2640 * 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	2641 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2642 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	2643 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	2644 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	2645 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	2646 {
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2647 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	2648
63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2649 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	2650 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	2651
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2652 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	2653
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 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	2655 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	2656 _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	2657
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2658 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	2659 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	2660 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	2661 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	2662
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2663 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	2664 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2665
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2666 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2667 * 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	2668 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2669 * 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	2670 * 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	2671 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2672 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	2673 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	2674 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	2675 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	2676 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2677 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	2678 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	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 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	2681 {
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 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	2683 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	2684 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	2685 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	2686 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	2687 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	2688 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2689 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	2690 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2691
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2692 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2693 * 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	2694 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2695 * 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	2696 * 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	2697 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2698 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	2699 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	2700 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	2701 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	2702 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2703 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	2704 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	2705
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2706 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	2707 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2708 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	2709 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	2710 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	2711 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	2712 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	2713 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	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 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	2716 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2717
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2718 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2719 * 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	2720 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2721 * 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	2722 * 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	2723 * 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	2724 */
2305 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 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	2726 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	2727 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	2728 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	2729 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2730 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	2731 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	2732
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2733 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	2734 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	2735 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	2736 _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	2737 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	2738 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	2739 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	2740 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	2741 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	2742 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	2743 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2744
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2745 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2746 * 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	2747 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2748 * 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	2749 */
2305 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 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	2751 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	2752 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	2753 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	2754 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	2755 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	2756 gtk_picture_set_can_shrink(GTK_PICTURE(tmp), TRUE);
2367 0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	2757 gtk_picture_set_keep_aspect_ratio(GTK_PICTURE(tmp), TRUE);
0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	2758 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	2759 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	2760 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	2761 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	2762 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	2763 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2764
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2765 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2766 * 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	2767 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2768 * 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	2769 * 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	2770 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2771 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	2772 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	2773 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	2774 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	2775 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2776 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	2777
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2778 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	2779 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	2780 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	2781 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2782 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	2783 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	2784 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	2785 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	2786 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	2787 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	2788 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2789
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	2790 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	2791
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2792 /* 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	2793 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	2794 {
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2795 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	2796
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2797 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	2798 {
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2799 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	2800 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	2801
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2802 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	2803
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2804 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	2805 {
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2806 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	2807 {
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2808 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	2809 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	2810 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	2811
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2812 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	2813
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2814 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	2815 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	2816 }
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2817 _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	2818 }
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2819 }
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	2820 }
2289 26a76f94f8d8 GTK4: Added action groups to the menus, because everything says we need bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2288 diff changeset	2821
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2822 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2823 * 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	2824 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2825 * 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	2826 * 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	2827 */
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	2828 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	2829 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	2830 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	2831 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	2832 {
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	2833 GMenu *tmp = g_menu_new();
2288 d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2834 /* 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	2835 GMenu *section = g_menu_new();
d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2836 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	2837 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	2838
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	2839 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	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 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	2842 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	2843 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	2844 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	2845 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	2846 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2847
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2848 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2849 * 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	2850 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2851 * 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	2852 * 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	2853 * 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	2854 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2855 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	2856 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	2857 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	2858 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	2859 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	2860 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	2861 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	2862
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2863 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	2864 (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	2865 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2866 /* 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	2867 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	2868 GMenu *menu = g_menu_new();
d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2869 /* 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	2870 GMenu *section = g_menu_new();
d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2871 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	2872 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	2873 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	2874
2288 d0bb8f99ac45 GTK4: Implement menu separators. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2287 diff changeset	2875 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	2876
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	2877 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	2878 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	2879
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2880 /* 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	2881 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	2882 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	2883 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	2884 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	2885
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2886 /* 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	2887 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	2888 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	2889 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	2890 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	2891 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	2892 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	2893 _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	2894 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2895 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	2896 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2897
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2898 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2899 * 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	2900 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2901 * 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	2902 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2903 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	2904 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	2905 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	2906 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	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(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	2909 {
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	2910 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	2911
2332 594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2912 /* 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	2913 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	2914 (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	2915 {
594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2916 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	2917 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	2918 else
594111e84e89 GTK4: Save pointer to the activate popup menu for a window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2331 diff changeset	2919 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	2920 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2921 /* 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	2922 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	2923 {
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2924 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	2925
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2926 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	2927 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	2928 else
1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	2929 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	2930 }
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	2931 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	2932 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	2933 *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	2934 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2935 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	2936 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2937
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	2938 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	2939 {
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2940 int z, cur=0;
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2941 char accel = '\0';
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2942
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2943 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	2944 {
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2945 if(src[z] == '~')
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2946 {
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	2947 dest[cur] = '_';
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2948 accel = src[z+1];
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2949 }
2272 2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2950 else
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2951 dest[cur] = src[z];
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2952 cur++;
2272 2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2953 }
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2954 dest[cur] = 0;
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2955 return accel;
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2956 }
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2957
2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2958
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2959 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2960 * 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	2961 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2962 * 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	2963 * 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	2964 * 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	2965 * 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	2966 * 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	2967 * 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	2968 * 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	2969 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2970 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	2971 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	2972 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	2973 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	2974 {
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2975 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	2976 HWND tmphandle = NULL;
2272 2ce302c43f48 GTK4: Initial menu functionality... basic creation works... no callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2271 diff changeset	2977 GMenuModel *menumodel;
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	2978 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	2979
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2980 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	2981 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2982 /* 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	2983 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	2984 _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	2985
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2986 /* 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	2987 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	2988 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2989 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	2990
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2991 /* 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	2992 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	2993 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	2994 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	2995 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	2996
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	2997 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	2998 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	2999 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3000 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3001 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3002 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	3003
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3004 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	3005 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3006 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	3007 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3008 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	3009 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	3010
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3011 /* 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	3012 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	3013 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	3014
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 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	3016 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	3017 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	3018 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	3019 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	3020
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3021 /* 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	3022 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	3023 _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	3024 }
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 }
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 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	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 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	3029 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	3030 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	3031 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	3032
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	3033 /* 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	3034 * 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	3035 */
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	3036 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	3037 {
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	3038 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	3039
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	3040 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	3041 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	3042
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	3043 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	3044 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	3045 }
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	3046 /* 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	3047 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	3048 {
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	3049 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	3050
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	3051 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	3052 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	3053 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	3054 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	3055 }
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	3056
2305 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, "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	3058 actionname = strchr(tempbuf, '.');
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3059 if(check)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3060 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	3061 else
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3062 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	3063 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	3064 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	3065 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	3066 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	3067 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	3068 }
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
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 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	3072 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	3073 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	3074 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	3075
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3076 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	3077
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3078 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	3079 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	3080 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3081 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	3082 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3083
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3084 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	3085 {
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3086 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	3087 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	3088
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3089 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	3090 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	3091
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3092 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	3093 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3094 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	3095 GMenuItem *menuitem;
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3096 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	3097
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3098 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	3099
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3100 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	3101 {
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3102 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	3103 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	3104 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3105 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3106 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	3107 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3108
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3109 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3110 * 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	3111 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3112 * 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	3113 * 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	3114 * 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	3115 * 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	3116 */
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3117 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	3118 DW_FUNCTION_ADD_PARAM3(menu, cid, check)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3119 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	3120 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	3121 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3122 if(menu)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3123 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3124 char numbuf[25] = {0};
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3125 GMenuItem *tmphandle;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3126
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3127 snprintf(numbuf, 24, "%lu", cid);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3128 tmphandle = _dw_find_submenu_id(menu, numbuf);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3129
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3130 if(tmphandle && G_IS_MENU_ITEM(tmphandle))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3131 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3132 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	3133
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3134 if(action)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3135 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3136 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	3137 gboolean thischeck = check;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3138
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3139 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	3140 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3141 GVariant *new_state = g_variant_new_boolean(thischeck);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3142 g_simple_action_set_state(action, new_state);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3143 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3144 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3145 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3146 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3147 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	3148 }
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 * 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	3152 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3153 * 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	3154 * 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	3155 * 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	3156 */
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	3157 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	3158 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	3159 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	3160 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	3161 {
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	3162 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	3163 {
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3164 char numbuf[25] = {0};
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3165 GMenuItem *tmphandle;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3166
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	3167 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	3168 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	3169
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	3170 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	3171 {
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	3172 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	3173
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3174 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	3175 {
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3176 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	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 check = false;
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(state & DW_MIS_CHECKED)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3182 check = true;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3183
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3184 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	3185 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3186 GVariant *new_state = g_variant_new_boolean(check);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3187 g_simple_action_set_state(action, new_state);
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 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3190 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	3191 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3192 if(state & DW_MIS_ENABLED)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3193 g_simple_action_set_enabled(action, TRUE);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3194 else
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3195 g_simple_action_set_enabled(action, FALSE);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	3196 }
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	3197 }
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	3198 }
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 }
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_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	3201 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3202
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3203 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3204 * 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	3205 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3206 * 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	3207 * 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	3208 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3209 * 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	3210 */
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	3211 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	3212 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	3213 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	3214 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	3215 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3216 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	3217 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	3218 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	3219
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	3220 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	3221 {
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	3222 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	3223 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	3224
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	3225 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	3226 {
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	3227 /* 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	3228 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	3229 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	3230 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	3231 }
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	3232 }
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	3233 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	3234 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3235
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	3236 /* 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	3237 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	3238 {
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3239 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	3240 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	3241
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	3242 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	3243 (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	3244 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	3245 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	3246 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	3247 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	3248 }
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3249
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3250 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	3251 {
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3252 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	3253
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3254 /* 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	3255 * 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	3256 */
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3257 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	3258 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	3259 }
6e47d510dbbb GTK4: Since GTK4 needs to add the popup menu to the parent widget... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2299 diff changeset	3260
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3262 * 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	3263 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3264 * 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	3265 * 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	3266 * 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	3267 * 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	3268 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3269 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	3270 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	3271 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	3272 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	3273 {
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	3274 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	3275 {
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	3276 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	3277 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	3278
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	3279 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	3280 {
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	3281 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	3282
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 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	3284 {
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 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	3286 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	3287 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	3288 }
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	3289 }
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	3290 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	3291 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	3292
2303 cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3293 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	3294 {
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3295 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	3296 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	3297 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	3298
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3299 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	3300
cdd8459add40 GTK4: Add code to setup the toplevel menu for popups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2302 diff changeset	3301 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	3302 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	3303 }
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	3304 _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	3305 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	3306 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	3307 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	3308 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	3309 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	3310 *menu = NULL;
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	3311 }
2305 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_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	3313 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3314
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3315
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3316 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3317 * 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	3318 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3319 * 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	3320 * 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	3321 */
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	3322 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	3323 {
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3324 if(x)
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	3325 *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	3326 if(y)
2759 cd6a306800f5 GTK4: New way of querying the mouse pointer position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2758 diff changeset	3327 *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	3328 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3329
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3330 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3331 * 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	3332 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3333 * 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	3334 * 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	3335 */
2322 ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3336 #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	3337 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	3338 {
2322 ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3339 }
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3340 #else
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3341 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	3342 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	3343 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	3344 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	3345 {
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3346 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	3347
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	3348 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	3349 {
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3350 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	3351 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	3352
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3353 if(xdisplay)
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3354 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	3355 }
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3356 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	3357 }
ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	3358 #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	3359
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3360 #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	3361 #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	3362 #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	3363
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	3364 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	3365 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3366 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	3367
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3368 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	3369 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	3370 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	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 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	3373 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	3374 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	3375 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3376
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	3377 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	3378 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3379 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	3380 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	3381 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	3382 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	3383 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	3384 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3385
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3386 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3387 * 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	3388 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3389 * 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	3390 * 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	3391 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3392 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	3393 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	3394 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	3395 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	3396 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3397 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	3398
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3399 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	3400 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3401 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	3402 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	3403 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3404 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	3405 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3406
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 * 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	3409 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3410 * 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	3411 * 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	3412 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3413 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	3414 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	3415 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	3416 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	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 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	3419 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	3420 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	3421 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	3422 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	3423
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3424 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	3425 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3426 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	3427 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	3428 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	3429 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	3430 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	3431
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3432 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	3433 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	3434 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	3435 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	3436 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	3437 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	3438
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3439 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	3440 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	3441 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	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 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	3444 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	3445 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	3446
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3447 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	3448 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	3449 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3450 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	3451 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3452
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3453
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3454 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3455 * 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	3456 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3457 * 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	3458 * 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	3459 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3460 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	3461 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	3462 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	3463 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	3464 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3465 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	3466
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3467 /* 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	3468 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	3469 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	3470 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	3471 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	3472 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	3473 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	3474 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	3475 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3476
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3477 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3478 * 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	3479 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3480 * 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	3481 * 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	3482 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3483 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	3484 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	3485 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	3486 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	3487 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3488 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	3489 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	3490 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	3491 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	3492 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	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 /* 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	3495 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	3496 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	3497 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	3498 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	3499 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	3500 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	3501 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	3502 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3503
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3504 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3505 * 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	3506 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3507 * 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	3508 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3509 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	3510 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	3511 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	3512 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	3513 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3514 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	3515 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	3516 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	3517 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	3518 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	3519 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	3520
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3521 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	3522 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	3523 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	3524 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	3525 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	3526 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	3527 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	3528 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3529
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3530 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3531 * 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	3532 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3533 * 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	3534 * 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	3535 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3536 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	3537 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	3538 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	3539 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	3540 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3541 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	3542 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	3543
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3544 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	3545 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	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 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	3548 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	3549 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	3550 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3551
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3552 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3553 * 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	3554 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3555 * 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	3556 * 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	3557 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3558 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	3559 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	3560 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	3561 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	3562 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3563 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	3564 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	3565
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_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	3567
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3568 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	3569 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	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 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	3572 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	3573 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	3574 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3575
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3576 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3577 * 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	3578 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3579 * 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	3580 * 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	3581 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3582 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	3583 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	3584 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	3585 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	3586 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3587 GtkWidget *tmp;
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3588 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	3589 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	3590 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	3591 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	3592 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	3593 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	3594 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	3595 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	3596 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	3597 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	3598 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	3599 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	3600 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	3601 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3602
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3603 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3604 * 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	3605 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3606 * 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	3607 * 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	3608 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3609 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	3610 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	3611 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	3612 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	3613 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3614 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	3615 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	3616 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	3617 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	3618 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	3619 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	3620 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3621
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3622 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3623 * 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	3624 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3625 * 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	3626 * 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	3627 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3628 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	3629 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	3630 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	3631 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	3632 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3633 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	3634 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	3635
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3636 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	3637 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3638 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	3639 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	3640 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	3641 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3642 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	3643 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	3644 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	3645 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	3646 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	3647 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3648
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3649 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3650 * 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	3651 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3652 * 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	3653 * 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	3654 * 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	3655 * 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	3656 * 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	3657 * (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	3658 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3659 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	3660 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	3661 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	3662 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	3663 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3664 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	3665 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	3666
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3667 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	3668 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3669 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	3670 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	3671 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	3672 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3673 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	3674 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	3675 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	3676 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	3677 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	3678 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3679
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3680 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3681 * 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	3682 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3683 * 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	3684 * 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	3685 * 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	3686 * (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	3687 * 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	3688 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3689 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	3690 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	3691 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	3692 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	3693 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3694 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	3695 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	3696
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3697 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	3698 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3699 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	3700 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	3701 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	3702 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3703 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	3704 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	3705 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	3706 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	3707 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	3708 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3709
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3710 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3711 * 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	3712 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3713 * 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	3714 * 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	3715 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3716 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	3717 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	3718 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	3719 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	3720 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3721 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	3722 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	3723
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3724 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	3725 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	3726 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	3727 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	3728 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	3729 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	3730 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	3731 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	3732 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	3733 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3734
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3735 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3736 * 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	3737 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3738 * 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	3739 * 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	3740 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3741 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	3742 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	3743 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	3744 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	3745 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	3746 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	3747 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	3748 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	3749
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3750 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	3751 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	3752 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	3753 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3754
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3755 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3756 * 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	3757 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3758 * 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	3759 * 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	3760 * 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	3761 */
2305 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 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	3763 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	3764 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	3765 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	3766
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3767 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3768 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	3769 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	3770
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3771 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	3772 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	3773 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	3774 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	3775 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	3776 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	3777 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	3778 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3779
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3780 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3781 * 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	3782 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3783 * 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	3784 * 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	3785 * 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	3786 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3787 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	3788 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	3789 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	3790 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	3791 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3792 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	3793 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	3794
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 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	3796 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	3797 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	3798 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	3799 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	3800 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	3801 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3802
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3803 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3804 * 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	3805 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3806 * 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	3807 */
2305 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 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	3809 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	3810 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	3811 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	3812
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3813 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3814 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	3815 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	3816 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	3817 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	3818 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3819
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 * 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	3822 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3823 * 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	3824 * 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	3825 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3826 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	3827 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	3828 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	3829 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	3830 {
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 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	3832 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	3833 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	3834 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	3835 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	3836 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	3837 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3838
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3839 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3840 * 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	3841 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3842 * 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	3843 * 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	3844 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3845 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	3846 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	3847 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	3848 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	3849 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3850 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	3851 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	3852 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	3853 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	3854 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	3855
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3856 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	3857 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3858 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	3859 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	3860 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	3861 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	3862
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3863 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	3864 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	3865 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	3866 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	3867
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3868 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	3869 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	3870 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	3871
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3872 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	3873 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	3874 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	3875 else
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3876 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	3877 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	3878 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	3879 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	3880 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	3881 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	3882 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3883
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3884 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3885 * 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	3886 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3887 * 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	3888 * 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	3889 */
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	3890 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	3891 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	3892 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	3893 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	3894 {
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	3895 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	3896 {
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	3897 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	3898
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	3899 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	3900 {
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	3901 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	3902 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	3903
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	3904 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	3905 {
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	3906 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	3907 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	3908
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	3909 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	3910 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	3911 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	3912 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	3913 }
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	3914 }
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	3915 }
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	3916 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	3917 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3918
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3919 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3920 * 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	3921 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3922 * 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	3923 * 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	3924 * (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	3925 * 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	3926 * 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	3927 * 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	3928 * 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	3929 * 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	3930 * 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	3931 * 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	3932 */
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	3933 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	3934 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	3935 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	3936 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	3937 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3938 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	3939 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	3940
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3941 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	3942 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	3943 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3944 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3945 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	3946
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3947 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	3948
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3949 /* 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	3950 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	3951 {
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	3952 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	3953
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3954 /* 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	3955 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	3956 {
2282 b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	3957 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	3958 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	3959 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	3960 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	3961 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	3962 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	3963 }
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	3964 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	3965 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	3966 }
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	3967
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	3968 if(tmp)
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	3969 {
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	3970 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	3971 {
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	3972 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	3973 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	3974 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	3975 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	3976 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	3977 }
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	3978 }
b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	3979 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	3980 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	3981 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	3982 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	3983 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	3984 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	3985 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	3986 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	3987 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	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
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 * 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	3992 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3993 * 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	3994 * 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	3995 * (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	3996 * 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	3997 * 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	3998 * 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	3999 * 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	4000 * 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	4001 * 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	4002 * 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	4003 * 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	4004 */
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4005 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	4006 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	4007 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	4008 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	4009 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4010 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	4011 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	4012
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4013 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	4014 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4015 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4016 * 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	4017 * 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	4018 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4019 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	4020 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	4021
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4022 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	4023 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4024 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	4025 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	4026 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4027 /* 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	4028 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	4029 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4030 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	4031 /* 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	4032 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	4033 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4034 }
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	4035 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	4036 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	4037
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4038 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	4039 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4040 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	4041 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4042 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	4043
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4044 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	4045 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4046 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	4047 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	4048 }
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4049 }
b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4050 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	4051 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	4052 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	4053 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	4054 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4055 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2759 diff changeset	4056 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	4057 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	4058 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	4059 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4062 * 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	4063 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4064 * 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	4065 * 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	4066 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4067 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	4068 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	4069 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	4070 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	4071 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4072 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	4073 {
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4074 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	4075 if(buffer)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4076 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	4077 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4078 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	4079 {
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4080 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	4081 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	4082 if(buffer)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4083 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	4084 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4085 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	4086 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	4087 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	4088 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	4089 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	4090 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	4091 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	4092 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4093 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4094 * 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	4095 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4096 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	4097 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	4098 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	4099 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	4100 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	4101 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4102 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4105 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4106 * 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	4107 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4108 * 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	4109 * 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	4110 */
2305 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_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	4112 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	4113 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	4114 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	4115 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4116 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	4117 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	4118 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4119 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	4120 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	4121 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4122
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4123 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4124 * 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	4125 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4126 * 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	4127 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4128 * 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	4129 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4130 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	4131 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	4132 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	4133 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	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 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	4136 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	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 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	4139 {
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4140 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	4141 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	4142 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4143 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	4144 {
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	4145 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	4146 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	4147 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	4148 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4149 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	4150 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	4151 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	4152 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	4153 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4154
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4155 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4156 * 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	4157 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4158 * 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	4159 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4160 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	4161 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	4162 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	4163 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	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 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	4166 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	4167 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4168
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4169 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4170 * 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	4171 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4172 * 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	4173 */
2305 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_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	4175 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	4176 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	4177 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	4178 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4179 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	4180 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	4181 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4182
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4183 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4184 * 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	4185 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4186 * 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	4187 * 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	4188 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4189 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	4190 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	4191 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	4192 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	4193 {
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 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	4195
2275 51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4196 if(handle && GTK_WIDGET(handle) && id)
51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4197 {
51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4198 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	4199
51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4200 while(widget)
51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4201 {
51cb73faab6e GTK4: Implement dw_window_from_id(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2274 diff changeset	4202 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	4203 {
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 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	4205 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	4206 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4207 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	4208 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	4209 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4210 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4211 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	4212 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4213
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4214 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4215 * 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	4216 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4217 * 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	4218 * 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	4219 * 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	4220 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4221 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	4222 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	4223 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	4224 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	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 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	4227
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4228 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	4229 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4230 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	4231
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4232 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	4233 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4234 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	4235 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	4236
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4237 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	4238 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	4239 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	4240 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	4241 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	4242 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4243 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4244 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	4245 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4246
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4247 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4248 * 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	4249 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4250 * 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	4251 * 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	4252 * 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	4253 * 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	4254 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4255 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	4256 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	4257 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	4258 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	4259 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4260 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	4261
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4262 /* 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	4263 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	4264 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	4265 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	4266 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4267 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	4268
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4269 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	4270 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4271 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	4272 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	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 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	4275 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	4276 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	4277 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	4278 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	4279 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4280 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	4281 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	4282 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4283 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4284 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4285 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	4286 }
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 * 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	4290 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4291 * 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	4292 * 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	4293 * 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	4294 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4295 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	4296 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	4297 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	4298 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	4299 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4300 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	4301 *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	4302 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	4303 *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	4304
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(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	4306 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4307 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	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 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	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 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	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 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	4314 *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	4315 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	4316 *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	4317 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4318 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4319 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	4320 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4323 * 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	4324 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4325 * 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	4326 * 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	4327 * 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	4328 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4329 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	4330 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	4331 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	4332 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	4333 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4334 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	4335 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4336 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	4337
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4338 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	4339 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4340 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	4341 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	4342
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4343 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	4344 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	4345 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	4346 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	4347 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4348 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4349 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	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
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 * 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	4354 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4355 * 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	4356 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4357 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	4358 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	4359 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	4360 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	4361 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4362 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	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 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	4365 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4366 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	4367
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4368 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	4369 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4370 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	4371
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4372 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	4373 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	4374 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4375 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4376 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	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
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 * 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	4381 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4382 * 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	4383 * 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	4384 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4385 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	4386 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	4387 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	4388 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	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 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	4391 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4392 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	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 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	4395 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4396 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	4397 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	4398 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	4399
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4400 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	4401 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	4402 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	4403 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	4404 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4405 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	4406 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	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 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4409 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	4410 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	4411 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	4412 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4413 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4414 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	4415 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4418 * 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	4419 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4420 * 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	4421 * 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	4422 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4423 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	4424 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	4425 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	4426 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	4427 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4428 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	4429 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4430 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	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(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	4433 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	4434 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4435 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	4436 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4439 * 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	4440 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4441 * 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	4442 * 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	4443 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4444 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	4445 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	4446 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	4447 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	4448 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4449 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	4450 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4451 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	4452
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4453 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	4454 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	4455 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 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 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	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: 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	4464 */
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	4465 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	4466 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4467 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4468
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 * 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	4471 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4472 * 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	4473 * 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	4474 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4475 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	4476 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	4477 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	4478 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	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 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	4481 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4482 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	4483
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4484 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	4485 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4486 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	4487 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	4488 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	4489
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4490 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	4491 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	4492 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	4493 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4494 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	4495 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	4496 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4497 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4498 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	4499 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	4500 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	4501 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	4502 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4503 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4504 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	4505 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4506
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4507 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4508 * 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	4509 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4510 * 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	4511 * 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	4512 * 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	4513 * 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	4514 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4515 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	4516 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	4517 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	4518 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	4519 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4520 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	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, found;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4530
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4531 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	4532 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	4533 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	4534 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	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 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4537 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4540 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4541 * 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	4542 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4543 * 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	4544 */
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	4545 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	4546 {
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 * 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	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 thaw.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4553 */
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	4554 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	4555 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4556 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4557
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4558 /* 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	4559 * 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	4560 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4561 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	4562 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4563 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	4564 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4565 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	4566 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	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 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4571 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4572 * 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	4573 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4574 * 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	4575 * 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	4576 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4577 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	4578 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	4579 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	4580 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	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 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	4583 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4584 /* 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	4585 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	4586 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4587 /* 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	4588 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	4589 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	4590 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4593 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4594 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4595 /* 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	4596 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	4597 /* 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	4598 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	4599 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4600 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	4601 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4604 * 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	4605 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4606 * 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	4607 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4608 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	4609 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	4610 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	4611 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	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 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	4614 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	4615
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4616 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	4617 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4618 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	4619 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	4620 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4621 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	4622 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	4623
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4624 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	4625 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	4626 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	4627 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	4628 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4629 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4630 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	4631 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4632
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 * 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	4635 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4636 * 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	4637 * 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	4638 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4639 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	4640 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	4641 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	4642 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	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 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	4645
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4646 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	4647 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4648 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	4649 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	4650 {
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 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	4652
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 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	4654 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	4655 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	4656 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	4657 }
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 }
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 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	4660 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4661
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4662 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4663 * 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	4664 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4665 * 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	4666 */
2305 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 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	4668 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	4669 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	4670 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	4671 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4672 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	4673 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	4674
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4675 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	4676 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4677 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	4678 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	4679 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	4680 }
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_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	4682 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4683
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4684 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4685 * 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	4686 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4687 * 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	4688 * 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	4689 */
2305 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 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	4691 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	4692 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	4693 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	4694
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4695 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4696 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	4697
2305 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 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	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 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	4701 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4702 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	4703 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	4704 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	4705 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4706 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4707 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	4708 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4709
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4710 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4711 * 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	4712 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4713 * 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	4714 * 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	4715 * 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	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 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	4718 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	4719 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	4720 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	4721 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4722 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	4723
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4724 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	4725 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4726 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	4727 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4728 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	4729 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	4730 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	4731 }
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 }
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_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	4734 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4735
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4736 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4737 * 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	4738 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4739 * 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	4740 * 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	4741 */
2305 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 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	4743 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	4744 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	4745 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	4746 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4747 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	4748 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	4749 }
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 * 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	4753 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4754 * 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	4755 * 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	4756 * 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	4757 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4758 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	4759 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	4760 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	4761 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	4762 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4763 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	4764 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	4765
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4766 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	4767 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	4768 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	4769 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4770 * 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	4771 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4772 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	4773 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	4774 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	4775 }
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 * 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	4779 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4780 * 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	4781 * 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	4782 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4783 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	4784 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	4785 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	4786 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	4787 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4788 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	4789 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	4790 }
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 * 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	4794 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4795 * 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	4796 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4797 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	4798 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	4799 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	4800 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	4801 {
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 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	4803 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4806 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4807 * 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	4808 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4809 * 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	4810 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4811 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	4812 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	4813 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	4814 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	4815 {
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 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	4817
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4818 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	4819 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4820 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	4821 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	4822 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	4823 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4824 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	4825 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4826
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4827 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4828 * 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	4829 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4830 * 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	4831 * 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	4832 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4833 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	4834 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	4835 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	4836 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	4837 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	4838 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	4839 {
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 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	4841 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	4842 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	4843 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	4844 }
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_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	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 * 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	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 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	4852 * 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	4853 * 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	4854 * 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	4855 * 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	4856 * 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	4857 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4858 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	4859 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	4860 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	4861 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	4862 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4863 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	4864 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	4865 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	4866 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	4867 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	4868
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4869 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	4870 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4871 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	4872 && 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	4873 (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	4874 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4875 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	4876
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4877 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	4878
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4879 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	4880 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	4881 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	4882 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4883 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4884 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	4885 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4886
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4887 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4888 * 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	4889 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4890 * 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	4891 * 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	4892 * 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	4893 * 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	4894 * 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	4895 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4896 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	4897 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	4898 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	4899 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	4900 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4901 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	4902 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	4903 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	4904 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	4905 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	4906
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4907 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	4908 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4909 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	4910 && 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	4911 (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	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 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	4914
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4915 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	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 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	4918 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	4919 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	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 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4922 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	4923 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4924
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4925 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4926 * 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	4927 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4928 * 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	4929 * 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	4930 * 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	4931 * 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	4932 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4933 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	4934 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	4935 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	4936 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	4937 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4938 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	4939 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	4940 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	4941
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4942 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	4943 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4944 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	4945 && 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	4946 (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	4947 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4948 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	4949
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4950 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	4951 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4952 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4953 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	4954 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4955
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4956 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4957 * 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	4958 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4959 * 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	4960 * 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	4961 * 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	4962 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4963 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	4964 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	4965 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	4966 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	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 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	4969 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	4970
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4971 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	4972 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4973 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	4974 && 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	4975 (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	4976 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	4977 }
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_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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4981 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4982 * 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	4983 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4984 * 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	4985 * 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	4986 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4987 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	4988 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	4989 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	4990 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	4991 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4992 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	4993 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	4994 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	4995
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4996 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	4997 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	4998 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	4999
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5000 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	5001 (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	5002 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	5003 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	5004 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5005 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	5006 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	5007 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	5008 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5009 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5010 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	5011 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5012
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5013 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5014 * 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	5015 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5016 * 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	5017 * 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	5018 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5019 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	5020 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	5021 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	5022 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	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 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	5025 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	5026 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	5027
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5028 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	5029 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5030 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	5031
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5032 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	5033 (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	5034 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5035 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	5036
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5037 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	5038 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	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 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5041 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	5042 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5043
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5044 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5045 * 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	5046 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5047 * 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	5048 * 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	5049 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5050 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	5051 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	5052 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	5053 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	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 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	5056 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	5057 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	5058
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5059 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	5060 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5061 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	5062 && 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	5063 (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	5064 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	5065 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5066 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	5067 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5068
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5069 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5070 * 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	5071 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5072 * 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	5073 * 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	5074 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5075 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	5076 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	5077 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	5078 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	5079 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5080 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	5081 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	5082
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5083 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	5084 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5085 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	5086 && 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	5087 (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	5088 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5089 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	5090 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	5091
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5092 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	5093 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	5094 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	5095 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5096 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5097 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	5098 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5099
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5100 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	5101 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5102 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	5103 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	5104
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5105 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	5106 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	5107 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	5108 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	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 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	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 do {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5113 _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	5114 } 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	5115 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5116 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5117
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5118 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5119 * 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	5120 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5121 * 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	5122 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5123 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	5124 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	5125 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	5126 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	5127 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5128 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	5129 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	5130
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5131 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	5132 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5133 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	5134 && 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	5135 (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	5136 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5137 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	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 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	5140 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5141 do {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5142 _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	5143 } 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	5144 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5145 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	5146 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5147 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5148 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	5149 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5150
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 * 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	5153 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5154 * 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	5155 * 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	5156 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5157 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	5158 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	5159 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	5160 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	5161 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5162 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	5163 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	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 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	5166 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5167 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	5168 && 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	5169 (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	5170 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5171 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	5172 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	5173 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	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 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5176 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	5177 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5178
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5179 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5180 * 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	5181 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5182 * 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	5183 * 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	5184 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5185 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	5186 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	5187 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	5188 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	5189 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5190 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	5191 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	5192
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5193 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	5194 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5195 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	5196 && 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	5197 (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	5198 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5199 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	5200 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	5201 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	5202 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5203 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5204 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	5205 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5206
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5207 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5208 * 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	5209 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5210 * 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	5211 * 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	5212 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5213 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	5214 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	5215 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	5216 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	5217 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5218 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	5219 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	5220
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5221 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	5222 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5223 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	5224 && 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	5225 (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	5226 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5227 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	5228 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	5229 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5230 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5231 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	5232 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5233
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5234 #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	5235
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5236 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	5237 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5238 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	5239 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	5240 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	5241 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	5242 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	5243 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	5244 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	5245 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	5246
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5247 /* 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	5248 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	5249 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	5250
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5251 /* 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	5252 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	5253 /* 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	5254 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	5255 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	5256 /* 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	5257 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	5258 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5259 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	5260 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5261 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	5262 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	5263 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5264 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	5265 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5266 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	5267 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5268 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	5269 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5270 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	5271 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5272 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	5273 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5274 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	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 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	5277 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5278 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	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 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	5281 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5282 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	5283 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5284 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5285 /* 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	5286 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	5287 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	5288 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	5289 /* 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	5290 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	5291 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5292 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	5293 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	5294 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	5295 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	5296 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	5297
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5298 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	5299 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5300 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	5301 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	5302 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	5303 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	5304 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	5305 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	5306 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5307 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	5308 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5309 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	5310 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	5311 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	5312 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5313 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	5314 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5315 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	5316 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	5317 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	5318 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	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 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	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 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	5323 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	5324 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	5325 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	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 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	5328 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5329 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	5330 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	5331 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	5332 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	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 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	5335 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5336 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	5337 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	5338 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	5339 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	5340 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5341 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	5342 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	5343 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	5344 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	5345 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	5346 {
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_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	5348 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	5349 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	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 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	5352 {
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_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	5354 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	5355 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	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 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	5358 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5359 /* 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	5360 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	5361 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	5362 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	5363 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	5364 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	5365 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	5366 else
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_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	5368 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	5369 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	5370 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	5371 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	5372 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	5373 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5374
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 * 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	5377 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5378 * 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	5379 * 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	5380 * 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	5381 * 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	5382 * 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	5383 * (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	5384 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5385 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	5386 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	5387 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	5388 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	5389 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5390 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	5391 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	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
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 * 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	5396 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5397 * 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	5398 * 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	5399 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5400 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	5401 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5402 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	5403
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5404 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	5405 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5406
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5407 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5408 * 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	5409 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5410 * 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	5411 * 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	5412 * 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	5413 * 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	5414 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5415 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	5416 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	5417 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	5418 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	5419 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5420 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	5421 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	5422 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	5423 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	5424
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5425 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	5426 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	5427
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5428 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	5429 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	5430
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5431 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	5432
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5433 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	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 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	5436 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	5437 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5438 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	5439 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	5440 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	5441 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	5442 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	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
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 * 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	5447 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5448 * 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	5449 * 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	5450 * 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	5451 * 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	5452 */
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	5453 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	5454 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5455 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	5456 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5457
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5458 /* 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	5459 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	5460 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5461 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	5462 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5463 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	5464 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	5465
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5466 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	5467 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5468 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	5469 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	5470 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	5471 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5472 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5473 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	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
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 * 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	5478 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5479 * 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	5480 * 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	5481 * (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	5482 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5483 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	5484 {
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5485 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	5486
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5487 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	5488 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5489 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	5490
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5491 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	5492
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5493 /* 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	5494 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	5495 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5496 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	5497
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5498 /* 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	5499 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	5500 {
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5501 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	5502 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	5503 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	5504 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	5505 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	5506 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5507 }
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5508 else
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5509 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	5510 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	5511 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	5512 }
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 * 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	5516 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5517 * 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	5518 * 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	5519 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5520 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	5521 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5522 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	5523 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	5524 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	5525
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5526 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5527 * 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	5528 * 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	5529 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5530 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	5531 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5532 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	5533 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	5534 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5535 /* 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	5536 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	5537 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	5538 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	5539 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	5540 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	5541 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5542
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5543 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5544 * 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	5545 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5546 * 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	5547 */
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	5548 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	5549 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5550 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	5551
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5552 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	5553 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5554 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5558 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5559 * 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	5560 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5561 * 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	5562 * 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	5563 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5564 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	5565 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	5566 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	5567 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	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 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	5570 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	5571 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	5572
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5573 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	5574
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5575 /* 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	5576 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	5577 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	5578
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5579 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	5580 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5581 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	5582
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5583 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	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 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	5586 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5587 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	5588 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5589 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	5590 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	5591 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5592 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	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
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 * 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	5597 * 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	5598 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5599 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	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 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	5602 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	5603 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	5604 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	5605
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5606 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	5607
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5608 /* 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	5609 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	5610 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	5611
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5612 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	5613 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5614 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	5615
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5616 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	5617 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	5618 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	5619 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5620 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	5621 }
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 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	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 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	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 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	5628 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	5629 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	5630 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	5631
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5632 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	5633 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	5634 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5635 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	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 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	5638 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	5639
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5640 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	5641 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5642 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	5643 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5644 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	5645 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	5646 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5647 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	5648 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5649 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	5650
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5651 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	5652 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5653 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	5654 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5655 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	5656 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5657 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	5658 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	5659
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5660 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	5661 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	5662 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	5663 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	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 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	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 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	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 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	5670 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5671 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	5672 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5673 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	5674 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	5675
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5676 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	5677 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	5678 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	5679 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	5680
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5681 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	5682 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5683 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	5684 }
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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5687 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5690 * 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	5691 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5692 * 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	5693 * 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	5694 * 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	5695 * 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	5696 * 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	5697 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5698 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	5699 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	5700 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	5701 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	5702 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5703 _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	5704 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	5705 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5708 * 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	5709 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5710 * 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	5711 * 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	5712 * 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	5713 * 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	5714 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5715 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	5716 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	5717 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	5718 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	5719 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5720 _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	5721 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	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
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 * 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	5726 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5727 * 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	5728 * 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	5729 * 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	5730 * 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	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 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	5733 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5734 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	5735 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5736
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5737 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5738 * 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	5739 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5740 * 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	5741 * 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	5742 * 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	5743 * 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	5744 * 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	5745 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5746 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	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 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5751 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5752 * 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	5753 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5754 * 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	5755 * 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	5756 * 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	5757 * 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	5758 * 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	5759 */
2304 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_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	5761 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	5762 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	5763 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	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 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	5766
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5767 _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	5768 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	5769 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5770
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5771 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5772 * 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	5773 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5774 * 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	5775 * 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	5776 * 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	5777 * 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	5778 * 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	5779 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5780 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	5781 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	5782 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	5783 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	5784 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5785 _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	5786 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	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
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 * 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	5791 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5792 * 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	5793 * 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	5794 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5795 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	5796 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	5797 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	5798 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	5799 {
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5800 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	5801 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	5802
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5803 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	5804 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5805 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	5806
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5807 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	5808 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	5809
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5810 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	5811 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	5812 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	5813 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	5814 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	5815 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	5816 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	5817 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	5818 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	5819 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	5820 else
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5821 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	5822 }
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_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	5824 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5825
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5826 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5827 * 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	5828 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5829 * 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	5830 * 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	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 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	5833 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5834 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	5835 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5836
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5837 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5838 * 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	5839 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5840 * 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	5841 * 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	5842 * 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	5843 * 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	5844 * 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	5845 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5846 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	5847 {
2441 a80df2e7195d GTK4: Add a comment with the information about striped controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2410 diff changeset	5848 /* 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	5849 * 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	5850 * "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	5851 * 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	5852 */
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5853 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5854
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5855 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5856 * 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	5857 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5858 * 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	5859 * 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	5860 * 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	5861 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5862 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	5863 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	5864 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	5865 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	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 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	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 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	5870
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5871 /* 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	5872 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	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 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	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 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	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 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	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 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5881 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	5882 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5883
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5884 /* 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	5885 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	5886 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5887 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	5888 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	5889
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5890 /* 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	5891 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	5892 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	5893
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5894 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	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 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	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 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	5899 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5900 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	5901 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5902
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5903 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	5904 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5905 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	5906 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5907 }
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
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 * 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	5912 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5913 * 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	5914 * 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	5915 * 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	5916 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5917 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	5918 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	5919 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	5920 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	5921 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5922 _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	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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5927 * 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	5928 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5929 * 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	5930 * 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	5931 * 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	5932 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5933 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	5934 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	5935 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	5936 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	5937 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5938 _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	5939 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	5940 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5943 * 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	5944 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5945 * 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	5946 * 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	5947 * 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	5948 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	5949 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	5950 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	5951 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	5952 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	5953 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5954 _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	5955 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	5956 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5957
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5958 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5959 * 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	5960 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5961 * 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	5962 * 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	5963 * 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	5964 */
2305 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_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	5966 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	5967 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	5968 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	5969 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	5970 _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	5971 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	5972 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5973
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5974 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5975 * 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	5976 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5977 * 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	5978 * 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	5979 * 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	5980 */
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	5981 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	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 /* 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5986 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5987 * 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	5988 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5989 * 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	5990 * 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	5991 */
2305 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_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	5993 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	5994 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	5995 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	5996 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5997 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	5998 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	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 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	6001
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6002 /* 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	6003 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	6004 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	6005
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6006 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	6007 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6008 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	6009 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	6010
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6011 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	6012
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6013 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	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 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	6016 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	6017 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6018
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6019 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	6020 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	6021 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6022 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	6023
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6024 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	6025 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6026 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	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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6030 * 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	6031 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6032 * 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	6033 * 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	6034 */
2305 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_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	6036 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	6037 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	6038 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	6039 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6040 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	6041 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	6042
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6043 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	6044
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6045 /* 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	6046 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	6047 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	6048
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6049 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	6050 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6051 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	6052 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	6053
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6054 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	6055 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6056 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	6057 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6058
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 * 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	6061 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6062 * 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	6063 * 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	6064 * 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	6065 * 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	6066 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6067 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	6068 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	6069 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	6070 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	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 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	6073
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6074 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	6075
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6076 /* 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	6077 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	6078 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6079 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	6080
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6081 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	6082 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6083 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	6084 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	6085 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	6086 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	6087 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	6088
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6089 /* 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	6090 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	6091 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6092 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	6093
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6094 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	6095 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6096 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	6097 {
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 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	6099 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	6100 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6101 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	6102 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6103 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	6104 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	6105 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6106 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	6107 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6108 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	6109 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	6110 {
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 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	6112 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6113 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	6114 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	6115 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6116 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	6117 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6118 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	6119 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	6120 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6121 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	6122 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6123 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	6124 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	6125 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6126 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6127 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6128 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6129 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6130 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	6131 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6132
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6133 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6134 * 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	6135 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6136 * 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	6137 * 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	6138 * 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	6139 * 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	6140 */
2305 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 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	6142 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	6143 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	6144 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	6145 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6146 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	6147 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	6148 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	6149 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	6150
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6151 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	6152
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6153 /* 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	6154 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	6155 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	6156
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6157 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	6158 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6159 /* 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	6160 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	6161 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6162 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	6163 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	6164 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	6165 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6166 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	6167
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6168 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	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 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	6171
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6172 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	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 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	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 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	6177 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6178 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	6179 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	6180 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6181 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6182 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6183 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	6184 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	6185 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6186 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6187 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	6188 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6189 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	6190
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6191 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	6192 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	6193 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6194 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	6195
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(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	6197 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6198 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	6199 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6200 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	6201 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6202 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6203 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6204 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6205 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	6206
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6207 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	6208 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6209 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	6210 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	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 }
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 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	6215 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	6216 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6217 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	6218 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	6219 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	6220 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6221 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	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 * 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	6226 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6227 * 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	6228 * 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	6229 * 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	6230 * 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	6231 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6232 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	6233 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	6234 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	6235 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	6236 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6237 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	6238 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	6239 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	6240 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	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 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	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 /* 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	6245 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	6246 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	6247
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6248 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	6249 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6250 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	6251 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	6252
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6253 /* 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	6254 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	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 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	6257 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	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 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	6260 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6261 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	6262
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6263 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	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 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	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 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	6268 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6269 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	6270
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6271 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	6272 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6273 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	6274 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	6275 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6276 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6277 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6278 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	6279 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	6280 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6281 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6282 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	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 /* 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	6285 * 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	6286 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6287 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	6288 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6289 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6290 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6291 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	6292
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6293 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	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 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	6296 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6299 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6300 /* 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	6301 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	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 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	6304 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	6305 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	6306 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6307 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	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
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	6310 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	6311 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6312 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	6313 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	6314 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	6315
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6316 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	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 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	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 /* 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	6321 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	6322 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	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 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	6325 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	6326 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6327 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	6328 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	6329 }
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 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	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
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6334 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	6335 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6336 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	6337 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	6338
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6339 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	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 /* 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	6342 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	6343 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	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 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	6346 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6347 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	6348
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	6349 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	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 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	6352
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6353 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	6354 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6355 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	6356 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	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 }
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 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6363 * 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	6364 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6365 * 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	6366 * 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	6367 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6368 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	6369 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	6370 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	6371 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	6372 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6373 _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	6374 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	6375 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6376
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 * 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	6379 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6380 * 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	6381 * 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	6382 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6383 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	6384 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	6385 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	6386 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	6387 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6388 _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	6389 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	6390 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6391
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6392 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	6393 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6394 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	6395 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	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 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	6398
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6399 /* 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	6400 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	6401 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	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 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	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 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	6406 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	6407
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	6408 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	6409 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6410 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	6411 rows--;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6412 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6413
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6414 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	6415 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6416 }
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 * 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	6420 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6421 * 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	6422 * 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	6423 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6424 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	6425 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	6426 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	6427 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	6428 {
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 _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	6430 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	6431 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6432
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6433 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6434 * 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	6435 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6436 * 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	6437 * 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	6438 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6439 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	6440 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	6441 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	6442 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	6443 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6444 _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	6445 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6448 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6449 * 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	6450 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6451 * 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	6452 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6453 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	6454 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	6455 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	6456 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	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 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	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 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	6461
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6462 /* 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	6463 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	6464 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	6465 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	6466 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6467
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6468 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6469 * 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	6470 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6471 * 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	6472 * 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	6473 * 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	6474 */
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	6475 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	6476 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6477 /* 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	6478 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6479
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6480 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6481 * 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	6482 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6483 * 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	6484 * 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	6485 */
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	6486 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	6487 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6488 /* 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	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
2341 1a630cddf384 GTK4: Remove render widgets from the dirty list when they are destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2340 diff changeset	6491 /* 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	6492 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	6493 {
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	6494 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	6495
4367da529f5a GTK4: Fix direct drawing onto render widgets. Can't cache the cairo_t. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2356 diff changeset	6496 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	6497 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	6498
2341 1a630cddf384 GTK4: Remove render widgets from the dirty list when they are destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2340 diff changeset	6499 _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	6500 }
1a630cddf384 GTK4: Remove render widgets from the dirty list when they are destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2340 diff changeset	6501
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6502 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6503 * 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	6504 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6505 * 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	6506 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6507 * 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	6508 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6509 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	6510 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	6511 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	6512 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	6513 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6514 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	6515 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	6516 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	6517 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	6518 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	6519 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	6520 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	6521 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	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
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	6524 /*
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	6525 * 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	6526 * 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	6527 * 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	6528 */
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	6529 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	6530 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	6531 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	6532 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	6533 {
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	6534 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	6535 gtk_widget_queue_draw(handle);
2356 6f4f7882363c GTK4: Fix compilation after last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	6536 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	6537 }
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	6538
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6539 /* 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	6540 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	6541 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6542 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	6543 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6544 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	6545 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	6546 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6547 if (value < 16)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	6548 return _dw_colors[value];
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	6549 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	6550 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6551
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6552 /* 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	6553 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6554 * 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	6555 * 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	6556 * 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	6557 */
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	6558 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	6559 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6560 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	6561 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	6562
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6563 *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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6566 /* 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	6567 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6568 * 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	6569 * 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	6570 * 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	6571 */
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	6572 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	6573 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6574 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	6575
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6576 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	6577 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6578 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	6579 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6580 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	6581 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	6582 }
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 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6585 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6586 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	6587
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6588 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	6589 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6590 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	6591 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	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 *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	6594 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6595 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6596
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6597 /* 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	6598 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6599 * 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	6600 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6601 * 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	6602 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	6603 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	6604 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	6605 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	6606 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	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 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	6609 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	6610 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	6611 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	6612
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6613 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	6614 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	6615 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	6616
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6617 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	6618 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	6619
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6620 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	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 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	6623 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	6624 }
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6625 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	6626 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	6627 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	6628 }
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 /* 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	6631 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6632 * 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	6633 * 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	6634 * 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	6635 * 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	6636 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6637 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	6638 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	6639 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	6640 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	6641 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6642 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	6643 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	6644
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6645 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	6646 {
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	6647 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	6648
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6649 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	6650 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	6651 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	6652 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	6653 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6654 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	6655 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	6656 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	6657 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6658 #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	6659 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	6660 #endif
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6661
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6662 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	6663 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	6664 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	6665 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	6666 /* 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	6667 * 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	6668 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6669 if(!cached)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6670 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	6671 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6672 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	6673 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6674
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6675 /* 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	6676 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6677 * 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	6678 * 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	6679 * 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	6680 * 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	6681 * 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	6682 * 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	6683 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6684 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	6685 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	6686 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	6687 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	6688 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6689 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	6690 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	6691
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6692 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	6693 {
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	6694 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	6695
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6696 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	6697 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	6698 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	6699 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	6700 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6701 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	6702 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	6703 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	6704 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6705 #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	6706 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	6707 #endif
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6708
85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6709 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	6710 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	6711 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	6712 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	6713 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	6714 /* 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	6715 * 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	6716 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6717 if(!cached)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6718 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	6719 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6720 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	6721 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6722
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6723 /* 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	6724 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6725 * 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	6726 * 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	6727 * 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	6728 * 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	6729 * 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	6730 * 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	6731 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6732 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	6733 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	6734 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	6735 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	6736 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6737 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	6738 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	6739 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	6740
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6741 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	6742 {
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	6743 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	6744
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6745 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	6746 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	6747 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	6748 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	6749 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6750 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	6751 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	6752 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	6753 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6754 #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	6755 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	6756 #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	6757
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6758 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	6759 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	6760
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6761 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	6762 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	6763 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	6764 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	6765 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6766 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	6767 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6768 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	6769 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	6770 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	6771 /* 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	6772 * 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	6773 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6774 if(!cached)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6775 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	6776 }
2304 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_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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6780 /* 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	6781 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6782 * 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	6783 * 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	6784 * 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	6785 * 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	6786 * 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	6787 * 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	6788 * 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	6789 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6790 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	6791 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	6792 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	6793 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	6794 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6795 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	6796 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	6797
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6798 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	6799 {
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	6800 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	6801
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6802 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	6803 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	6804 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	6805 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	6806 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6807 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	6808 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	6809 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	6810 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6811 #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	6812 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	6813 #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	6814
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6815 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	6816 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	6817
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6818 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	6819 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	6820 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	6821 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	6822 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	6823 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	6824 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	6825 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	6826 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	6827 /* 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	6828 * 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	6829 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6830 if(!cached)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6831 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	6832 }
2304 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_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	6834 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6835
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6836 /* 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	6837 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6838 * 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	6839 * 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	6840 * 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	6841 * 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	6842 * 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	6843 * 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	6844 * 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	6845 * 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	6846 * 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	6847 * 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	6848 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6849 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	6850 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	6851 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	6852 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	6853 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6854 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	6855 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	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(handle)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6858 {
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	6859 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	6860
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6861 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	6862 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	6863 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	6864 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	6865 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6866 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	6867 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	6868 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	6869 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6870 #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	6871 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	6872 #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	6873 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	6874 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	6875
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6876 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	6877 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	6878
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6879 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	6880 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	6881 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	6882 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	6883 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	6884 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	6885 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6886 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6887 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	6888 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	6889 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	6890 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	6891 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	6892
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6893 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	6894 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6895 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	6896 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	6897 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	6898 /* 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	6899 * 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	6900 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6901 if(!cached)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	6902 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	6903 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6904 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	6905 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6906
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6907 /* 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	6908 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6909 * 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	6910 * 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	6911 * 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	6912 * 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	6913 * 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	6914 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6915 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	6916 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	6917 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	6918 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	6919 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6920 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	6921 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6922 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	6923 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	6924 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	6925 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	6926
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6927 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	6928 {
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	6929 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	6930
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6931 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	6932 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	6933 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	6934 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	6935 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	6936 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	6937 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6938 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	6939 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6940 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	6941 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	6942 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	6943 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	6944 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	6945 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6946 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	6947 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6948 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	6949 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	6950 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6951 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	6952
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6953 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	6954 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6955 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	6956
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6957 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	6958 {
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6959 #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	6960 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	6961 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	6962 #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	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 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	6965 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	6966
2731 85917c0c52f1 GTK4: Same color thread safety passing changes as on iOS and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	6967 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	6968 /* 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	6969 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	6970 {
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6971 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	6972 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	6973 (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	6974 (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	6975 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	6976 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6977 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	6978 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6979 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	6980 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	6981 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6982 /* 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	6983 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	6984 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	6985
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6986 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	6987 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6988 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	6989 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6990 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	6991 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	6992 /* 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	6993 * 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	6994 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	6995 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	6996 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	6997 }
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 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	7000 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7001
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7002 /* 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	7003 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7004 * 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	7005 * 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	7006 * 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	7007 * 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	7008 * 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	7009 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7010 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	7011 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	7012 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	7013 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	7014 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7015 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	7016 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	7017 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	7018
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7019 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	7020 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7021 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	7022 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7023 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	7024 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	7025 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7026 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	7027 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	7028 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7029 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7030 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	7031 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7032 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	7033 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	7034 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	7035 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	7036 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7037
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7038 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	7039 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	7040 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7041 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	7042
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7043 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	7044 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7045 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	7046
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7047 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	7048 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7049 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	7050
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7051 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	7052 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	7053 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	7054
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 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	7056 *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	7057 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	7058 *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	7059
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7060 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	7061 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7062 }
2305 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 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	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 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	7066 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	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 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	7069 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7070
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7071 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7072 * 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	7073 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7074 * 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	7075 * 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	7076 * 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	7077 * 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	7078 * 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	7079 * 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	7080 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7081 * 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	7082 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7083 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	7084 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	7085 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	7086 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	7087 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7088 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	7089
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7090 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	7091 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7092 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	7093 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	7094 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	7095 /* 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	7096 * 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	7097 */
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7098 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	7099 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	7100 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7101 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	7102 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7103
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7104 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7105 * 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	7106 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7107 * 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	7108 * 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	7109 * 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	7110 * (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	7111 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7112 * 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	7113 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7114 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	7115 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	7116 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	7117 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	7118 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7119 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	7120
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7121 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	7122 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7123 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	7124
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7125 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	7126
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7127 /* 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	7128 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	7129 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7130 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	7131
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7132 /* 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	7133 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	7134 {
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7135 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	7136 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	7137 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	7138 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	7139 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	7140 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7141 }
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7142 else
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7143 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	7144
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7145 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	7146 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7147 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	7148 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	7149 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	7150 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	7151 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7152 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	7153 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7154 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	7155 pixmap = 0;
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7156 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7157 }
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_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	7159 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7160
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7161 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7162 * 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	7163 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7164 * 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	7165 * 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	7166 * 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	7167 * (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	7168 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7169 * 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	7170 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7171 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	7172 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	7173 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	7174 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	7175 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7176 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	7177
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7178 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	7179 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7180 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	7181 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	7182
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7183 /*
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7184 * 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	7185 * 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	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((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	7188 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7189 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	7190 close(fd);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7191 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7192 /* 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	7193 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	7194 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7195 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	7196 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	7197 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	7198 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	7199 /* 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	7200 unlink(template);
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7201 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	7202 }
2316 1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7203 else
1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7204 {
1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7205 free(pixmap);
1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7206 pixmap = 0;
1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7207 }
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7208 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7209 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	7210 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7211
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7212 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7213 * 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	7214 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7215 * 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	7216 * 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	7217 * 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	7218 * 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	7219 * 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	7220 */
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	7221 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	7222 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7223 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7224
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7225 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7226 * 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	7227 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7228 * 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	7229 * 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	7230 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7231 * 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	7232 */
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7233 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	7234 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	7235 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	7236 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	7237 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7238 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	7239
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7240 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	7241 {
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7242 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	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 }
112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7245 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	7246 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7247
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7248 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	7249 {
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	7250 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	7251 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	7252 }
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7253
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7254 /* 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	7255 * 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	7256 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7257 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	7258 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	7259 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	7260 {
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7261 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	7262 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	7263 _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	7264 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	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 * 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	7269 * 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	7270 * 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	7271 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7272 * 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	7273 * 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	7274 * 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	7275 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7276 * 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	7277 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7278 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	7279 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7280 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	7281 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7282 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	7283
2315 112595f9a645 GTK4: Remove unnecessary cruft and move pixmap functions into thread safety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2314 diff changeset	7284 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	7285
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7286 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	7287 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	7288 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	7289 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7290 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	7291 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7292
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7293 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7294 * 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	7295 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7296 * 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	7297 * 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	7298 */
2316 1f85311baa65 GTK4: dw_pixmap_new_from_data() should return NULL on failure. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2315 diff changeset	7299 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	7300 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	7301 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	7302 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	7303 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7304 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	7305 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	7306 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	7307 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	7308 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	7309 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	7310 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7311
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7312 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7313 * 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	7314 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7315 * 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	7316 * 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	7317 * 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	7318 * 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	7319 * 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	7320 * 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	7321 * 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	7322 * 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	7323 * 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	7324 * 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	7325 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7326 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	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 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	7329 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7330
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 * 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	7333 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7334 * 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	7335 * 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	7336 * 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	7337 * 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	7338 * 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	7339 * 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	7340 * 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	7341 * 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	7342 * 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	7343 * 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	7344 * 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	7345 * 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	7346 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7347 * 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	7348 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7349 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	7350 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	7351 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	7352 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	7353
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7354 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7355 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	7356 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	7357 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	7358
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7359 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	7360 {
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	7361 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	7362
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7363 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	7364 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	7365 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	7366 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	7367 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7368 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	7369 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	7370
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7371 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	7372 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7373 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	7374
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7375 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	7376 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7377 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	7378 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	7379 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	7380 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7381
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7382 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	7383 {
ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7384 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	7385 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	7386 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	7387 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7388 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	7389 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	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 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	7392 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	7393 /* 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	7394 * 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	7395 */
2337 ef078d219bfc GTK4: Add a shadow surface to GtkDrawingArea widgets, which all the drawing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2336 diff changeset	7396 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	7397 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	7398 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	7399 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	7400 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	7401 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7402
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7403 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7404 * 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	7405 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7406 * 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	7407 * 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	7408 */
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	7409 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	7410 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7411 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	7412 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7413
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7414 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	7415 {
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 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	7417
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7418 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	7419 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7420 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	7421 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	7422 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7423 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7424
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7425 /* 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	7426 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7427 * 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	7428 * 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	7429 * 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	7430 */
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	7431 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	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 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	7434 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	7435 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7438 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	7439 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	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 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	7442 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	7443
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7444 /* 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	7445 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	7446
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7447 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	7448 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	7449
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7450 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	7451 _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	7452
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7453 *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	7454 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	7455 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7456 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	7457 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	7458 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	7459 *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	7460 }
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 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	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 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	7465 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7466
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7467 /* 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	7468 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7469 * 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	7470 * 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	7471 * 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	7472 * 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	7473 */
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	7474 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	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 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	7477 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	7478
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7479 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	7480 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	7481
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7482 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	7483 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7486 /* 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	7487 * Parameters:
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: 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	7489 */
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	7490 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	7491 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7492 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	7493 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	7494 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	7495 }
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 * 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	7499 */
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	7500 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	7501 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7502 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	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 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	7505 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7508 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7509 * 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	7510 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7511 * 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	7512 */
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	7513 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	7514 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7515 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	7516 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7517 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	7518 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	7519 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7523 * 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	7524 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7525 * 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	7526 */
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	7527 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	7528 {
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	7529 /* 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	7530 * 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	7531 * 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	7532 * 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	7533 */
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	7534 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	7535 {
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	7536 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	7537 {
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	7538 /* 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	7539 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	7540 {
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	7541 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	7542 {
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	7543 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	7544 }
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	7545 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	7546 }
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	7547 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	7548 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	7549 }
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	7550 }
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	7551 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	7552 {
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	7553 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	7554 }
2264 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 * 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	7559 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7560 * 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	7561 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7562 * 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	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 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	7565 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7566 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	7567 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	7568 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	7569 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7570
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7571 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7572 * 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	7573 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7574 * 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	7575 */
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	7576 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	7577 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7578 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	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 * 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	7583 */
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	7584 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	7585 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7586 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	7587
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7588 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	7589 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	7590
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7591 /* 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	7592 * 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	7593 * 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	7594 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7595 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	7596 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	7597 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	7598
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7599 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	7600 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	7601 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	7602
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7603 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	7604 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7605
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7606 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7607 * 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	7608 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7609 * 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	7610 */
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	7611 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	7612 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7613 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	7614 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	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 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	7617 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	7618 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	7619 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	7620 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	7621 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	7622 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7625 * 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	7626 * 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	7627 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7628 * 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	7629 */
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	7630 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	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 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	7633 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	7634
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7635 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	7636 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	7637 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	7638 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	7639 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	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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7643 * 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	7644 * 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	7645 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7646 * 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	7647 */
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	7648 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	7649 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7650 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	7651
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7652 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	7653 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	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_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	7656
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7657 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	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 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	7661 }
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 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	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 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	7666 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	7667
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7668 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	7669 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	7670 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	7671 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	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 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7674 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	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_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	7677 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	7678 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	7679 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	7680 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	7681 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	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 * 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	7686 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7687 * 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	7688 */
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	7689 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	7690 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7691 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	7692 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	7693
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7694 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	7695 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	7696 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	7697 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	7698 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	7699 *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	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 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	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
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7704 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	7705 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	7706 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	7707 };
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7708
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7709 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	7710 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7711 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	7712 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	7713 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	7714 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	7715 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	7716 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	7717
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7718 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	7719 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	7720
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7721 /* problems */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7722 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	7723 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7724 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	7725 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7726 }
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 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	7729 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	7730
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7731 /* 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	7732 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	7733
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7734 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	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 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	7737 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	7738 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	7739
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7740 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	7741
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7742 /* 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	7743 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	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 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	7746 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	7747
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7748 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	7749 }
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(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	7752 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7753 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	7754 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7755 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7756
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7757 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	7758 {
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7759 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	7760 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	7761
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7762 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	7763 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7764 /* 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	7765 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	7766 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	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 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	7769 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	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 connectcount++;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7772
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7773 /* 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	7774 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	7775 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	7776 }
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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7779 /* 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	7780 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	7781 {
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(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	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 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	7785 {
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7786 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	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 /* 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	7789 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	7790 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	7791 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	7792 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7793 {
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7794 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	7795 if(z!=(connectcount-1))
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	7796 memcpy(&newarray[z], &array[z+1], sizeof(struct _dw_seminfo)*(z-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	7797 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7798 connectcount--;
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 /* 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	7801 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	7802 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	7803 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7804 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	7805 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7806 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	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 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	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 /* Reset */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7811 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	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 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7814 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	7815 /* Post */
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 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	7818 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	7819
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7820 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	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 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	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 /* 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	7825 * 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	7826 * continue.
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 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	7829 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7832 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7833 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	7834 /* Wait */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7835 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7836 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	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 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	7839
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7840 /* 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	7841 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	7842 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	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 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7845 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	7846 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7847 /* 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	7848 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	7849 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7850 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7851 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7852 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7853 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7854 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7855 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7856 }
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 /* 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	7859 /* 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	7860 * 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	7861 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7862 * 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	7863 * 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	7864 * 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	7865 */
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	7866 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	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 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	7869 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	7870 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	7871
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7872 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	7873 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	7874
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7875 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	7876 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	7877 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	7878 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	7879 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	7880 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	7881 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	7882
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7883 /* 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	7884 * 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	7885 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7886 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	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 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	7889 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	7890 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	7891 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	7892
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7893 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	7894 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7895 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	7896 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	7897 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	7898 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	7899 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	7900 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	7901 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	7902 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7905 /* 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	7906 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	7907 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	7908 }
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 /* 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	7911 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7912 * 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	7913 * 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	7914 * 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	7915 */
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	7916 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	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 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	7919 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	7920 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	7921 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	7922
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7923 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	7924 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	7925 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	7926 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	7927 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	7928 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	7929 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7930
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7931 /* 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	7932 * 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	7933 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7934 * 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	7935 * 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	7936 */
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	7937 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	7938 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7939 /* 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	7940 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	7941
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7942 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	7943 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	7944
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7945 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	7946 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	7947 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	7948 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7949
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7950 /* 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	7951 * 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	7952 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7953 * 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	7954 * 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	7955 */
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	7956 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	7957 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7958
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7959 /* 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	7960 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	7961
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7962 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	7963 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	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 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	7966 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	7967 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	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 /* 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	7971 * 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	7972 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7973 * 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	7974 * 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	7975 * 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	7976 * 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	7977 */
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	7978 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	7979 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7980 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	7981 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	7982 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	7983 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	7984
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7985 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	7986 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	7987
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7988 /* 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	7989 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	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 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	7992 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	7993
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7994 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	7995 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7996
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7997 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	7998 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	7999
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8000 /* 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	8001 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	8002 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	8003
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8004 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	8005 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	8006
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8007 /* 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	8008 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	8009 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	8010 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	8011
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8012 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	8013 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	8014 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	8015 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	8016
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8017 /* 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	8018 * 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	8019 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8020 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	8021 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	8022 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	8023 }
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 /* 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	8026 * 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	8027 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8028 * 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	8029 * 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	8030 */
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	8031 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	8032 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8033 /* 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	8034 * 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	8035 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8036 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	8037 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	8038 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8041 * 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	8042 * 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	8043 * 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	8044 * 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	8045 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8046 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	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 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	8049 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	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 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	8052 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	8053 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	8054 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	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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8058 * 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	8059 * 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	8060 * 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	8061 * 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	8062 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8063 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	8064 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8065 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	8066 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	8067
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8068 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	8069 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	8070 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	8071 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	8072 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	8073 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	8074 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8075
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 * 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	8078 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8079 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	8080 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8081 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	8082 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	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 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	8085
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8086 /* 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	8087 _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	8088
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8089 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	8090 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	8091
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8092 /* 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	8093 _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	8094 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8097 * 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	8098 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8099 * 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	8100 * 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	8101 * 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	8102 * 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	8103 */
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	8104 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	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 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	8107 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	8108
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8109 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	8110 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	8111
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8112 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	8113 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8114 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	8115 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	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 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	8119 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8120 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	8121 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	8122 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	8123 }
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 /* 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	8126 *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	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(*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	8129 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8130 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	8131 *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	8132 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	8133 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	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 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	8137 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	8138 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	8139
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8140 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	8141 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8142
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 * 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	8145 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8146 * 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	8147 * 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	8148 * 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	8149 */
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	8150 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	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 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	8153 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	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 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	8156 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	8157
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8158 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	8159 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8160 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	8161 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	8162 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8163
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8164 /* 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	8165 *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	8166
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8167 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	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 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	8170 *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	8171 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	8172 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8175 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	8176 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	8177 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	8178
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8179 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	8180 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8181
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8182 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8183 * 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	8184 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8185 * 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	8186 * 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	8187 */
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	8188 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	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 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	8191 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	8192
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8193 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	8194 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	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 /* 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	8197 * 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	8198 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8199 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	8200 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	8201 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	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 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	8204 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8205 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8206 * 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	8207 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8208 * 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	8209 * 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	8210 * 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	8211 */
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	8212 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	8213 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8214 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	8215 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	8216 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	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 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	8219 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	8220
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8221 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	8222 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	8223 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	8224 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	8225 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8228 * 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	8229 */
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	8230 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	8231 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8232 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	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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8236 * 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	8237 */
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	8238 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	8239 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8240 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	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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8244 * 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	8245 */
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	8246 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	8247 {
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	8248 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8251 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8252 * 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	8253 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8254 * 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	8255 */
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	8256 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	8257 {
2265 63bb97e94cd3 GTK4: More work on conversion... the amount of changes is really ridiculous. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2264 diff changeset	8258 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	8259 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	8260 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8261
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8262 /* 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	8263 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	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 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	8266
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8267 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	8268
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8269 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	8270 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8271 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	8272 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8273 /* 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	8274 *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	8275 *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	8276 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8277 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	8278 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8279 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	8280 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	8281 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	8282 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	8283 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	8284 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	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 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	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 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	8289
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8290 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	8291 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	8292 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	8293 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	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 /* MLE */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8296 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	8297 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8298 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	8299 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	8300 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	8301 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	8302 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8303 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	8304
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8305 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	8306 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8307 *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	8308 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	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 else
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 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	8313 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8314 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	8315 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8316 *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	8317 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	8318 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8319 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8320 *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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8323 *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	8324 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	8325 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	8326 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8327 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	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(hscrolled)
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8330 *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	8331 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8332 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8333 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8334 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	8335 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	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 *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	8338 *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	8339 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8340 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8341 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	8342 *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	8343 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	8344 *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	8345 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	8346 *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	8347 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	8348 *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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8351 /* 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	8352 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	8353 {
2366 b3efaae95735 GTK4: Apparenlty on GTK4 GtkImage is used for icons, switch to GtkPicture. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	8354 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	8355
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8356 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	8357 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8358
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8359 /*
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 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	8361 * 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	8362 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8363 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	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 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	8366 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8367 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8368
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8369 /* 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	8370 * 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	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((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	8373 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	8374
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8375 /* 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	8376 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	8377 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8378 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	8379 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	8380 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	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 /* 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	8384 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	8385
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8386 /* 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	8387 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	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 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	8390 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	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 /* 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	8393 * 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	8394 * 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	8395 * 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	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 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	8398 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8399 /* 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	8400 * 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	8401 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8402 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	8403 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8404
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8405 /* 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	8406 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	8407 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	8408 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	8409 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	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 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	8412 /* 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	8413 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	8414 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	8415 /* 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	8416 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	8417 {
0f340646a2ca GTK4: GtkPictures should be centered, not filled... don't clobber the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2366 diff changeset	8418 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	8419 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	8420 }
2276 d7f0254f7d1e GTK4: Attempt fixing box and item padding using gtk_widget_set_margin_(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2275 diff changeset	8421 /* 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	8422 _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	8423 /* 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	8424 * 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	8425 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8426 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	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 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	8429 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	8430 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8431 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8432 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8433 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	8434 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	8435 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8436 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	8437 /* 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	8438 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	8439 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8440 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	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 /* 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	8443 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	8444 _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	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 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	8447 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	8448 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	8449 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	8450 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	8451 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	8452 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	8453 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	8454 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8455 else
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 /* 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	8458 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	8459 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	8460 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	8461 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	8462 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8463 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	8464 }
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8465 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	8466 {
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8467 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	8468
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8469 if(groupstart)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8470 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	8471 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8472 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	8473 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8474 /* 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	8475 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	8476 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8477 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	8478 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	8479 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8480 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8481 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8482
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8483 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8484 * 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	8485 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8486 * 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	8487 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8488 * 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	8489 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8490 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	8491 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	8492 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	8493 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	8494 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8495 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	8496
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8497 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	8498 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8499 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	8500
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8501 /* 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	8502 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	8503 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8504 /* 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	8505 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	8506 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	8507
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8508 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	8509 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8510 /* 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	8511 boxcount--;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8512 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	8513 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8514 /* 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	8515 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	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 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	8518 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	8519 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8520 /* 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	8521 /* 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	8522 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	8523 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8524 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	8525
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8526 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	8527 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8528 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	8529 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8530 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	8531 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8532 }
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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8535 else
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 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	8538
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8539 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	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 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	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 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	8544 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8545 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8546 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8547 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8548 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	8549 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8550 }
2304 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_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	8552 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8553
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 * 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	8556 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8557 * 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	8558 * 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	8559 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8560 * 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	8561 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8562 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	8563 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	8564 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	8565 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	8566 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8567 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	8568
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8569 /* 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	8570 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	8571 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8572 /* 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	8573 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	8574 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	8575 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	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 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	8578 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8579 /* 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	8580 boxcount--;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8581 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	8582 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8583 /* 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	8584 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	8585 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	8586 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	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(!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	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 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	8591 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	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 /* 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	8594 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	8595 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	8596 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	8597 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8598 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	8599 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	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 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8602 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	8603 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8604
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 * 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	8607 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8608 * 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	8609 * 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	8610 * 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	8611 * 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	8612 * 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	8613 * 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	8614 * 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	8615 * 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	8616 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8617 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	8618 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	8619 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	8620 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	8621 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8622 _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	8623 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	8624 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8625
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 * 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	8628 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8629 * 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	8630 * 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	8631 * 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	8632 * 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	8633 * 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	8634 * 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	8635 * 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	8636 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8637 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	8638 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	8639 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	8640 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	8641 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8642 /* 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	8643 * 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	8644 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8645 _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	8646 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	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
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 * 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	8651 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8652 * 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	8653 * 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	8654 * 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	8655 * 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	8656 * 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	8657 * 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	8658 * 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	8659 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8660 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	8661 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	8662 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	8663 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	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 _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	8666 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	8667 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8668
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8669 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8670 * 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	8671 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8672 * 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	8673 * 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	8674 * 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	8675 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8676 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	8677 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	8678 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	8679 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	8680 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8681 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	8682 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8683 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	8684 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	8685 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	8686 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	8687 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	8688 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	8689 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8690
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8691 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8692 * 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	8693 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8694 * 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	8695 * 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	8696 * 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	8697 */
2305 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_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	8699 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	8700 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	8701 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	8702 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8703 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	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 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	8706
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	8707 _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	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 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	8710 *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	8711 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	8712 *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	8713 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8714 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8715 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8716 if(width)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8717 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	8718 if(height)
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8719 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	8720 }
2305 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_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	8722 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8723
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8724 /* 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	8725 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	8726 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8727 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	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 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	8730 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8731 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	8732 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	8733
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8734 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	8735 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8736 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	8737 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	8738 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	8739 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8740 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8741 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	8742 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8743
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8744 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8745 * 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	8746 */
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	8747 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	8748 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	8749 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	8750 {
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8751 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	8752 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	8753 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8754
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8755 /* 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	8756 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	8757 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8758 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	8759
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8760 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	8761 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8762 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	8763 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	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 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	8766 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8767 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	8768 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	8769 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	8770 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8771 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8772 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8775 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8776 * 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	8777 */
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	8778 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	8779 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	8780 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	8781 {
4b04943319c5 GTK4: Move a few more functions into thread safety. Add API to functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2322 diff changeset	8782 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	8783 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	8784 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8785
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8786 /* 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	8787 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	8788 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8789 /* 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	8790 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	8791 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8792
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 * 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	8795 * 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	8796 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8797 * 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	8798 * 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	8799 * 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	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 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	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 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	8804 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	8805 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8806
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8807 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8808 * 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	8809 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8810 * 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	8811 * 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	8812 * 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	8813 */
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	8814 #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	8815 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	8816 {
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	8817 }
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	8818 #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	8819 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	8820 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	8821 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	8822 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	8823 {
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8824 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	8825
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8826 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	8827 {
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	8828 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	8829
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	8830 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	8831 {
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	8832 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	8833 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	8834 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	8835 }
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	8836 }
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	8837 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	8838 }
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	8839 #endif
2322 ebcaedfa7ff4 GTK4: Implement dw_pointer_set_pos() with Xlib. Also translate coordinate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2321 diff changeset	8840
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8841 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8842 * 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	8843 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8844 * 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	8845 * 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	8846 * 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	8847 * 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	8848 * 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	8849 */
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	8850 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	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 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	8853 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	8854 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8855
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8856 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8857 * 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	8858 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8859 * 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	8860 * 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	8861 * 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	8862 * 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	8863 * 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	8864 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8865 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	8866 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	8867 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	8868 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	8869 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8870 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	8871 {
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8872 GtkRequisition size;
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8873
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8874 /* 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	8875 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	8876
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8877 if(width)
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8878 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8879 *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	8880 if(!*width)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8881 *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	8882 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8883 if(height)
2321 52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8884 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8885 *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	8886 if(!*height)
52ca7647f665 GTK4: Implement pointer grabbing using Xlib and center message boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2320 diff changeset	8887 *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	8888 }
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	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 #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	8891 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	8892 {
2324 610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8893 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	8894 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	8895
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	8896 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	8897 {
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 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	8899 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	8900 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	8901
610c66b17fbc GTK4: Put Xlib calls in GDK_IS_X11_DISPLAY() code checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2323 diff changeset	8902 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	8903 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	8904 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	8905 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	8906
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	8907 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	8908 *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	8909 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	8910 *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	8911 }
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	8912 }
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	8913 #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	8914 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	8915 *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	8916 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	8917 *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	8918 #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	8919 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	8920 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	8921 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8922
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8923 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8924 * 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	8925 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8926 * 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	8927 * 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	8928 * 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	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 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	8931 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	8932 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	8933 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	8934 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8935 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	8936
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8937 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	8938 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8939 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	8940 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	8941 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	8942 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8943 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	8944 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8945 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	8946 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	8947 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	8948 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8949 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	8950 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8951 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	8952 {
2318 5951752fa7af GTK4: Implement borderless button style for buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2317 diff changeset	8953 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	8954
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8955 if(style & DW_BS_NOBORDER)
2318 5951752fa7af GTK4: Implement borderless button style for buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2317 diff changeset	8956 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	8957 else
2318 5951752fa7af GTK4: Implement borderless button style for buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2317 diff changeset	8958 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	8959 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8960 }
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	8961 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	8962 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8963 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	8964 /* 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	8965 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	8966 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	8967 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	8968 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	8969 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	8970 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	8971 /* 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	8972 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	8973 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	8974 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	8975 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	8976 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	8977 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	8978 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	8979 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	8980 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	8981 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	8982 }
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8983 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	8984 {
b045bb67922d GTK4: Implement resizing of images in the layout manager. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2281 diff changeset	8985 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	8986
2317 a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8987 if(action)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8988 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8989 if(mask & (DW_MIS_ENABLED \| DW_MIS_DISABLED))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8990 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8991 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	8992 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8993 if(style & DW_MIS_ENABLED)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8994 g_simple_action_set_enabled(action, TRUE);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8995 else
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8996 g_simple_action_set_enabled(action, FALSE);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8997 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8998 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	8999 if(mask & (DW_MIS_CHECKED \| DW_MIS_UNCHECKED))
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9000 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9001 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	9002 gboolean check = false;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9003
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9004 if(style & DW_MIS_CHECKED)
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9005 check = true;
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9006
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9007 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	9008 {
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9009 GVariant *new_state = g_variant_new_boolean(check);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9010 g_simple_action_set_state(action, new_state);
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9011 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9012 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9013 }
a2020f907a6c GTK4: Implement checkable menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2316 diff changeset	9014 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9015 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	9016 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9017
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9018 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9019 * 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	9020 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9021 * 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	9022 * 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	9023 * 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	9024 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9025 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	9026 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	9027 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	9028 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	9029 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9030 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	9031 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	9032 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	9033
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9034 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	9035
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9036 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	9037 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9038 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	9039 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9040 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	9041 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9042 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	9043 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	9044
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9045 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	9046 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	9047
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9048 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	9049 /* 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	9050 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	9051 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	9052 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	9053 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9054 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9055 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9056 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	9057 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9058
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9059 /* 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	9060 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	9061 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9062 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	9063 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	9064
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9065 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	9066 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9067 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	9068 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9069 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	9070 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9071 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	9072 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	9073 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9074 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9075 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9076 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	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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9080 * 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	9081 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9082 * 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	9083 * 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	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_destroy, void, HWND handle, unsigned int 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	9086 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	9087 DW_FUNCTION_NO_RETURN(dw_notebook_page_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	9088 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, pageid, 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	9089 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9090 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	9091 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	9092
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9093 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	9094 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9095 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	9096 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	9097 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	9098 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9099 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	9100 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9103 * 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	9104 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9105 * 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	9106 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9107 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	9108 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	9109 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	9110 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	9111 {
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 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	9113 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	9114
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	9115 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	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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9120 * 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	9121 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9122 * 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	9123 * 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	9124 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9125 DW_FUNCTION_DEFINITION(dw_notebook_page_set, void, HWND handle, unsigned int 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	9126 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	9127 DW_FUNCTION_NO_RETURN(dw_notebook_page_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	9128 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, pageid, 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	9129 {
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	9130 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	9131
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9132 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	9133 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	9134 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	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
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 * 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	9140 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9141 * 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	9142 * 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	9143 * 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	9144 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9145 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	9146 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	9147 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	9148 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	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 *child;
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 < 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	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 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	9156 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	9157
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9158 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	9159 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	9160 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	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 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	9164 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9165 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	9166 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	9167 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	9168 }
2305 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_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	9170 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9171
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9172 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9173 * 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	9174 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9175 * 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	9176 * 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	9177 * 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	9178 */
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	9179 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	9180 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9181 /* 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	9182 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9183
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9184 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9185 * 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	9186 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9187 * 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	9188 * 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	9189 * 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	9190 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9191 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	9192 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	9193 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	9194 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	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 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	9197 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	9198 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	9199 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	9200
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9201 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	9202 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	9203 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	9204 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	9205
2305 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 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	9207 {
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 /* 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	9209 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	9210 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9211 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	9212 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9213 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	9214 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	9215 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9216 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	9217 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	9218 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	9219 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	9220 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	9221 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	9222 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9223 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9224 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9225
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9226 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	9227
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9228 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	9229
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9230 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	9231 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	9232 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	9233 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	9234 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	9235 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	9236 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9237 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	9238 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9239
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 * 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	9242 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9243 * 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	9244 * 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	9245 */
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	9246 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	9247 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9248 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	9249 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9250
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9251 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9252 * 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	9253 * 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	9254 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9255 * 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	9256 * 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	9257 * 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	9258 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9259 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	9260 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	9261 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	9262 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	9263 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9264 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	9265 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	9266
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9267 /* 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	9268 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	9269 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9270 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	9271 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	9272 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	9273 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9274 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	9275 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9276 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	9277
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9278 /* 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	9279 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	9280 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	9281 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	9282 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	9283
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9284 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	9285 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9286 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	9287 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9288 /* 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	9289 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	9290 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9291 else
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9292 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9293 /* 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	9294 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	9295 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9296 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	9297 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9298 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9299 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9302 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9303 * 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	9304 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9305 * 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	9306 * 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	9307 * 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	9308 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9309 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	9310 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	9311 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	9312 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	9313 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9314 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	9315 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	9316
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9317 /* 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	9318 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	9319 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9320 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	9321 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	9322 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	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 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	9325 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9326 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	9327 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	9328
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9329 /* 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	9330 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	9331 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	9332 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	9333 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	9334
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9335 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	9336 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9337 /* 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	9338 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	9339 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9340 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	9341 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	9342 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9343 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9344 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9345 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	9346 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9347
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9348 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9349 * 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	9350 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9351 * 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	9352 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9353 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	9354 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	9355 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	9356 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	9357
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9358 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9359 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	9360 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	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 /* 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	9363 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	9364 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9365 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	9366 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	9367 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	9368 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9369 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	9370 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9371 /* 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	9372 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	9373 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	9374 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	9375 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	9376
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9377 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	9378 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9379 /* 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	9380 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	9381 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9382 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9383 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	9384 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9387 * 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	9388 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9389 * 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	9390 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9391 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	9392 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	9393 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	9394 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	9395 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9396 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	9397 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	9398 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	9399
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9400 /* 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	9401 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	9402 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9403 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	9404 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	9405 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	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 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	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 /* 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	9410 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	9411 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	9412 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	9413 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	9414
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9415 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	9416 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9417 /* 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	9418 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	9419 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9420 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9421 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	9422 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9423
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 * 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	9426 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9427 * 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	9428 * 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	9429 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9430 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	9431 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	9432 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	9433 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	9434
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9435 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9436 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	9437
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9438 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	9439 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9440 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	9441 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	9442 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	9443 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9444 /* 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	9445 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	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 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	9448 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	9449
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9450 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	9451 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9452 /* 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	9453 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	9454 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	9455 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	9456 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	9457 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	9458
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9459 /* 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	9460 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	9461 {
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9462 /* 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	9463 rowcount--;
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9464 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	9465 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	9466
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9467 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	9468
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9469 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	9470 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9471 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9472 }
ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9473 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	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
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 * 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	9478 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9479 * 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	9480 * 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	9481 * 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	9482 * 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	9483 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9484 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	9485 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	9486 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	9487 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	9488
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9489 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9490 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	9491 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	9492
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9493 /* 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	9494 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	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 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	9497 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	9498 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	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 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	9501 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9502 /* 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	9503 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	9504 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	9505 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	9506 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	9507
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9508 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	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 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	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 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	9513 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	9514 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9515 /* 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	9516 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	9517 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	9518 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	9519 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9520 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	9521 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	9522 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9523 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9524 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9525 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9526 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	9527 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	9528 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9529
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9530 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9531 * 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	9532 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9533 * 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	9534 * 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	9535 * 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	9536 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9537 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	9538 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	9539 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	9540 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	9541 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9542 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	9543 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	9544
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9545 /* 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	9546 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	9547 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9548 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	9549 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	9550 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	9551 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9552 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	9553 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9554 /* 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	9555 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	9556 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	9557 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	9558 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	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(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	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 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	9563
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9564 /* 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	9565 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	9566 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9567 /* 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	9568 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9571 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9572 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	9573 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9576 * 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	9577 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9578 * 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	9579 * 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	9580 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9581 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	9582 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	9583 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	9584 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	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 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	9587 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	9588 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	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 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	9591
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9592 /* 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	9593 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	9594 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	9595
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9596 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	9597 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9598 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	9599 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	9600
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9601 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	9602 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9603 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	9604 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	9605
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9606 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	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 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	9609
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9610 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	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 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	9613 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9614 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9615
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9616 counter++;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9617 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	9618 }
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 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	9621 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	9622 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9623 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9624 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	9625 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9628 * 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	9629 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9630 * 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	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_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	9633 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	9634 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	9635 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	9636 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9637 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	9638 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	9639 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	9640
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9641 /* 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	9642 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	9643 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9644 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	9645 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	9646 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	9647 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9648 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	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 /* 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	9651 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	9652 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	9653 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	9654 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	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 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	9659 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9660 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	9661 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	9662 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	9663 {
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 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	9666
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9667 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	9668 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9669 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	9670 }
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 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	9673 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	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 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9677 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9678 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	9679 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	9680
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9681 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	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 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	9684 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	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 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	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 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	9689 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9690 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	9691 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9692 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	9693 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9694 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9695 }
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 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9698 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	9699 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9702 * 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	9703 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9704 * 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	9705 * 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	9706 * 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	9707 */
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9708 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	9709 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	9710 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	9711 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	9712 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9713 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	9714 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	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 /* 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	9717 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	9718 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9719 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	9720 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	9721 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	9722 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9723 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	9724 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9725 /* 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	9726 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	9727 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	9728 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	9729 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	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 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	9732 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9733 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	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 /* 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	9736 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	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 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	9739 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9740 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	9741 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9742 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9743 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9744 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	9745 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	9746 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9747 /* 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	9748 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	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 else
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 /* 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	9753 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9758 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9759 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	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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9763 * 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	9764 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9765 * 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	9766 * 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	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_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	9769 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	9770 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	9771 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	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)
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 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	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 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9801 }
2304 ae6f678cb1a9 GTK4: Implement thread safety system based on the new MacOS thread code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2303 diff changeset	9802 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9805 /* 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	9806 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	9807 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9808 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	9809 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	9810
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9811 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	9812 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9813 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	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 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	9816
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	9817 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	9818 {
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	9819 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	9820 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	9821 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	9822 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	9823 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	9824 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	9825 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9826 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	9827 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	9828 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9829 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	9830 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9831
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9832 /* 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	9833 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	9834 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9835 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	9836
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9837 /* 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	9838 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	9839 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	9840
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	9841 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	9842 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	9843 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9846 * 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	9847 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9848 * 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	9849 * 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	9850 * 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	9851 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9852 * 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	9853 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9854 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	9855 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	9856 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	9857 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	9858 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9859 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	9860 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	9861
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9862 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	9863 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	9864 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	9865 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	9866 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	9867 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	9868 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	9869 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	9870 *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	9871 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	9872 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	9873 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	9874 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	9875 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9876
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9877 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9878 * 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	9879 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9880 * 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	9881 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9882 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	9883 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	9884 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	9885 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	9886 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9887 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	9888 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	9889
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9890 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	9891 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	9892 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9893 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	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 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	9896 *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	9897
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9898 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	9899 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9900 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	9901
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9902 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	9903 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9904 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9907 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9908 * 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	9909 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9910 * 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	9911 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9912 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	9913 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	9914 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	9915 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	9916 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9917 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	9918 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	9919
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9920 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	9921 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	9922 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	9923 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9924
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9925 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9926 * 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	9927 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9928 * 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	9929 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9930 * 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	9931 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9932 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	9933 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	9934 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	9935 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	9936 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9937 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	9938 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	9939 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	9940
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9941 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	9942 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	9943 /* select today */
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9944 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	9945 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	9946 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	9947 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	9948 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	9949 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	9950 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9951
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9952 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9953 * 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	9954 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9955 * 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	9956 * year...
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9957 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9958 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	9959 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	9960 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	9961 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	9962 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9963 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	9964 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9965 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	9966 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	9967 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	9968 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	9969 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	9970 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9971 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	9972 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9973
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9974 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9975 * 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	9976 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9977 * 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	9978 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	9979 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	9980 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	9981 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	9982 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	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 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	9985 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9986 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	9987 if(year)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9988 *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	9989 if(month)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9990 *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	9991 if(day)
bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	9992 *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	9993 }
2305 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_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	9995 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9996
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9997 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9998 * 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	9999 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10000 * 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	10001 * Remarks:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10002 * 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	10003 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10004 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	10005 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	10006 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	10007 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	10008 {
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 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	10010 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	10011 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10014 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10015 * 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	10016 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10017 * 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	10018 * 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	10019 * Remarks:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10020 * 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	10021 */
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	10022 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	10023 {
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10024 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	10025 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	10026 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10027
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10028 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10029 * 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	10030 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10031 * 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	10032 * 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	10033 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10034 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	10035 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	10036 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	10037 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	10038 {
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	10039 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	10040 {
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	10041 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	10042 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	10043 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	10044 }
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10045 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	10046 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10047
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10048
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10049 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10050 * 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	10051 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10052 * 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	10053 * 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	10054 * 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	10055 * 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	10056 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10057 * 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	10058 * 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	10059 * Remarks:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10060 * 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	10061 * 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	10062 */
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	10063 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	10064 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10065 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	10066
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10067 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	10068 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10069 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	10070 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10071 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	10072 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	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 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	10075 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	10076 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	10077
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10078 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	10079 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10080 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	10081 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10082 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	10083 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	10084
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10085 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	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 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	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 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	10090 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	10091 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10092 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10093 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	10094 (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	10095 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10096 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	10097 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10098
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10099 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10100 * 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	10101 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10102 * 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	10103 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10104 * 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	10105 */
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	10106 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	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 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	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 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	10111
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10112 /* 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	10113 * 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	10114 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10115 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	10116 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	10117 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	10118 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10119 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	10120 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10121
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10122 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10123 * 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	10124 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10125 * 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	10126 */
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	10127 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	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 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	10130 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	10131
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10132 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	10133 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	10134 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	10135 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	10136
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10137 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	10138 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	10139 #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	10140 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	10141 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10142 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	10143 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10144 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	10145 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	10146 #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	10147 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	10148 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10149 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	10150 #endif
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 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	10153 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10154 *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	10155 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	10156 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	10157 return;
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 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	10160 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10161
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10162 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10163 * 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	10164 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10165 * 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	10166 * 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	10167 * 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	10168 * 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	10169 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10170 * 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	10171 * 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	10172 *
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10173 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10174 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	10175 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	10176 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	10177 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	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 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	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 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	10182 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	10183 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	10184 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	10185 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	10186 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	10187 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	10188
2346 7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10189 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	10190 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10191 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	10192 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	10193 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	10194 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10195 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	10196 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	10197 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	10198 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10199 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	10200 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	10201 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	10202 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10203 default:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10204 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	10205 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10206 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10207
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10208 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	10209 {
2346 7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10210 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	10211 NULL,
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10212 action,
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10213 _("_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	10214 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	10215 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	10216
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10217 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	10218 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10219 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	10220 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	10221 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	10222 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	10223 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	10224 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	10225 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	10226 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	10227 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	10228 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	10229 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10230
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10231 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	10232 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10233 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	10234
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 /* 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	10236 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	10237 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10238 /* 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	10239 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	10240 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	10241 else
7b04d1b9f2eb GTK4: Fix warning message from dW_file_browse() and code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2341 diff changeset	10242 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	10243
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 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	10245 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10246 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10247
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10248 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	10249 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	10250
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10251 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	10252 {
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10253 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	10254 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	10255 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	10256 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10257
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10258 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	10259 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	10260 }
047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10261 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	10262 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10263
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	10264 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	10265 {
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	10266 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	10267 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10268
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10269 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10270 * 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	10271 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10272 * 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	10273 * 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	10274 * 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	10275 * 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	10276 * 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	10277 */
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	10278 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	10279 {
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	10280 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	10281 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	10282 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	10283
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	10284 /* 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	10285 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	10286 {
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 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	10288
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	10289 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	10290 {
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	10291 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	10292 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	10293 }
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	10294 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	10295 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	10296 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	10297 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	10298 {
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	10299 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	10300 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	10301 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	10302 }
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	10303 }
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	10304 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	10305 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	10306
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	10307 /* 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	10308 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	10309 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	10310 {
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	10311 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	10312
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	10313 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	10314
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	10315 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	10316
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	10317 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	10318 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	10319 }
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	10320 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	10321 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10324 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10325 * 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	10326 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10327 * 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	10328 */
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	10329 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	10330 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10331 /* 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	10332 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	10333 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	10334 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10335
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10336 #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	10337 /* 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	10338 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	10339 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10340 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	10341 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10342 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	10343 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	10344 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	10345 #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	10346 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	10347 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	10348 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	10349 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10350 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10351 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	10352 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10353 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10354 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10355 * 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	10356 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10357 * 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	10358 * 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	10359 */
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	10360 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	10361 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10362 #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	10363 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	10364
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10365 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	10366 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10367 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	10368 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10369 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	10370 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	10371 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10372 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	10373 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	10374 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10375 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	10376 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	10377 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10378 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	10379 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	10380 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10381 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	10382 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	10383 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10384 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	10385 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10386 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	10387 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	10388 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	10389 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10390 break;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10391 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10392 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10393 #endif
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10397 * 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	10398 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10399 * 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	10400 * 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	10401 * 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	10402 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10403 * 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	10404 */
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	10405 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	10406 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10407 #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	10408 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	10409
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10410 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	10411 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10412 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	10413 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	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 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	10416 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10417 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	10418 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10419 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10420
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 * 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	10423 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10424 * 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	10425 * 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	10426 * 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	10427 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10428 * 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	10429 */
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	10430 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	10431 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10432 #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	10433 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	10434
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10435 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	10436 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10437 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	10438 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	10439 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10440 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	10441 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10442 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	10443 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10444 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10447 * 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	10448 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10449 * 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	10450 * 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	10451 * 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	10452 * 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	10453 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10454 * 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	10455 */
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	10456 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	10457 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10458 #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	10459 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	10460
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10461 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	10462 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	10463 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	10464 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10465 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	10466 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10467 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10468
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 * 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	10471 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10472 * 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	10473 */
2305 047ad6a5cc1d GTK4: Add more functions to the thread safety system... might need to do bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2304 diff changeset	10474 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	10475 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	10476 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	10477 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	10478 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10479 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	10480 #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	10481 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	10482 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	10483
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10484 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	10485 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	10486 /* 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	10487 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	10488 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	10489 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	10490 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	10491 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	10492 #else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10493 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	10494 #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	10495 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	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
2274 b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10498 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	10499 {
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10500 DWDialog tmp = (DWDialog )data;
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10501
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10502 if(tmp && tmp->data)
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10503 {
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10504 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	10505
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10506 dw_dialog_dismiss(tmp, text ? strdup(text) : text);
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10507 }
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10508 }
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10509
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10510 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10511 * 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	10512 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10513 * None.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10514 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10515 * 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	10516 * 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	10517 */
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	10518 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	10519 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10520 GdkDisplay *display = gdk_display_get_default();
2274 b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10521 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	10522 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	10523
2274 b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10524 if((clipboard = gdk_display_get_clipboard(display)))
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10525 {
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10526 DWDialog *tmp = dw_dialog_new(DW_POINTER(clipboard));
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10527
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10528 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	10529
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10530 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	10531 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10532 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	10533 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10534
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10535 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10536 * 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	10537 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10538 * Text.
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10539 */
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	10540 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	10541 {
2266 bb0690c04413 GTK4: First buildable version... although tons still left to do. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2265 diff changeset	10542 GdkDisplay *display = gdk_display_get_default();
2274 b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10543 GdkClipboard *clipboard;
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10544
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10545 if((clipboard = gdk_display_get_clipboard(display)))
b0bdd54bb2e8 GTK4: Implemented clipboard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2273 diff changeset	10546 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	10547 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10548
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10549 /* 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	10550 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	10551 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10552 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	10553 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	10554 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	10555 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	10556 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	10557
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10558 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	10559 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10560 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	10561 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	10562 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	10563 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	10564 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	10565 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	10566 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	10567 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	10568 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10569 }
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 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10572 * 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	10573 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10574 * 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	10575 * 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	10576 * 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	10577 * 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	10578 * 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	10579 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10580 * 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	10581 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10582 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	10583 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10584 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	10585
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10586 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	10587 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	10588
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10589 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	10590 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10591 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	10592 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	10593 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	10594 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	10595 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	10596 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10597 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	10598 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10599
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10600 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10601 * 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	10602 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10603 * 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	10604 * 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	10605 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10606 * 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	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 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	10609 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10610 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	10611 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	10612
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10613 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	10614 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	10615 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10616
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 * 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	10619 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10620 * 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	10621 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10622 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	10623 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10624 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	10625
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_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	10627 }
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 * 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	10631 * 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	10632 * 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	10633 */
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	10634 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	10635 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10636 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	10637
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10638 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	10639 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10640 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	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 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	10643 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	10644 else
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10645 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	10646 }
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 _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	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
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 * 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	10652 * 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	10653 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10654 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	10655 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10656 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	10657 }
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 * 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	10661 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10662 * 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	10663 * 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	10664 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10665 * 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	10666 * 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	10667 * 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	10668 * Remarks:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10669 * 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	10670 * 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	10671 * 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	10672 * 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	10673 * 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	10674 */
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	10675 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	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 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	10678 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10679 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	10680 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	10681 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	10682 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	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 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	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
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 * 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	10689 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10690 * 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	10691 * 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	10692 * 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	10693 */
2334 29220ecf8db8 GTK4: dw_window_function() actually calls on the main thread now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	10694 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	10695 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	10696 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	10697 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	10698 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10699 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	10700
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10701 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	10702
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10703 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	10704 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	10705 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	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
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 * 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	10710 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10711 * 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	10712 * 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	10713 * 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	10714 */
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	10715 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	10716 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10717 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	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 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	10720 return;
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10721
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10722 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	10723 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10724 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	10725 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10726 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	10727 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	10728 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10729
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10730 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10731 * 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	10732 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10733 * 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	10734 * 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	10735 * 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	10736 */
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	10737 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	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 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	10740 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	10741
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10742 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	10743 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	10744
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10745 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	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 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	10748 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10749 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	10750 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	10751 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	10752 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10753
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	10754 /*
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	10755 * 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	10756 * 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	10757 * 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	10758 * 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	10759 * 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	10760 * 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	10761 */
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	10762 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	10763 {
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	10764 /* 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	10765 * 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	10766 */
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	10767 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	10768 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	10769 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	10770 }
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	10771
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10772 /* 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	10773 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	10774 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10775 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	10776 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	10777 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	10778 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	10779
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10780 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	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 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	10783 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	10784 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	10785 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	10786 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10787 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	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 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	10790 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	10791 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	10792 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10793 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	10794 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	10795 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10796
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10797 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10798 * 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	10799 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10800 * 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	10801 * 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	10802 * 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	10803 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10804 * 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	10805 */
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	10806 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	10807 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10808 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	10809 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	10810
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10811 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	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 *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	10814 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	10815 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	10816 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	10817 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	10818 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	10819 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10820
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10821 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10822 * 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	10823 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10824 * 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	10825 */
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	10826 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	10827 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10828 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	10829
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10830 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	10831 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	10832 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	10833 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10836 /* 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	10837 * 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	10838 */
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	10839 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	10840 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10841 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	10842
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10843 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	10844 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	10845 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	10846 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	10847 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	10848 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	10849 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	10850 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10851
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 * 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	10854 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10855 * 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	10856 * 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	10857 * 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	10858 * 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	10859 */
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	10860 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	10861 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10862 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	10863 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10864
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10865 /* 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	10866 * 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	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 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	10869 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10870 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	10871 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10872 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	10873 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	10874
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10875 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	10876 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	10877 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	10878
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10879 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	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 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	10882 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10883 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10884 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	10885 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10886 }
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 #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	10889
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10890 /* Signal setup functions */
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	10891 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	10892 {
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	10893 /* 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	10894 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	10895 {
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	10896 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	10897 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	10898 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	10899 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	10900
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	10901 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	10902 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	10903 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	10904 _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	10905 }
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10906 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	10907 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10908 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	10909 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	10910 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	10911 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10912 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	10913 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10914
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	10915 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	10916 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10917 /* 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	10918 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	10919 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10920 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	10921 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	10922 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	10923 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	10924 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	10925 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	10926 }
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	10927 /* 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	10928 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	10929 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	10930 /* 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	10931 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	10932 {
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	10933 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	10934
2273 95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	10935 if(action)
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	10936 {
2291 ce1b9e558584 GTK4: Fix minor logic error causing menu activation callbacks to fail. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2290 diff changeset	10937 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	10938 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	10939
3c3f0023ae02 GTK4: Fix menu action setup by adding code to install group actions into bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2289 diff changeset	10940 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	10941 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	10942 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	10943 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	10944 _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	10945 }
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	10946 return NULL;
95796965bb01 GTK4: More menu work, something still isn't working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2272 diff changeset	10947 }
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	10948 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	10949 }
a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	10950
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	10951 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	10952 {
a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	10953 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	10954 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10955 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	10956 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	10957 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	10958 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	10959 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10960 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	10961 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10962
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	10963 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	10964 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10965 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	10966 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10967 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	10968 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	10969 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	10970 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10971 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	10972 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10973
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	10974 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	10975 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10976 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	10977 {
2281 0e93b09ed0e1 GTK4: Cache the cairo context during the drawing area callback. This allows bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2280 diff changeset	10978 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	10979 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	10980 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	10981 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10982 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	10983 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10984
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	10985 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	10986 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10987 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	10988 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10989 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	10990 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	10991 /* 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	10992 * 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	10993 */
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	10994 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	10995 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	10996 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	10997 }
2270 819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	10998 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	10999 {
819f2492c85f GTK4: More signal cleanup, fix various issues with windows and dialogs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2269 diff changeset	11000 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	11001 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	11002 }
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11003 else
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11004 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11005 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	11006 /* 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	11007 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	11008 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	11009 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	11010 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	11011 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11012 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11013 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	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
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11016 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	11017 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11018 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	11019 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	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_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	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_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	11026 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	11027 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	11028 }
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11029
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11030 #ifdef USE_WEBKIT
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11031 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	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 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	11034 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11035 /* 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	11036 * 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	11037 */
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11038 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	11039 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	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 }
2271 1c52cd5a817f GTK4: More refactoring, and started working on menus, but not entirely sure bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2270 diff changeset	11042 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	11043 }
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11044 #endif
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11045
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11046 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11047 * 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	11048 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11049 * 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	11050 * 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	11051 * 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	11052 * 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	11053 * 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	11054 */
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	11055 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	11056 {
2628 d3d8a93124f1 GTK4: Fix compilation after style standarization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	11057 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	11058
2269 a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11059 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	11060 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11061 GObject object = (GObject )window;
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11062 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	11063 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	11064 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	11065
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11066 /*
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11067 * 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	11068 * 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	11069 */
2268 fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11070 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	11071 #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	11072 && !(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	11073 #endif
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 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	11076
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11077 /* 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	11078 if(signal.setup)
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11079 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	11080
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11081 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	11082 return;
2292 fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11083
fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11084 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	11085 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	11086 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	11087 /* Save the disconnect function pointer */
fa19fce045aa GTK4: Remove unnecessary parameter to the setup functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2291 diff changeset	11088 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	11089 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	11090 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	11091 _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	11092 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11093 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11094
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11095 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11096 * 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	11097 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11098 * 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	11099 */
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	11100 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	11101 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11102 int z, count;
2628 d3d8a93124f1 GTK4: Fix compilation after style standarization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	11103 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	11104 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	11105
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	11106 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	11107 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	11108 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	11109
a26cfd4bbffe GTK4: More work on signal handlers, and disable the font CSS override. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2268 diff changeset	11110 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	11111 {
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11112 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	11113 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	11114 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	11115
fefeb5b4e512 GTK4: Complete refactoring of the signal system to be more simple and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2267 diff changeset	11116 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	11117 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	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(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	11120 _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	11121 }
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11122 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11123 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11124
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11125 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11126 * 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	11127 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11128 * 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	11129 */
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	11130 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	11131 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11132 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	11133 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	11134
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	11135 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	11136 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	11137
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11138 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	11139 _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	11140 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	11141 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11142
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11143 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11144 * 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	11145 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11146 * 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	11147 * 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	11148 */
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	11149 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	11150 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11151 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	11152 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	11153
2314 eda7642d80df GTK4: Code cleanup, add _dw prefix to internal functions and structures. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2313 diff changeset	11154 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	11155 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	11156
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11157 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	11158 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	11159 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	11160
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11161 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	11162 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	11163
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11164 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	11165 _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	11166 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11167 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11168
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11169 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11170 * 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	11171 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11172 * 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	11173 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11174 * 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	11175 * 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	11176 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11177 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	11178 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11179 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	11180
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11181 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	11182 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	11183 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	11184 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	11185 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	11186 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11187 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	11188 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	11189 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11190 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	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
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11193 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11194 * 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	11195 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11196 * 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	11197 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11198 * 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	11199 * 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	11200 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11201 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	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 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	11204
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11205 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	11206 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	11207 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	11208 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	11209 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	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 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	11212 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	11213 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11214 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	11215 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11216
2506 fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11217 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	11218 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	11219 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	11220 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	11221 {
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11222 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	11223 #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	11224 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	11225
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11226 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	11227 {
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11228 retval = trueresult;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11229 }
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11230 #endif
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11231 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	11232 }
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2470 diff changeset	11233
2264 5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11234 /*
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11235 * 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	11236 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11237 * 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	11238 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11239 * 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	11240 * 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	11241 * 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	11242 * 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	11243 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11244 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	11245 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11246 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	11247 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11248 #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	11249 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	11250 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	11251 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11252 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	11253 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	11254 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	11255 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	11256 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	11257 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	11258 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	11259 default:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11260 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	11261 }
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
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 * 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	11266 * Parameters:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11267 * 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	11268 * 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	11269 * Returns:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11270 * 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	11271 * 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	11272 * 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	11273 * Remarks:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11274 * 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	11275 * 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	11276 */
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11277 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	11278 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11279 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	11280 {
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11281 /* 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	11282 #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	11283 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	11284 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	11285 #endif
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11286 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	11287 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	11288 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	11289 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	11290 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	11291 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	11292 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	11293 /* 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	11294 default:
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11295 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	11296 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11297 }
5c981407b0f3 GTK4: Add experimental support for GTK4... This is in progress and doesn't bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11298
2313 c6ea79c74c03 GTK4: Remove some lingering eventbox code from GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2312 diff changeset	11299

Mercurial > dwindows

annotate gtk4/dw.c @ 2854:8a5131cbbe93